s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #936 from RBGKew/line-endings-for-distribution

Browse Source 
Convert config file line endings to LF or CRLF for Linux and Windows distributions.
This commit is contained in:
Tom Morris 2015-01-25 14:05:50 -05:00
commit c7f3beaff8
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
build.xml
View File

@ -329,18 +329,17 @@
</fileset> </fileset>
</copy> </copy>
<copy todir="${windows.dir}/licenses"> <mkdir dir="${windows.dir}/licenses"/>
<fileset dir="${basedir}/licenses"> <fixcrlf srcDir="${basedir}/licenses" destDir="${windows.dir}/licenses" eol="crlf"/>
<include name="**"/>
</fileset> <fixcrlf srcDir="${basedir}" destDir="${windows.dir}" eol="crlf">
</copy> <include name="refine.bat"/>
<include name="refine.ini"/>
<include name="README.txt"/>
<include name="LICENSE.txt"/>
</fixcrlf>
<fixcrlf file="${conf.dir}/openrefine.l4j.ini" destDir="${windows.dir}" eol="crlf"/>
<copy file="${conf.dir}/openrefine.l4j.ini" tofile="${windows.dir}/openrefine.l4j.ini"/>
<copy file="${basedir}/refine.bat" tofile="${windows.dir}/refine.bat"/>
<copy file="${basedir}/refine.ini" tofile="${windows.dir}/refine.ini"/>
<copy file="${basedir}/README.txt" tofile="${windows.dir}/README.txt"/>
<copy file="${basedir}/LICENSE.txt" tofile="${windows.dir}/LICENSE.txt"/>
<mkdir dir="${dist.dir}"/> <mkdir dir="${dist.dir}"/>
<zip destfile="${dist.dir}/openrefine-win-${version}.zip" basedir="${windows.dir}/.." includes="${release.name}/**"/> <zip destfile="${dist.dir}/openrefine-win-${version}.zip" basedir="${windows.dir}/.." includes="${release.name}/**"/>
</target> </target>
@ -362,16 +361,16 @@
</fileset> </fileset>
</copy> </copy>
<copy todir="${linux.dir}/licenses"> <mkdir dir="${linux.dir}/licenses"/>
<fileset dir="${basedir}/licenses"> <fixcrlf srcDir="${basedir}/licenses" destDir="${linux.dir}/licenses" eol="lf"/>
<include name="**"/>
</fileset> <fixcrlf srcDir="${basedir}" destDir="${linux.dir}" eol="lf">
</copy> <include name="refine"/>
<copy file="${basedir}/refine.ini" tofile="${linux.dir}/refine.ini"/> <include name="refine.ini"/>
<copy file="${basedir}/LICENSE.txt" tofile="${linux.dir}/LICENSE.txt"/> <include name="README.txt"/>
<copy file="${basedir}/README.txt" tofile="${linux.dir}/README.txt"/> <include name="LICENSE.txt"/>
<copy file="${basedir}/refine" tofile="${linux.dir}/refine"/> </fixcrlf>
<mkdir dir="${dist.dir}"/> <mkdir dir="${dist.dir}"/>
<tar longfile="gnu" compression="gzip" destfile="${dist.dir}/openrefine-linux-${version}.tar.gz"> <tar longfile="gnu" compression="gzip" destfile="${dist.dir}/openrefine-linux-${version}.tar.gz">
<tarfileset dir="${linux.dir}/.." filemode="755"> <tarfileset dir="${linux.dir}/.." filemode="755">