Author: remm
Date: Thu Jul 3 01:25:40 2008
New Revision: 673614
URL: http://svn.apache.org/viewvc?rev=673614&view=rev
Log:
- Add support for building on Unix.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=673614&r1=673613&r2=673614&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 3 01:25:40 2008
@@ -59,12 +59,6 @@
and seems impossible to anticipate):
https://issues.apache.org/bugzilla/show_bug.cgi?id=36155#c17
-* Add Unix support for NSIS (unfortunately, I do not have any Windows computer
left, so I need this
- for 6.0.17)
- https://issues.apache.org/bugzilla/show_bug.cgi?id=45315
- +1: remm, jfclere, fhanik
- -1:
-
* Fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45317
http://svn.apache.org/viewvc?rev=673487&view=rev
Properly document and print out the value of the state transfer timeout
setting
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=673614&r1=673613&r2=673614&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Jul 3 01:25:40 2008
@@ -45,6 +45,7 @@
base-commons.loc=http://archive.apache.org/dist/commons
base-tomcat.loc=http://archive.apache.org/dist/tomcat
+base-sf.loc=http://downloads.sourceforge.net
# ----- Commons Logging, version 1.1 or later -----
commons-logging-version=1.1.1
@@ -82,12 +83,12 @@
commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz
# ----- NSIS, version 2.0 or later -----
-nsis.home=${base.path}/nsis-2.34
+nsis.home=${base.path}/nsis-2.37
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.34-setup.exe
+nsis.loc=${base-sf.loc}/nsis/nsis-2.37.zip
# ----- Commons Daemon, version 1.0-Alpha or later -----
commons-daemon.home=${base.path}/commons-daemon-1.0.1
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=673614&r1=673613&r2=673614&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Thu Jul 3 01:25:40 2008
@@ -29,7 +29,7 @@
<!-- Project Properties -->
<property name="name" value="Apache Tomcat" />
- <property name="year" value="2007" />
+ <property name="year" value="2008" />
<property name="version.major" value="6" />
<property name="version.minor" value="0" />
<property name="version.build" value="0" />
@@ -701,6 +701,12 @@
<param name="basedir" value="${jasper-jdt.home}" />
</antcall>
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${nsis.loc}"/>
+ <param name="destfile" value="${nsis.exe}"/>
+ <param name="destdir" value="${nsis.home}/.."/>
+ </antcall>
+
</target>
<target name="build-tomcat-dbcp">
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=673614&r1=673613&r2=673614&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Thu Jul 3 01:25:40 2008
@@ -437,7 +437,7 @@
<!-- ================= DIST: Create Windows Installer =================== -->
<target name="installer"
- description="Create Windows installer" if="execute.installer">
+ description="Create Windows installer" unless="skip.installer">
<echo message="Builds a Windows installer based on Nullsoft Installer"/>
<copy todir="${tomcat.dist}">
<fileset dir="res" />
@@ -454,7 +454,12 @@
<filter token="VERSION_NUMBER" value="${version.number}"/>
<copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
filtering="true" overwrite="true"/>
- <exec dir="${tomcat.dist}" executable="${nsis.exe}">
+ <exec dir="${tomcat.dist}" executable="${nsis.exe}" os="windows">
+ <arg value="/DNSISDIR=${nsis.home}" />
+ <arg value="tomcat.nsi" />
+ </exec>
+ <exec dir="${tomcat.dist}" executable="wine" osfamily="unix">
+ <arg value="${nsis.exe}" />
<arg value="/DNSISDIR=${nsis.home}" />
<arg value="tomcat.nsi" />
</exec>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=673614&r1=673613&r2=673614&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jul 3 01:25:40 2008
@@ -33,6 +33,13 @@
<body>
<section name="Tomcat 6.0.17 (remm)">
+ <subsection name="General">
+ <changelog>
+ <update>
+ <bug>45315</bug>: Add Unix support for NSIS. (remm)
+ </update>
+ </changelog>
+ </subsection>
<subsection name="Catalina">
<changelog>
<fix><bug>45272</bug>Put in work around for Internet Explorer not
accepting a quoted Path: value using the Set-Cookie header (fhanik)</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
