Changeset ac1b51c for build.xml


Ignore:
Timestamp:
Apr 18, 2012 1:44:17 AM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
49cee5b, aa02358
Parents:
746b91f2
Message:

Fix installer-windows build target

Izpack tries to parse the 'unix-only' files in Windows. If we don't copy them,
the installation will fail in Windows. Therefore, moving the files that were in
the preppkg-unix target to the preppkg-base target. They're so small I don't
see how this will be a problem.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r746b91f2 rac1b51c  
    732732    </target>
    733733
    734     <target name="preppkg-unix" depends="preppkg-base, prep-script-translation" >
    735         <copy file="installer/resources/runplain.sh" todir="pkg-temp/" />
    736         <!-- <copy file="apps/i2psnark/launch-i2psnark" todir="pkg-temp/" /> old feature that per zzz isn't used-->
    737         <copy file="installer/resources/eepget" todir="pkg-temp/" />
    738         <copy file="installer/resources/i2prouter" todir="pkg-temp/" />
    739         <copy file="installer/resources/osid" todir="pkg-temp/" />
    740         <copy file="installer/resources/postinstall.sh" todir="pkg-temp/" />
    741         <copy todir="pkg-temp/man/">
    742             <fileset dir="installer/resources/man/" />
    743         </copy>
    744     </target>
     734    <target name="preppkg-unix" depends="preppkg-base, prep-script-translation" />
    745735
    746736    <target name="preppkg-linux" depends="preppkg-linux-x86,preppkg-linux-nonx86" />
     
    840830        <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
    841831        <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
     832        <copy file="installer/resources/runplain.sh" todir="pkg-temp/" />
     833        <copy file="installer/resources/eepget" todir="pkg-temp/" />
     834        <copy file="installer/resources/i2prouter" todir="pkg-temp/" />
     835        <copy file="installer/resources/osid" todir="pkg-temp/" />
     836        <copy file="installer/resources/postinstall.sh" todir="pkg-temp/" />
     837        <copy todir="pkg-temp/man/">
     838            <fileset dir="installer/resources/man/" />
     839        </copy>
    842840        <!--
    843841             Disabling per zzz's statement on IRC: jetty-i2psnark.xml is for an obscure feature that is broken anyway,
Note: See TracChangeset for help on using the changeset viewer.