[jsword-svn] r2291 - in trunk: bibledesktop bibledesktop-web jsword-web
dmsmith at crosswire.org
dmsmith at crosswire.org
Sun Mar 10 12:26:42 MST 2013
Author: dmsmith
Date: 2013-03-10 12:26:42 -0700 (Sun, 10 Mar 2013)
New Revision: 2291
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 13:59:17 UTC (rev 2290)
+++ trunk/bibledesktop/build.xml 2013-03-10 19:26:42 UTC (rev 2291)
@@ -6,9 +6,14 @@
<!--=======================================================================-->
<!-- override -->
- <property name="jnlp.homepage" value="file:///${basedir}/${dest.install.dir}"/>
+ <property name="jnlp.homepage" value="file:///${basedir}/${dest.install.dir}"/>
<!-- override -->
- <property name="jnlp.codebase" value="file:///${basedir}/${dest.install.dir}"/>
+ <property name="jnlp.codebase" value="file:///${basedir}/${dest.install.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="gener.root" value="${dest.dir}/gener"/>
@@ -27,7 +32,7 @@
<mkdir dir="${gener.root}/config"/>
<xslt in="${src.main.res.dir}/config.xml"
out="${gener.root}/config/Configsrc.test.java.dir"
- style="${jsword.home}/${etc.dir}/config-test.xsl">
+ style="${etc.shared.dir}/config-test.xsl">
<xmlcatalog refid="commonDTDs"/>
</xslt>
<javac debug="on"
@@ -56,9 +61,7 @@
<!-- Package the command-line distribution -->
<target name="package.bin">
- <property name="name.versioned" value="${ant.project.name}-${release.version}"/>
- <property name="name.timestamped" value="${dest.install.dir}/${name.versioned}-${today}"/>
-
+ <mkdir dir="${dest.install.dir}"/>
<!-- Ensure sane execute permissions -->
<chmod perm="a+x">
<fileset dir="${etc.dir}/bin" includes="*.sh"/>
@@ -75,7 +78,7 @@
</fixcrlf>
<!-- create a zip file -->
- <zip zipfile="${name.timestamped}-bin.zip">
+ <zip zipfile="${dest.install.dir}/${name.timestamped}-bin.zip">
<zipfileset prefix="${name.versioned}" dir="${lib.dir}">
<patternset refid="patternset.runtime"/>
</zipfileset>
@@ -87,23 +90,24 @@
</zip>
<symlink
link="${dest.install.dir}/${ant.project.name}-latest-bin.zip"
- resource="${name.timestamped}-bin.zip"
+ resource="${dest.install.dir}/${name.timestamped}-bin.zip"
overwrite="true"
failonerror="false"/>
<!-- Convert the zip into a tar.gz -->
- <tar tarfile="${name.timestamped}-bin.tar.gz" compression="gzip">
- <zipfileset src="${name.timestamped}-bin.zip"/>
+ <tar tarfile="${dest.install.dir}/${name.timestamped}-bin.tar.gz" compression="gzip">
+ <zipfileset src="${dest.install.dir}/${name.timestamped}-bin.zip"/>
</tar>
<symlink
link="${dest.install.dir}/${ant.project.name}-latest-bin.tar.gz"
- resource="${name.timestamped}-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"/>
<!-- Copy the files needed for the distribution -->
@@ -142,6 +146,7 @@
<!-- Prepare the Mac distribution as a zip file. -->
<target name="package.macosx">
+ <mkdir dir="${dest.install.dir}"/>
<copy verbose="${verbose.copy}"
file="${etc.dir}/installer/macosx/BibleDesktop.app/Contents/Info.plist"
toFile="${dest.install.dir}/Info.plist"
@@ -182,6 +187,7 @@
<!-- Build the Windows installers from the installed/signed jars -->
<target name="package.windows">
+ <mkdir dir="${dest.install.dir}"/>
<!-- Copy the files needed for the distribution -->
<copy verbose="${verbose.copy}"
todir="${dest.install.dir}"
Modified: trunk/bibledesktop-web/build.xml
===================================================================
--- trunk/bibledesktop-web/build.xml 2013-03-10 13:59:17 UTC (rev 2290)
+++ trunk/bibledesktop-web/build.xml 2013-03-10 19:26:42 UTC (rev 2291)
@@ -4,26 +4,28 @@
<property name="dependency" value="bibledesktop"/>
<!--=======================================================================-->
- <property name="webapp.bibledesktop" value="${dest.install.web.dir}"/> <!-- override -->
+ <!-- override -->
+ <property name="website.bd.dir" value="${dest.install.web.dir}"/>
+ <property name="dest.install.web.dir" value="${website.bd.dir}"/>
<!--=======================================================================-->
<target name="webapp" description="Build an unpacked war file">
- <mkdir dir="${webapp.bibledesktop}" />
- <xslt basedir="${src.main.web.dir}" extension=".html" style="${src.main.web.dir}/template.xsl" destdir="${webapp.bibledesktop}">
+ <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}">
<outputproperty name="method" value="html" />
<outputproperty name="omit-xml-declaration" value="yes" />
<include name="**/*.html" />
<xmlcatalog refid="commonDTDs" />
</xslt>
- <copy todir="${webapp.bibledesktop}">
+ <copy todir="${dest.install.web.dir}">
<fileset dir="${src.main.web.dir}">
<exclude name="*.jsp" />
<exclude name="*.html" />
<exclude name="*.xsl" />
</fileset>
</copy>
- <mkdir dir="${webapp.bibledesktop}/WEB-INF/classes" />
- <mkdir dir="${webapp.bibledesktop}/WEB-INF/lib" />
+ <mkdir dir="${dest.install.web.dir}/WEB-INF/classes" />
+ <mkdir dir="${dest.install.web.dir}/WEB-INF/lib" />
</target>
<!--=======================================================================-->
Modified: trunk/jsword-web/build.xml
===================================================================
--- trunk/jsword-web/build.xml 2013-03-10 13:59:17 UTC (rev 2290)
+++ trunk/jsword-web/build.xml 2013-03-10 19:26:42 UTC (rev 2291)
@@ -5,17 +5,22 @@
<property name="dependency" value="bibledesktop-web"/>
<!--=======================================================================-->
- <property name="webapp.jsword" value="${dest.install.web.dir}"/>
<!-- override -->
<property name="jnlp.hostname" value="localhost:8080"/>
<!-- override -->
<property name="ftp.base" value="${basedir}/${dest.dir}/download"/>
<!-- override -->
<property name="ftp.prefix" value="../download"/>
+ <!--=======================================================================-->
<!-- override -->
+ <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="release.dir" value="${ftp.base}/release"/>
- <property name="target.web" value="${webapp.jsword}"/>
<!--=======================================================================-->
<path id="path.alljava">
@@ -49,24 +54,24 @@
<!--=======================================================================-->
<target name="package" description="Build an unpacked war file">
- <mkdir dir="${target.web}"/>
- <xslt basedir="${src.main.web.dir}" extension=".html" style="${src.main.web.dir}/template.xsl" destdir="${target.web}">
+ <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}">
<include name="**/*.html"/>
<xmlcatalog refid="commonDTDs"/>
</xslt>
- <xslt basedir="${src.main.web.dir}" extension=".jsp" style="${src.main.web.dir}/template.xsl" destdir="${target.web}">
+ <xslt basedir="${src.main.web.dir}" extension=".jsp" style="${src.main.web.dir}/template.xsl" destdir="${dest.install.web.dir}">
<include name="*.jsp"/>
<xmlcatalog refid="commonDTDs"/>
</xslt>
- <mkdir dir="${target.web}/WEB-INF"/>
- <copy todir="${target.web}/WEB-INF" filtering="true">
+ <mkdir dir="${dest.install.web.dir}/WEB-INF"/>
+ <copy todir="${dest.install.web.dir}/WEB-INF" filtering="true">
<filterset>
<filter token="ftp.base" value="${ftp.base}"/>
<filter token="ftp.prefix" value="${ftp.prefix}"/>
</filterset>
<fileset dir="${src.main.web.dir}/WEB-INF"/>
</copy>
- <copy todir="${target.web}">
+ <copy todir="${dest.install.web.dir}">
<fileset dir="${src.main.web.dir}">
<exclude name="*.jsp"/>
<exclude name="*.html"/>
@@ -74,30 +79,30 @@
<exclude name="WEB-INF/**"/>
</fileset>
</copy>
- <mkdir dir="${target.web}/WEB-INF/classes"/>
- <mkdir dir="${target.web}/WEB-INF/lib"/>
- <copy todir="${target.web}/WEB-INF/lib">
+ <mkdir dir="${dest.install.web.dir}/WEB-INF/classes"/>
+ <mkdir dir="${dest.install.web.dir}/WEB-INF/lib"/>
+ <copy todir="${dest.install.web.dir}/WEB-INF/lib">
<fileset dir="${lib.dir}" includes="*.jar"/>
</copy>
<!-- needed by the download servlet -->
<mkdir dir="${dest.install.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="${target.web}">
+ <xslt basedir="${src.main.web.dir}/iBD" extension=".html" style="${src.main.web.dir}/template.xsl" destdir="${dest.install.web.dir}">
<include name="**/tutorial.html"/>
<xmlcatalog refid="commonDTDs"/>
</xslt>
- <copy todir="${target.web}/WEB-INF">
+ <copy todir="${dest.install.web.dir}/WEB-INF">
<fileset dir="${src.main.web.dir}/iBD/WEB-INF">
<!-- This is what it would be if it were a stand-alone servlet -->
<!-- But we have included a different web.xml with this already defined -->
<exclude name="web.xml"/>
</fileset>
</copy>
- <copy todir="${target.web}/WEB-INF/lib">
+ <copy todir="${dest.install.web.dir}/WEB-INF/lib">
<fileset dir="${src.main.web.dir}/iBD/WEB-INF/lib" includes="*.jar"/>
</copy>
- <copy todir="${target.web}">
+ <copy todir="${dest.install.web.dir}">
<fileset dir="${src.main.web.dir}/iBD">
<include name="*.js"/>
<include name="iBD.*"/>
More information about the jsword-svn
mailing list