[jsword-svn] r2293 - in trunk: bibledesktop bibledesktop-web jsword-web
dmsmith at crosswire.org
dmsmith at crosswire.org
Sun Mar 10 13:51:23 MST 2013
Author: dmsmith
Date: 2013-03-10 13:51:23 -0700 (Sun, 10 Mar 2013)
New Revision: 2293
Modified:
trunk/bibledesktop-web/build.xml
trunk/bibledesktop/build.xml
trunk/jsword-web/build.xml
Log:
build improvements
Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml 2013-03-10 19:56:49 UTC (rev 2292)
+++ trunk/bibledesktop/build.xml 2013-03-10 20:51:23 UTC (rev 2293)
@@ -6,14 +6,13 @@
<!--=======================================================================-->
<!-- override -->
- <property name="jnlp.homepage" value="file:///${basedir}/${dest.install.dir}"/>
+ <property name="jnlp.homepage" value="file:///${basedir}/${dest.install.pkg.dir}"/>
<!-- override -->
- <property name="jnlp.codebase" value="file:///${basedir}/${dest.install.dir}"/>
+ <property name="jnlp.codebase" value="file:///${basedir}/${dest.install.pkg.dir}"/>
<!-- override -->
<property name="website.bd.dir" value="${dest.install.web.dir}"/>
<!-- override -->
- <property name="package.bd.dir" value="${website.bd.dir}"/>
- <property name="dest.install.dir" value="${package.bd.dir}"/>
+ <property name="package.bd.dir" value="${dest.install.pkg.dir}"/>
<property name="gener.root" value="${dest.dir}/gener"/>
@@ -52,7 +51,7 @@
<!-- Package the command-line distribution -->
<target name="package.bin">
- <mkdir dir="${dest.install.dir}"/>
+ <mkdir dir="${dest.install.pkg.dir}"/>
<!-- Ensure sane execute permissions -->
<chmod perm="a+x">
<fileset dir="${etc.dir}/bin" includes="*.sh"/>
@@ -69,37 +68,26 @@
</fixcrlf>
<!-- create a zip file -->
- <zip zipfile="${dest.install.dir}/${name.timestamped}-bin.zip">
- <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"/>
+ <zip zipfile="${dest.install.pkg.dir}/${name.timestamped}-bin.zip">
</zip>
- <symlink
- link="${dest.install.dir}/${ant.project.name}-latest-bin.zip"
- resource="${dest.install.dir}/${name.timestamped}-bin.zip"
- overwrite="true"
- failonerror="false"/>
<!-- Convert the zip into a tar.gz -->
- <tar tarfile="${dest.install.dir}/${name.timestamped}-bin.tar.gz" compression="gzip">
- <zipfileset src="${dest.install.dir}/${name.timestamped}-bin.zip"/>
+ <tar tarfile="${dest.install.pkg.dir}/${name.timestamped}-bin.tar.gz" compression="gzip">
+ <tarfileset prefix="${name.versioned}" dir="${lib.dir}">
+ <patternset refid="patternset.runtime"/>
+ </tarfileset>
+ <tarfileset prefix="${name.versioned}" dir="${etc.dir}/bin" includes="*.sh" filemode="755"/>
+ <tarfileset prefix="${name.versioned}" dir="${etc.dir}/bin" includes="*.bat"/>
+ <tarfileset prefix="${name.versioned}" dir="${etc.dir}/installer/win32" includes="BibleDesktop.exe"/>
+ <tarfileset prefix="${name.versioned}" dir="${etc.dir}/images" includes="*.png"/>
+ <tarfileset prefix="${name.versioned}" file="${etc.dir}/license/gpl.txt"/>
</tar>
- <symlink
- link="${dest.install.dir}/${ant.project.name}-latest-bin.tar.gz"
- resource="${dest.install.dir}/${name.timestamped}-bin.tar.gz"
- overwrite="true"
- failonerror="false"/>
</target>
<!-- Prepare the WebStart distribution -->
<target name="package.webstart">
- <mkdir dir="${dest.install.dir}"/>
- <property name="dest.install.webstart.dir" value="${dest.install.dir}/webstart"/>
+ <mkdir dir="${dest.install.pkg.dir}"/>
+ <property name="dest.install.webstart.dir" value="${dest.install.pkg.dir}/webstart"/>
<!-- Copy the files needed for the distribution -->
<copy verbose="${verbose.copy}"
@@ -137,17 +125,17 @@
<!-- Prepare the Mac distribution as a zip file. -->
<target name="package.macosx">
- <mkdir dir="${dest.install.dir}"/>
+ <mkdir dir="${dest.install.pkg.dir}"/>
<copy verbose="${verbose.copy}"
file="${etc.dir}/installer/macosx/BibleDesktop.app/Contents/Info.plist"
- toFile="${dest.install.dir}/Info.plist"
+ toFile="${dest.install.pkg.dir}/Info.plist"
preservelastmodified="true">
<filterset>
<filter token="release.version" value="${release.version}"/>
</filterset>
</copy>
- <zip destfile="${dest.install.dir}/BibleDesktop.app.zip" update="true">
+ <zip destfile="${dest.install.pkg.dir}/BibleDesktop.app.zip" update="true">
<!-- Copy everything but the executable (zip will not preserve permissions)
== And Info.plist, which needs to be filtered.
-->
@@ -165,7 +153,7 @@
<!-- Copy the filtered Info.plist file -->
<zipfileset
prefix="BibleDesktop.app/Contents"
- file="${dest.install.dir}/Info.plist"/>
+ file="${dest.install.pkg.dir}/Info.plist"/>
<!-- Add in all the unsigned jars -->
<zipfileset
prefix="BibleDesktop.app/Contents/Resources/Java"
@@ -173,15 +161,15 @@
<patternset refid="patternset.runtime"/>
</zipfileset>
</zip>
- <delete file="${dest.install.dir}/Info.plist"/>
+ <delete file="${dest.install.pkg.dir}/Info.plist"/>
</target>
<!-- Build the Windows installers from the installed/signed jars -->
<target name="package.windows">
- <mkdir dir="${dest.install.dir}"/>
+ <mkdir dir="${dest.install.pkg.dir}"/>
<!-- Copy the files needed for the distribution -->
<copy verbose="${verbose.copy}"
- todir="${dest.install.dir}"
+ todir="${dest.install.pkg.dir}"
preservelastmodified="true">
<fileset dir="${etc.dir}/bin" includes="*.bat"/>
<fileset dir="${etc.dir}/installer/win32">
@@ -192,12 +180,12 @@
</copy>
<!-- Ensure that line endings are consistent with the windows platform -->
- <fixcrlf srcdir="${dest.install.dir}" eol="crlf">
+ <fixcrlf srcdir="${dest.install.pkg.dir}" eol="crlf">
<include name="**/*.bat"/>
</fixcrlf>
<copy verbose="${verbose.copy}"
- todir="${dest.install.dir}"
+ todir="${dest.install.pkg.dir}"
preservelastmodified="true"
filtering="true">
<fileset dir="${etc.dir}/installer/win32">
@@ -208,13 +196,13 @@
</filterset>
</copy>
<!--
- <nsis verbosity="1" script="${dest.install.dir}/BibleDesktop.nsi"/>
- <nsis verbosity="1" script="${dest.install.dir}/PortableBibleDesktop.nsi"/>
- <nsis verbosity="1" script="${dest.install.dir}/BibleDesktopSetup.nsi"/>
+ <nsis verbosity="1" script="${dest.install.pkg.dir}/BibleDesktop.nsi"/>
+ <nsis verbosity="1" script="${dest.install.pkg.dir}/PortableBibleDesktop.nsi"/>
+ <nsis verbosity="1" script="${dest.install.pkg.dir}/BibleDesktopSetup.nsi"/>
-->
- <delete file="${dest.install.dir}/BibleDesktop.nsi"/>
- <delete file="${dest.install.dir}/PortableBibleDesktop.nsi"/>
- <delete file="${dest.install.dir}/BibleDesktopSetup.nsi"/>
+ <delete file="${dest.install.pkg.dir}/BibleDesktop.nsi"/>
+ <delete file="${dest.install.pkg.dir}/PortableBibleDesktop.nsi"/>
+ <delete file="${dest.install.pkg.dir}/BibleDesktopSetup.nsi"/>
</target>
</project>
Modified: trunk/bibledesktop-web/build.xml
===================================================================
--- trunk/bibledesktop-web/build.xml 2013-03-10 19:56:49 UTC (rev 2292)
+++ trunk/bibledesktop-web/build.xml 2013-03-10 20:51:23 UTC (rev 2293)
@@ -5,27 +5,27 @@
<!--=======================================================================-->
<!-- override -->
- <property name="website.bd.dir" value="${dest.install.web.dir}"/>
- <property name="dest.install.web.dir" value="${website.bd.dir}"/>
+ <property name="website.bd.dir" value="${website.bd.dir}"/>
+ <property name="website.bd.dir" value="${website.bd.dir}"/>
<!--=======================================================================-->
<target name="webapp" description="Build an unpacked war file">
- <mkdir dir="${dest.install.web.dir}" />
- <xslt basedir="${src.main.web.dir}" extension=".html" style="${src.main.web.dir}/template.xsl" destdir="${dest.install.web.dir}">
+ <mkdir dir="${website.bd.dir}" />
+ <xslt basedir="${src.main.web.dir}" extension=".html" style="${src.main.web.dir}/template.xsl" destdir="${website.bd.dir}">
<outputproperty name="method" value="html" />
<outputproperty name="omit-xml-declaration" value="yes" />
<include name="**/*.html" />
<xmlcatalog refid="commonDTDs" />
</xslt>
- <copy todir="${dest.install.web.dir}">
+ <copy todir="${website.bd.dir}">
<fileset dir="${src.main.web.dir}">
<exclude name="*.jsp" />
<exclude name="*.html" />
<exclude name="*.xsl" />
</fileset>
</copy>
- <mkdir dir="${dest.install.web.dir}/WEB-INF/classes" />
- <mkdir dir="${dest.install.web.dir}/WEB-INF/lib" />
+ <mkdir dir="${website.bd.dir}/WEB-INF/classes" />
+ <mkdir dir="${website.bd.dir}/WEB-INF/lib" />
</target>
<!--=======================================================================-->
Modified: trunk/jsword-web/build.xml
===================================================================
--- trunk/jsword-web/build.xml 2013-03-10 19:56:49 UTC (rev 2292)
+++ trunk/jsword-web/build.xml 2013-03-10 20:51:23 UTC (rev 2293)
@@ -16,8 +16,8 @@
<property name="website.jsword.dir" value="${dest.install.web.dir}"/>
<property name="dest.install.web.dir" value="${website.jsword.dir}"/>
<!-- override -->
- <property name="package.jsword.dir" value="${dest.install.dir}"/>
- <property name="dest.install.dir" value="${package.jsword.dir}"/>
+ <property name="package.jsword.dir" value="${dest.install.pkg.dir}"/>
+ <property name="dest.install.pkg.dir" value="${package.jsword.dir}"/>
<property name="release.dir" value="${ftp.base}/release"/>
@@ -85,7 +85,7 @@
<fileset dir="${lib.dir}" includes="*.jar"/>
</copy>
<!-- needed by the download servlet -->
- <mkdir dir="${dest.install.dir}"/>
+ <mkdir dir="${dest.install.pkg.dir}"/>
<mkdir dir="${release.dir}"/>
<!-- build the iBD servlet -->
<xslt basedir="${src.main.web.dir}/iBD" extension=".html" style="${src.main.web.dir}/template.xsl" destdir="${dest.install.web.dir}">
More information about the jsword-svn
mailing list