Ignore:
Timestamp:
Feb 1, 2017, 10:38:41 AM (4 years ago)
Author:
Juanma
Message:

Updated to 3.2.1

File:
1 edited

Legend:

Unmodified
Added
Removed
  • jclic/trunk/fuentes/instal/build.xml

    r116 r3466  
    4747    <zip destfile="${instal.dir}/${prefix}.zip">
    4848      <zipfileset dir="." includes="COPYING.txt" prefix="${prefix}" />
    49       <zipfileset dir="." includes="CHANGES.txt" prefix="${prefix}" />
     49      <zipfileset dir="." includes="CHANGES.md" prefix="${prefix}" />
    5050      <zipfileset dir="." includes="CREDITS.txt" prefix="${prefix}" />
    5151      <zipfileset dir="." includes="HACKING.txt" prefix="${prefix}" />
     
    7777        <!-- Windows installer must be compiled with NSIS-Unicode (http://www.scratchpaper.com/) -->
    7878        <!-- nsis.dir must be defined in {home}/.ant-global.properties -->
    79         <exec dir="${instal.dir}" executable="${nsis.dir}/makensis.exe" output="${instal.dir}/nsis.log">
     79        <!-- In Linux, "wine" is used to call a windows version of NSIS-Unicode -->
     80
     81        <exec os="Windows" dir="${instal.dir}" executable="${nsis.dir}/makensis.exe" output="${instal.dir}/nsis.log">
    8082          <arg line="/V4 /DPRODUCT_VERSION=${version} setup.nsi"/>
    8183        </exec>
    8284
    83         <!-- Windows installer must be compiled with NSIS-Unicode (http://www.scratchpaper.com/) -->
    84         <!-- POSIX version of the current version of NSIS does not work with unicode strings -->
    85         <!-- exec os="Linux" dir="${instal.dir}" executable="${nsis.dir}/bin/makensis" output="${instal.dir}/nsis.log">
    86           <arg line="-V4 -DPRODUCT_VERSION=${version} setup.nsi"/>
    87         </exec-->
     85        <exec os="Linux" dir="${instal.dir}" executable="wine" output="${instal.dir}/nsis.log">
     86          <arg line="${nsis.dir}/makensis.exe"/>
     87          <arg line="/V4 /DPRODUCT_VERSION=${version} setup.nsi"/>
     88        </exec>
    8889
    8990  </target>
Note: See TracChangeset for help on using the changeset viewer.