Author: dreiss
Date: Mon Jun 30 14:55:52 2008
New Revision: 672943
URL: http://svn.apache.org/viewvc?rev=672943&view=rev
Log:
(THRIFT-40) Fix compilation and version string on OS X.
Modified:
incubator/thrift/trunk/compiler/cpp/Makefile.am
incubator/thrift/trunk/print_version.sh
Modified: incubator/thrift/trunk/compiler/cpp/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/Makefile.am?rev=672943&r1=672942&r2=672943&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/Makefile.am (original)
+++ incubator/thrift/trunk/compiler/cpp/Makefile.am Mon Jun 30 14:55:52 2008
@@ -96,7 +96,7 @@
THRIFT_REVISION=$(shell /bin/sh $(top_srcdir)/print_version.sh -r)
regen_version_h:
- @echo -n "Regenerating version.h... "
+ @printf "Regenerating version.h... "
@TMPFILE=`mktemp ./version_h.tmp_XXXXXX` ; \
echo "// AUTOGENERATED, DO NOT EDIT" > $$TMPFILE ; \
echo '#define THRIFT_VERSION "$(THRIFT_VERSION)"\n' >>
$$TMPFILE ; \
Modified: incubator/thrift/trunk/print_version.sh
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/print_version.sh?rev=672943&r1=672942&r2=672943&view=diff
==============================================================================
--- incubator/thrift/trunk/print_version.sh (original)
+++ incubator/thrift/trunk/print_version.sh Mon Jun 30 14:55:52 2008
@@ -12,7 +12,7 @@
elif test -d .git ; then
SHA1=`git rev-list --max-count=1 --grep='^git-svn-id:' HEAD`
REVISION=`git cat-file commit $SHA1 | sed -ne 's/^git-svn-id:[EMAIL
PROTECTED]@\([0-9][0-9]*\).*/r\1/p'`
- OFFSET=`git rev-list ^$SHA1 HEAD | wc -l`
+ OFFSET=`git rev-list ^$SHA1 HEAD | wc -l | tr -d ' '`
if test $OFFSET != 0 ; then
REVISION="$REVISION-$OFFSET-`git rev-parse --verify HEAD | cut -c 1-7`"
fi
