Author: cutting
Date: Fri Nov 4 21:39:13 2011
New Revision: 1197794
URL: http://svn.apache.org/viewvc?rev=1197794&view=rev
Log:
AVRO-950. C: Fix source tarball to include VERSION.txt. (dcreager)
Modified:
avro/trunk/CHANGES.txt
avro/trunk/lang/c/ (props changed)
avro/trunk/lang/c/.gitignore
avro/trunk/lang/c/build.sh
avro/trunk/lang/c/version.sh
Modified: avro/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1197794&r1=1197793&r2=1197794&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Fri Nov 4 21:39:13 2011
@@ -24,6 +24,8 @@ Avro 1.6.1 (unreleased)
AVRO-943. Java: Fix an intermittent deadlock in
TestNettyServerWithCallbacks. (James Baldassari via cutting)
+ AVRO-950. C: Fix source tarball to include VERSION.txt. (dcreager)
+
Avro 1.6.0 (2 November 2011)
NEW FEATURES
Propchange: avro/trunk/lang/c/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Nov 4 21:39:13 2011
@@ -11,6 +11,7 @@ config.status
configure
libtool
stamp-h1
+VERSION.txt
*.lo
*.o
.deps
Modified: avro/trunk/lang/c/.gitignore
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/c/.gitignore?rev=1197794&r1=1197793&r2=1197794&view=diff
==============================================================================
--- avro/trunk/lang/c/.gitignore (original)
+++ avro/trunk/lang/c/.gitignore Fri Nov 4 21:39:13 2011
@@ -1,2 +1,3 @@
build
cscope.*
+VERSION.txt
Modified: avro/trunk/lang/c/build.sh
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/c/build.sh?rev=1197794&r1=1197793&r2=1197794&view=diff
==============================================================================
--- avro/trunk/lang/c/build.sh (original)
+++ avro/trunk/lang/c/build.sh Fri Nov 4 21:39:13 2011
@@ -45,6 +45,7 @@ case "$1" in
dist)
prepare_build
+ cp ../../share/VERSION.txt $root_dir
make -C $build_dir docs
# This is a hack to force the built documentation to be included
# in the source package.
Modified: avro/trunk/lang/c/version.sh
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/c/version.sh?rev=1197794&r1=1197793&r2=1197794&view=diff
==============================================================================
--- avro/trunk/lang/c/version.sh (original)
+++ avro/trunk/lang/c/version.sh Fri Nov 4 21:39:13 2011
@@ -41,9 +41,14 @@ libage=$(($libavro_binary_age - $libavro
if test "$1" = "project"; then
project_ver="undef"
- version_file="../../share/VERSION.txt"
+ version_file="VERSION.txt"
if test -f $version_file; then
project_ver=$(cat $version_file)
+ else
+ version_file="../../share/VERSION.txt"
+ if test -f $version_file; then
+ project_ver=$(cat $version_file)
+ fi
fi
printf "%s" $project_ver
elif test "$1" = "libtool"; then
