svn commit: r1212350 - /subversion/trunk/tools/dist/dist.sh

[da...@apache.org]

Author: danielsh
Date: Fri Dec  9 12:09:20 2011
New Revision: 1212350

URL: http://svn.apache.org/viewvc?rev=1212350&view=rev
Log:
* tools/dist/dist.sh: Try to duct-tape the nightly roll into working.
   For the full story, see comments within.

A better fix will follow.

Modified:
    subversion/trunk/tools/dist/dist.sh

Modified: subversion/trunk/tools/dist/dist.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/dist.sh?rev=1212350&r1=1212349&r2=1212350&view=diff
==============================================================================
--- subversion/trunk/tools/dist/dist.sh (original)
+++ subversion/trunk/tools/dist/dist.sh Fri Dec  9 12:09:20 2011
@@ -260,9 +260,24 @@ find "$DISTPATH" -name config.nice -prin
 # on end-user's systems, when they should just be compiled by the
 # Release Manager and left at that.
 
-ver_major=`echo $VERSION | cut -d '.' -f 1`
-ver_minor=`echo $VERSION | cut -d '.' -f 2`
-ver_patch=`echo $VERSION | cut -d '.' -f 3`
+if [ "$VERSION" = nightly ]; then
+  # ### FIXME Gross hack.
+  #
+  # release.py sets Version().base = 'nightly'; which causes this to
+  # be called as 'dist.sh -v nightly', rather than 'dist.sh -v 1.8.0';
+  # which causes the sed below to write '#define SVN_VER_MAJOR nightly'
+  # into subversion/include/svn_version.h; which chokes build/getversion.py,
+  # called by build/generator/gen_base.py during './autogen.sh --release'.
+  #
+  # Setting this to ampersand should fool sed and peace the kingdom.
+  ver_major="&"
+  ver_minor="&"
+  ver_patch="&"
+else
+  ver_major=`echo $VERSION | cut -d '.' -f 1`
+  ver_minor=`echo $VERSION | cut -d '.' -f 2`
+  ver_patch=`echo $VERSION | cut -d '.' -f 3`
+fi
 
 vsn_file="$DISTPATH/subversion/include/svn_version.h"