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 2008/07/06 18:14:02 UTC
svn commit: r674311 - in /tomcat/trunk: build.properties.default build.xml
dist.xml
Author: markt
Date: Sun Jul 6 09:14:01 2008
New Revision: 674311
URL: http://svn.apache.org/viewvc?rev=674311&view=rev
Log:
Port windows installer changes from 6.0.x to trunk
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/dist.xml
Modified: tomcat/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=674311&r1=674310&r2=674311&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Sun Jul 6 09:14:01 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/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=674311&r1=674310&r2=674311&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sun Jul 6 09:14:01 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" />
@@ -644,6 +644,11 @@
<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" unless="jdk16.present">
Modified: tomcat/trunk/dist.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=674311&r1=674310&r2=674311&view=diff
==============================================================================
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Sun Jul 6 09:14:01 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}" osfamily="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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org