Author: mturk
Date: Thu Mar 22 12:39:56 2012
New Revision: 1303755
URL: http://svn.apache.org/viewvc?rev=1303755&view=rev
Log:
Axe JK_REVISION. We MUST NOT have different source in tag and release tarballs,
which this was the case.
Modified:
tomcat/jk/trunk/native/common/jk_version.h
tomcat/jk/trunk/tools/jkrelease.sh
Modified: tomcat/jk/trunk/native/common/jk_version.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1303755&r1=1303754&r2=1303755&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Thu Mar 22 12:39:56 2012
@@ -36,8 +36,6 @@
/* Release candidate */
#define JK_VERRC 0
#define JK_RCSTRING "0"
-/* Source Control Revision as a suffix, e.g. "-r12345" */
-#define JK_REVISION ""
/************** END OF AREA TO MODIFY BEFORE RELEASING *************/
@@ -70,7 +68,7 @@
#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-dev"
#endif
#endif
-#define JK_FULL_EXPOSED_VERSION JK_EXPOSED_VERSION JK_REVISION
+#define JK_FULL_EXPOSED_VERSION JK_EXPOSED_VERSION
#define JK_MAKEVERSION(major, minor, fix, beta) \
(((major) << 24) + ((minor) << 16) + ((fix) << 8) + (beta))
Modified: tomcat/jk/trunk/tools/jkrelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1303755&r1=1303754&r2=1303755&view=diff
==============================================================================
--- tomcat/jk/trunk/tools/jkrelease.sh (original)
+++ tomcat/jk/trunk/tools/jkrelease.sh Thu Mar 22 12:39:56 2012
@@ -221,13 +221,6 @@ cd ${JK_DIST}.tmp/jk/xdocs
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 $JK_DIST "$COPY_JK"
copy_files ${JK_DIST}.tmp/jk/native $JK_DIST "$COPY_NATIVE"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
