svn commit: r704644 - /tomcat/connectors/trunk/jk/tools/jkrelease.sh

[rjung]

Author: rjung
Date: Tue Oct 14 12:47:39 2008
New Revision: 704644

URL: http://svn.apache.org/viewvc?rev=704644&view=rev
Log:
JK release script now adds revision to exposed
versions of dev snapshots (those get logged
during startup).

Modified:
    tomcat/connectors/trunk/jk/tools/jkrelease.sh

Modified: tomcat/connectors/trunk/jk/tools/jkrelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/tools/jkrelease.sh?rev=704644&r1=704643&r2=704644&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/tools/jkrelease.sh (original)
+++ tomcat/connectors/trunk/jk/tools/jkrelease.sh Tue Oct 14 12:47:39 2008
@@ -137,7 +137,8 @@
        echo "No Revision found at '$JK_SVN_URL'"
        exit 3
     fi
-    JK_DIST=${JK_CVST}-${tag}-dev-${JK_REV}-src
+    JK_SUFFIX=${JK_REV}
+    JK_DIST=${JK_CVST}-${tag}-dev-${JK_SUFFIX}-src
 elif [ -n "$branch" ]
 then
     JK_BRANCH=`echo $branch | sed -e 's#/#__#g'`
@@ -148,7 +149,8 @@
        echo "No Revision found at '$JK_SVN_URL'"
        exit 3
     fi
-    JK_DIST=${JK_CVST}-${tag}-dev-${JK_BRANCH}-${JK_REV}-src
+    JK_SUFFIX=${JK_BRANCH}-${JK_REV}
+    JK_DIST=${JK_CVST}-${tag}-dev-${JK_SUFFIX}-src
 elif [ -n "$local_dir" ]
 then
     JK_SVN_URL="$local_dir"
@@ -158,12 +160,14 @@
        echo "No Revision found at '$JK_SVN_URL'"
        exit 3
     fi
-    JK_DIST=${JK_CVST}-${tag}-dev-local-`date +%Y%m%d%H%M%S`-${JK_REV}-src
+    JK_SUFFIX=local-`date +%Y%m%d%H%M%S`-${JK_REV}
+    JK_DIST=${JK_CVST}-${tag}-dev-${JK_SUFFIX}-src
 else
     JK_VER=$tag
     JK_TAG=`echo $tag | sed -e 's#^#JK_#' -e 's#\.#_#g'`
     JK_BRANCH=`echo $tag | sed -e 's#^#jk#' -e 's#\.[0-9][0-9]*$##' -e 
's#$#.x#'`
     JK_SVN_URL="${SVNROOT}/${SVNPROJ}/tags/${JK_BRANCH}/${JK_TAG}"
+    JK_SUFFIX=''
     JK_DIST=${JK_CVST}-${JK_VER}-src
 fi
 
@@ -189,6 +193,13 @@
 ant
 cd ../../..
 
+# Update version information
+file=${JK_DIST}.tmp/jk/native/common/jk_version.h
+cp -p $file $file.orig
+sed -e 's/^#define JK_REVISION .*/#define JK_REVISION "-'$JK_SUFFIX'"/' \
+  $file.orig > $file
+rm $file.orig
+
 # Copying things into the source distribution
 copy_files ${JK_DIST}.tmp $JK_DIST "$COPY_TOP"
 copy_files ${JK_DIST}.tmp/jk $JK_DIST "$COPY_JK"



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]