View | Details | Raw Unified | Return to bug 45315
Collapse All | Expand All

(-)build.xml (-1 / +7 lines)
Lines 29-35 Link Here
29
29
30
  <!-- Project Properties -->
30
  <!-- Project Properties -->
31
  <property name="name"                  value="Apache Tomcat" />
31
  <property name="name"                  value="Apache Tomcat" />
32
  <property name="year"                  value="2007" />
32
  <property name="year"                  value="2008" />
33
  <property name="version.major"         value="6" />
33
  <property name="version.major"         value="6" />
34
  <property name="version.minor"         value="0" />
34
  <property name="version.minor"         value="0" />
35
  <property name="version.build"         value="0" />
35
  <property name="version.build"         value="0" />
Lines 701-706 Link Here
701
      <param name="basedir" value="${jasper-jdt.home}" />
701
      <param name="basedir" value="${jasper-jdt.home}" />
702
    </antcall>
702
    </antcall>
703
703
704
    <antcall target="downloadzip">
705
      <param name="sourcefile" value="${nsis.loc}"/>
706
      <param name="destfile" value="${nsis.exe}"/>
707
      <param name="destdir" value="${nsis.home}/.."/>
708
    </antcall>
709
704
  </target>
710
  </target>
705
711
706
  <target name="build-tomcat-dbcp">
712
  <target name="build-tomcat-dbcp">
(-)dist.xml (-2 / +7 lines)
Lines 437-443 Link Here
437
437
438
  <!-- ================= DIST: Create Windows Installer =================== -->
438
  <!-- ================= DIST: Create Windows Installer =================== -->
439
  <target name="installer"
439
  <target name="installer"
440
   description="Create Windows installer" if="execute.installer">
440
   description="Create Windows installer" unless="skip.installer">
441
    <echo message="Builds a Windows installer based on Nullsoft Installer"/>
441
    <echo message="Builds a Windows installer based on Nullsoft Installer"/>
442
    <copy todir="${tomcat.dist}">
442
    <copy todir="${tomcat.dist}">
443
      <fileset dir="res" />
443
      <fileset dir="res" />
Lines 454-463 Link Here
454
    <filter token="VERSION_NUMBER" value="${version.number}"/>
454
    <filter token="VERSION_NUMBER" value="${version.number}"/>
455
455
456
    <copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" filtering="true" overwrite="true"/>
456
    <copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" filtering="true" overwrite="true"/>
457
    <exec dir="${tomcat.dist}" executable="${nsis.exe}">
457
    <exec dir="${tomcat.dist}" executable="${nsis.exe}" os="windows">
458
      <arg value="/DNSISDIR=${nsis.home}" />
458
      <arg value="/DNSISDIR=${nsis.home}" />
459
      <arg value="tomcat.nsi" />
459
      <arg value="tomcat.nsi" />
460
    </exec>
460
    </exec>
461
    <exec dir="${tomcat.dist}" executable="wine" osfamily="unix">
462
      <arg value="${nsis.exe}" />
463
      <arg value="/DNSISDIR=${nsis.home}" />
464
      <arg value="tomcat.nsi" />
465
    </exec>
461
466
462
    <move file="${tomcat.dist}/tomcat-installer.exe" tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" />
467
    <move file="${tomcat.dist}/tomcat-installer.exe" tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" />
463
468
(-)build.properties.default (-2 / +3 lines)
Lines 45-50 Link Here
45
45
46
base-commons.loc=http://archive.apache.org/dist/commons
46
base-commons.loc=http://archive.apache.org/dist/commons
47
base-tomcat.loc=http://archive.apache.org/dist/tomcat
47
base-tomcat.loc=http://archive.apache.org/dist/tomcat
48
base-sf.loc=http://downloads.sourceforge.net
48
49
49
# ----- Commons Logging, version 1.1 or later -----
50
# ----- Commons Logging, version 1.1 or later -----
50
commons-logging-version=1.1.1
51
commons-logging-version=1.1.1
Lines 82-93 Link Here
82
commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz
83
commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz
83
84
84
# ----- NSIS, version 2.0 or later -----
85
# ----- NSIS, version 2.0 or later -----
85
nsis.home=${base.path}/nsis-2.34
86
nsis.home=${base.path}/nsis-2.37
86
nsis.exe=${nsis.home}/makensis.exe
87
nsis.exe=${nsis.home}/makensis.exe
87
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
88
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
88
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
89
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
89
nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
90
nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
90
nsis.loc=${base-sf.loc}/nsis/nsis-2.34-setup.exe
91
nsis.loc=${base-sf.loc}/nsis/nsis-2.37.zip
91
92
92
# ----- Commons Daemon, version 1.0-Alpha or later -----
93
# ----- Commons Daemon, version 1.0-Alpha or later -----
93
commons-daemon.home=${base.path}/commons-daemon-1.0.1
94
commons-daemon.home=${base.path}/commons-daemon-1.0.1

Return to bug 45315