You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/06/22 11:04:21 UTC
svn commit: r956826 - in /tomcat/tc5.5.x/trunk: STATUS.txt build/build.xml
container/webapps/docs/changelog.xml
Author: markt
Date: Tue Jun 22 09:04:20 2010
New Revision: 956826
URL: http://svn.apache.org/viewvc?rev=956826&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48990#c11
Do not omit exe and dll files in release builds built on Unixes, to align them with the official ones built on Windows.
Add support for "skip.installer" property.
Patch by kkolinko.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/build/build.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=956826&r1=956825&r2=956826&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jun 22 09:04:20 2010
@@ -54,14 +54,6 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?view=revision&revision=749019
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48990#c11
- Do not omit exe and dll files in release builds built on Unixes,
- to align them with the official ones built on Windows.
- Add support for "skip.installer" property.
- https://issues.apache.org/bugzilla/attachment.cgi?id=25537
- +1: kkolinko, markt, kfujino
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49445
The change in session ID is notified to other node.
http://svn.apache.org/viewvc?view=revision&revision=955190
Modified: tomcat/tc5.5.x/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=956826&r1=956825&r2=956826&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/build.xml Tue Jun 22 09:04:20 2010
@@ -1398,6 +1398,28 @@
<!-- Bugzilla 37035: http://issues.apache.org/bugzilla/show_bug.cgi?id=37035 -->
<touch file="${tomcat.dist}/temp/bugzilla37035-safeToDelete.tmp" />
+ <!-- Windows binaries for each platform -->
+ <!-- 32 bit -->
+ <copy file="${commons-daemon.home}/windows/prunsrv.exe"
+ tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" />
+ <copy file="${commons-daemon.home}/windows/prunmgr.exe"
+ tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" />
+ <!-- 64 bit amd -->
+ <copy file="${commons-daemon.home}/windows/amd64/prunsrv.exe"
+ tofile="${tomcat.dist}/bin/x64/tomcat${version.major}.exe" />
+ <!-- 64 bit ia -->
+ <copy file="${commons-daemon.home}/windows/ia64/prunsrv.exe"
+ tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" />
+ <!-- tc native -->
+ <copy file="${tomcat-native.home}/tcnative-1.dll.x86"
+ tofile="${tomcat.dist}/bin/tcnative-1.dll" />
+ <!-- tc native 64 bit for amd/emt -->
+ <copy file="${tomcat-native.home}/tcnative-1.dll.x64"
+ tofile="${tomcat.dist}/bin/x64/tcnative-1.dll" />
+ <!-- tc native 64 bit for ia -->
+ <copy file="${tomcat-native.home}/tcnative-1.dll.i64"
+ tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" />
+
<!-- Correct permissions and line endings on "bin" scripts -->
<fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf"
encoding="ISO-8859-1" fixlast="false" />
@@ -1530,26 +1552,6 @@
<copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
- <!-- 32 bit -->
- <copy file="${commons-daemon.home}/windows/prunsrv.exe"
- tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" />
- <copy file="${commons-daemon.home}/windows/prunmgr.exe"
- tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" />
- <!-- 64 bit amd -->
- <copy file="${commons-daemon.home}/windows/amd64/prunsrv.exe"
- tofile="${tomcat.dist}/bin/x64/tomcat${version.major}.exe" />
- <!-- 64 bit ia -->
- <copy file="${commons-daemon.home}/windows/ia64/prunsrv.exe"
- tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" />
- <!-- tc native -->
- <copy file="${tomcat-native.home}/tcnative-1.dll.x86"
- tofile="${tomcat.dist}/bin/tcnative-1.dll" />
- <!-- tc native 64 bit for amd/emt -->
- <copy file="${tomcat-native.home}/tcnative-1.dll.x64"
- tofile="${tomcat.dist}/bin/x64/tcnative-1.dll" />
- <!-- tc native 64 bit for ia -->
- <copy file="${tomcat-native.home}/tcnative-1.dll.i64"
- tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" />
<filter token="VERSION" value="${version}"/>
<filter token="VERSION_NUMBER" value="${version.number}"/>
@@ -1702,6 +1704,7 @@
otherwise this check fails and the .exe distro is not generated -->
<condition property="execute.installer">
<and>
+ <not><isset property="skip.installer" /></not>
<os family="windows" />
<available file="${nsis.exe}" />
<available file="${nsis.installoptions.dll}" />
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=956826&r1=956825&r2=956826&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jun 22 09:04:20 2010
@@ -58,6 +58,10 @@
<bug>49236</bug>: Do not use indexing when packing Tomcat JARs.
(kkolinko)
</fix>
+ <fix>
+ <bug>48990</bug>: Build windows distributions correctly on Linux and
+ add support for the skip.installer property. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org