susumu.yata
null+****@clear*****
Fri Dec 14 16:53:06 JST 2012
susumu.yata 2012-12-14 16:53:06 +0900 (Fri, 14 Dec 2012) New Revision: 2830cb757f003c0843d00fa5a9fe3063e13d756f https://github.com/groonga/grnxx/commit/2830cb757f003c0843d00fa5a9fe3063e13d756f Log: Update version.sh to use top_srcdir. Removed files: lib/version.h Modified files: lib/Makefile.am lib/version.sh Modified: lib/Makefile.am (+3 -1) =================================================================== --- lib/Makefile.am 2012-12-14 16:02:00 +0900 (83031aa) +++ lib/Makefile.am 2012-12-14 16:53:06 +0900 (4da1a6c) @@ -50,5 +50,7 @@ EXTRA_DIST = version.sh FORCE: +grnxx.cpp: version.h + version.h: FORCE - @$(SHELL_PATH) $(srcdir)/version.sh + TOP_DIR="$(top_srcdir)" "$(srcdir)/version.sh" Deleted: lib/version.h (+0 -0) 100644 =================================================================== --- lib/version.h 2012-12-14 16:02:00 +0900 (e69de29) +++ /dev/null Modified: lib/version.sh (+13 -3) =================================================================== --- lib/version.sh 2012-12-14 16:02:00 +0900 (d49acc8) +++ lib/version.sh 2012-12-14 16:53:06 +0900 (43e99c5) @@ -1,12 +1,20 @@ #!/bin/sh -GRNXX_VERSION_HEADER=version.h +TOP_DIR="${TOP_SRCDIR:-..}" +LIB_DIR="${TOP_DIR}/lib" +GIT_DIR="${TOP_DIR}/.git" -if [ -d "../.git" -o -f "../.git" ] +GRNXX_VERSION_HEADER="version.h" + +echo "GRNXX_VERSION_HEADER = ${GRNXX_VERSION_HEADER}" + +if [ -d ${GIT_DIR} ] then - GRNXX_CURRENT_VERSION=`git describe --abbrev=7 HEAD 2>/dev/null` + GRNXX_CURRENT_VERSION=`(cd ${TOP_DIR}; git describe --abbrev=7 HEAD 2>/dev/null)` GRNXX_CURRENT_VERSION=`expr "${GRNXX_CURRENT_VERSION}" : v*'\(.*\)'` + echo "GRNXX_CURRENT_VERSION = ${GRNXX_CURRENT_VERSION}" + if [ -r ${GRNXX_VERSION_HEADER} ] then GRNXX_OLD_VERSION=`grep '^#define GRNXX_VERSION ' ${GRNXX_VERSION_HEADER} |\ @@ -15,6 +23,8 @@ then GRNXX_OLD_VERSION=unset fi + echo "GRNXX_OLD_VERSION = ${GRNXX_OLD_VERSION}" + if [ "${GRNXX_OLD_VERSION}" != "${GRNXX_CURRENT_VERSION}" ] then echo "#define GRNXX_VERSION \"${GRNXX_CURRENT_VERSION}\""\ -------------- next part -------------- HTML����������������������������...Download
