[jsword-svn] r2306 - trunk/bibledesktop
dmsmith at crosswire.org
dmsmith at crosswire.org
Sun Mar 17 06:53:11 MST 2013
Author: dmsmith
Date: 2013-03-17 06:53:11 -0700 (Sun, 17 Mar 2013)
New Revision: 2306
Modified:
trunk/bibledesktop/build.xml
Log:
build improvements
Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml 2013-03-12 18:38:11 UTC (rev 2305)
+++ trunk/bibledesktop/build.xml 2013-03-17 13:53:11 UTC (rev 2306)
@@ -12,7 +12,9 @@
<!-- override -->
<property name="website.bd.dir" value="${dest.install.web.dir}"/>
<!-- override -->
- <property name="package.bd.dir" value="${dest.install.pkg.dir}"/>
+ <property name="package.bd.dir" value="${dest.install.pkg.dir}"/>
+ <property name="package.bd.win.dir" value="${package.bd.dir}/windows"/>
+ <property name="package.bd.webstart.dir" value="${package.bd.dir}/webstart"/>
<property name="gener.root" value="${dest.dir}/gener"/>
@@ -69,26 +71,26 @@
</fixcrlf>
<zip destfile="${dest.install.pkg.dir}/${name.timestamped}-bin.zip">
+ <zipfileset prefix="${name.versioned}" dir="${etc.dir}/images" includes="*.png"/>
+ <zipfileset prefix="${name.versioned}" file="${etc.dir}/license/gpl.txt"/>
<zipfileset prefix="${name.versioned}" dir="${lib.dir}">
<patternset refid="patternset.runtime"/>
</zipfileset>
<zipfileset prefix="${name.versioned}" dir="${etc.dir}/bin" includes="*.sh" filemode="755"/>
<zipfileset prefix="${name.versioned}" dir="${etc.dir}/bin" includes="*.bat"/>
- <zipfileset prefix="${name.versioned}" dir="${etc.dir}/installer/win32" includes="BibleDesktop.exe"/>
- <zipfileset prefix="${name.versioned}" dir="${etc.dir}/images" includes="*.png"/>
- <zipfileset prefix="${name.versioned}" file="${etc.dir}/license/gpl.txt"/>
+ <zipfileset prefix="${name.versioned}" dir="${package.bd.dir}" includes="BibleDesktop.exe"/>
</zip>
</target>
<!-- Prepare the WebStart distribution -->
<target name="package.webstart"
depends="keygen">
- <mkdir dir="${dest.install.pkg.dir}"/>
- <property name="dest.install.webstart.dir" value="${dest.install.pkg.dir}/webstart"/>
+ <mkdir dir="${package.bd.dir}"/>
+ <mkdir dir="${package.bd.webstart.dir}"/>
<!-- Copy the files needed for the distribution -->
<copy verbose="${verbose.copy}"
- todir="${dest.install.webstart.dir}"
+ todir="${package.bd.webstart.dir}"
preservelastmodified="true">
<fileset dir="${etc.dir}/jnlp">
<include name="*.gif"/>
@@ -97,7 +99,7 @@
<!-- Put signed copies of the jars where Webstart can get them. -->
<signjar
- destDir="${dest.install.webstart.dir}"
+ destDir="${package.bd.webstart.dir}"
storepass="${keystore.pswd}"
alias="${keystore.alias}"
keystore="${keystore.file}"
@@ -109,7 +111,7 @@
<!-- Copy and filter to make it work -->
<copy verbose="${verbose.copy}"
file="${etc.dir}/jnlp/bibledesktop.jnlp"
- tofile="${dest.install.webstart.dir}/bibledesktop.jnlp"
+ tofile="${package.bd.webstart.dir}/bibledesktop.jnlp"
filtering="true"
preservelastmodified="true">
<filterset>
@@ -122,17 +124,17 @@
<!-- Prepare the Mac distribution as a zip file. -->
<target name="package.macosx">
- <mkdir dir="${dest.install.pkg.dir}"/>
+ <mkdir dir="${package.bd.dir}"/>
<copy verbose="${verbose.copy}"
file="${etc.dir}/installer/macosx/BibleDesktop.app/Contents/Info.plist"
- toFile="${dest.install.pkg.dir}/Info.plist"
+ toFile="${package.bd.dir}/Info.plist"
preservelastmodified="true">
<filterset>
<filter token="release.version" value="${release.version}"/>
</filterset>
</copy>
- <zip destfile="${dest.install.pkg.dir}/BibleDesktop.app.zip" update="true">
+ <zip destfile="${package.bd.dir}/BibleDesktop.app.zip" update="true">
<!-- Copy everything but the executable (zip will not preserve permissions)
== And Info.plist, which needs to be filtered.
-->
@@ -150,7 +152,7 @@
<!-- Copy the filtered Info.plist file -->
<zipfileset
prefix="BibleDesktop.app/Contents"
- file="${dest.install.pkg.dir}/Info.plist"/>
+ file="${package.bd.dir}/Info.plist"/>
<!-- Add in all the unsigned jars -->
<zipfileset
prefix="BibleDesktop.app/Contents/Resources/Java"
@@ -158,24 +160,22 @@
<patternset refid="patternset.runtime"/>
</zipfileset>
</zip>
- <delete file="${dest.install.pkg.dir}/Info.plist"/>
+ <delete file="${package.bd.dir}/Info.plist"/>
</target>
- <!-- Build the Windows installers from the installed/signed jars -->
+ <!-- Build the Windows installers -->
<target name="package.windows"
depends="nsis.task"
if="nsis.available">
- <property name="dest.install.nsis.dir" value="${dest.install.pkg.dir}/nsis"/>
- <mkdir dir="${dest.install.nsis.dir}"/>
+ <mkdir dir="${package.bd.dir}"/>
+ <mkdir dir="${package.bd.win.dir}"/>
<!-- Copy the files needed for the distribution -->
<copy verbose="${verbose.copy}"
- todir="${dest.install.nsis.dir}"
+ todir="${package.bd.win.dir}"
preservelastmodified="true">
- <fileset dir="${etc.dir}/bin" includes="*.bat"/>
<fileset dir="${etc.dir}/installer/win32">
<include name="*.ico"/>
- <include name="BibleDesktop.exe"/>
</fileset>
<fileset file="${etc.dir}/license/gpl.txt"/>
<fileset dir="${lib.dir}">
@@ -183,13 +183,8 @@
</fileset>
</copy>
- <!-- Ensure that line endings are consistent with the windows platform -->
- <fixcrlf srcdir="${dest.install.nsis.dir}" eol="crlf">
- <include name="**/*.bat"/>
- </fixcrlf>
-
<copy verbose="${verbose.copy}"
- todir="${dest.install.nsis.dir}"
+ todir="${package.bd.win.dir}"
preservelastmodified="true"
filtering="true">
<fileset dir="${etc.dir}/installer/win32">
@@ -199,12 +194,19 @@
<filter token="release.version" value="${release.version}"/>
</filterset>
</copy>
- <nsis verbosity="2" script="${dest.install.nsis.dir}/BibleDesktop.nsi"/>
- <nsis verbosity="2" script="${dest.install.nsis.dir}/PortableBibleDesktop.nsi"/>
- <nsis verbosity="2" script="${dest.install.nsis.dir}/BibleDesktopSetup.nsi"/>
- <delete file="${dest.install.nsis.dir}/BibleDesktop.nsi"/>
- <delete file="${dest.install.nsis.dir}/PortableBibleDesktop.nsi"/>
- <delete file="${dest.install.nsis.dir}/BibleDesktopSetup.nsi"/>
+ <nsis verbosity="2" script="${package.bd.win.dir}/BibleDesktop.nsi"/>
+ <nsis verbosity="2" script="${package.bd.win.dir}/PortableBibleDesktop.nsi"/>
+ <nsis verbosity="2" script="${package.bd.win.dir}/BibleDesktopSetup.nsi"/>
+ <copy verbose="${verbose.copy}"
+ todir="${package.bd.dir}"
+ preservelastmodified="true">
+ <fileset dir="${package.bd.win.dir}">
+ <include name="*.ico"/>
+ <include name="BibleDesktopSetup.exe"/>
+ <include name="PortableBibleDesktop.exe"/>
+ </fileset>
+ </copy>
+ <delete dir="${package.bd.win.dir}"/>
</target>
</project>
More information about the jsword-svn
mailing list