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

(-)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

Return to bug 45315