Changeset 73e25aa


Ignore:
Timestamp:
Dec 25, 2012 12:13:32 AM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
14eedaa
Parents:
f3f4529
Message:
  • Add EOL modifications
    • set eol for certain files in installer targets (since editing *.config and *.xml in windows is practically impossible without an externally installed editor such as vim or notepad++ and of course we want people to be able to read the licenses if they desire…etc.)
    • try to prevent user error by ensuring that the proxy/*.ht files have eol set to crlf in the prepConsoleDocs target
File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rf3f4529 r73e25aa  
    938938          <fileset dir="installer/resources/initialNews/" />
    939939        </copy>
     940        <!-- ensure the proxy files have the correct line endings -->
     941        <fixcrlf srcdir="pkg-temp/docs" includes="*.ht" encoding="utf8" eol="crlf" />
    940942    </target>
    941943
     
    12311233    <!-- Custom installers -->
    12321234    <target name="installer-nowindows" depends="clean, preppkg-nowindows, izpack-patches" >
     1235        <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
    12331236        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}.jar" installerType="standard" basedir="${basedir}" />
    12341237    </target>
     
    12361239
    12371240    <target name="installer-freebsd" depends="clean, preppkg-freebsd-only, izpack-patches" >
     1241        <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
    12381242        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
    12391243    </target>
    12401244
    12411245    <target name="installer-linux" depends="clean, preppkg-linux-only, izpack-patches" >
     1246        <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
    12421247        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_linux-only.jar" installerType="standard" basedir="${basedir}" />
    12431248    </target>
     
    12451250
    12461251    <target name="installer-osx" depends="clean, checkForIzpack2App, preppkg-osx-only, izpack-patches">
    1247         <mkdir dir="pkg-temp/osx" />
    1248         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_osx-only.jar" installerType="standard" basedir="${basedir}" />
    1249         <ant target="installer2app" />
    1250         <delete dir="pkg-temp/osx" />
     1252        <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
     1253        <mkdir dir="pkg-temp/osx" />
     1254        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_osx-only.jar" installerType="standard" basedir="${basedir}" />
     1255        <ant target="installer2app" />
     1256        <delete dir="pkg-temp/osx" />
    12511257    </target>
    12521258
     
    12861292
    12871293    <target name="installer-windows" depends="clean, preppkg-windows-only, util-list-changes, izpack-patches, utility-jars" >
    1288         <izpack input="${basedir}/installer/install.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
     1294        <fixcrlf srcdir="pkg-temp" includes="*.config *.bat *.cmd **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="crlf"/>
     1295        <izpack input="${basedir}/installer/install.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
    12891296        <ant target="installerexe" />
    12901297        <delete file="${basedir}/install.jar" />
Note: See TracChangeset for help on using the changeset viewer.