Port windows installer changes from 6.0.x to trunk

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@674311 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.properties.default b/build.properties.default
index 4b61f50..0c0c185 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -45,6 +45,7 @@ compile.debug=true
 
 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.loc=${base-jakarta.loc}/commons/collections/binaries/commons
 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

diff --git a/build.xml b/build.xml
index ff10c84..b3a1072 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -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">

diff --git a/dist.xml b/dist.xml
index 746a20a..878200c 100644 (file)
--- a/dist.xml
+++ b/dist.xml
@@ -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>