[jsword-svn] r2298 - in trunk: bibledesktop-web bibledesktop-web/src/main/webapp jsword-web
dmsmith at crosswire.org
dmsmith at crosswire.org
Sun Mar 10 20:44:53 MST 2013
Author: dmsmith
Date: 2013-03-10 20:44:53 -0700 (Sun, 10 Mar 2013)
New Revision: 2298
Modified:
trunk/bibledesktop-web/build.xml
trunk/bibledesktop-web/src/main/webapp/download.html
trunk/jsword-web/build.xml
Log:
build improvements
Modified: trunk/bibledesktop-web/build.xml
===================================================================
--- trunk/bibledesktop-web/build.xml 2013-03-11 00:37:50 UTC (rev 2297)
+++ trunk/bibledesktop-web/build.xml 2013-03-11 03:44:53 UTC (rev 2298)
@@ -39,21 +39,64 @@
<exclude name="*-bin.tar.gz" />
<exclude name="*-doc.tar.gz" />
<exclude name="*-src.tar.gz" />
- <exclude name="*-bin.zip" />
- <exclude name="*-doc.zip" />
- <exclude name="*-src.zip" />
+ <exclude name="webstart" />
+ <exclude name="BibleDesktopSetup.exe" />
+ <exclude name="BibleDesktop.app.zip" />
</fileset>
</copy>
<copy todir="${package.bd.dir}">
<fileset dir="${dest.install.web.dir}">
+ <include name="webstart" />
+ <include name="BibleDesktopSetup.exe" />
+ <include name="BibleDesktop.app.zip" />
+ </fileset>
+ </copy>
+ <copy todir="${package.jsword.dir}">
+ <fileset dir="${dest.install.web.dir}">
<include name="*-bin.tar.gz" />
<include name="*-doc.tar.gz" />
<include name="*-src.tar.gz" />
- <include name="*-bin.zip" />
- <include name="*-doc.zip" />
- <include name="*-src.zip" />
</fileset>
</copy>
+ <zip destfile="${package.jsword.dir}/${name.timestamped}-bin.zip">
+ <tarfileset src="${package.jsword.dir}/${name.timestamped}-bin.tar.gz"/>
+ </zip>
+ <zip destfile="${package.jsword.dir}/${name.timestamped}-doc.zip">
+ <tarfileset src="${package.jsword.dir}/${name.timestamped}-doc.tar.gz"/>
+ </zip>
+ <zip destfile="${package.jsword.dir}/${name.timestamped}-src.zip">
+ <tarfileset src="${package.jsword.dir}/${name.timestamped}-src.tar.gz"/>
+ </zip>
+ <symlink
+ link="${package.jsword.dir}/${ant.project.name}-latest-bin.tar.gz"
+ resource="${package.jsword.dir}/${name.timestamped}-bin.tar.gz"
+ overwrite="true"
+ failonerror="false"/>
+ <symlink
+ link="${package.jsword.dir}/${ant.project.name}-latest-bin.zip"
+ resource="${package.jsword.dir}/${name.timestamped}-bin.zip"
+ overwrite="true"
+ failonerror="false"/>
+ <symlink
+ link="${package.jsword.dir}/${ant.project.name}-latest-doc.tar.gz"
+ resource="${package.jsword.dir}/${name.timestamped}-doc.tar.gz"
+ overwrite="true"
+ failonerror="false"/>
+ <symlink
+ link="${package.jsword.dir}/${ant.project.name}-latest-doc.zip"
+ resource="${package.jsword.dir}/${name.timestamped}-doc.zip"
+ overwrite="true"
+ failonerror="false"/>
+ <symlink
+ link="${package.jsword.dir}/${ant.project.name}-latest-src.tar.gz"
+ resource="${package.jsword.dir}/${name.timestamped}-src.tar.gz"
+ overwrite="true"
+ failonerror="false"/>
+ <symlink
+ link="${package.jsword.dir}/${ant.project.name}-latest-src.zip"
+ resource="${package.jsword.dir}/${name.timestamped}-src.zip"
+ overwrite="true"
+ failonerror="false"/>
</target>
<!--=======================================================================
Modified: trunk/bibledesktop-web/src/main/webapp/download.html
===================================================================
--- trunk/bibledesktop-web/src/main/webapp/download.html 2013-03-11 00:37:50 UTC (rev 2297)
+++ trunk/bibledesktop-web/src/main/webapp/download.html 2013-03-11 03:44:53 UTC (rev 2298)
@@ -81,7 +81,7 @@
<br/><br/>See note below if you are running Vista/7/8.</td>
</tr>
<tr>
- <td><a href="/ftpmirror/pub/jsword/nightly/jsword-latest-bin.tar.gz"><img src="images/duke.png" width="40" height="36" border="0"/></a></td>
+ <td><a href="nightly/bibledesktop-latest-bin.tar.gz"><img src="images/duke.png" width="40" height="36" border="0"/></a></td>
<td>Linux, BSD, Unix</td>
<td>Download, uncompress and run BibleDesktop.sh. See below for note on Linux.</td>
</tr>
Modified: trunk/jsword-web/build.xml
===================================================================
--- trunk/jsword-web/build.xml 2013-03-11 00:37:50 UTC (rev 2297)
+++ trunk/jsword-web/build.xml 2013-03-11 03:44:53 UTC (rev 2298)
@@ -56,21 +56,54 @@
<exclude name="*-bin.tar.gz" />
<exclude name="*-doc.tar.gz" />
<exclude name="*-src.tar.gz" />
- <exclude name="*-bin.zip" />
- <exclude name="*-doc.zip" />
- <exclude name="*-src.zip" />
</fileset>
</copy>
- <copy todir="${website.jsword.dir}">
+ <copy todir="${package.jsword.dir}">
<fileset dir="${dest.install.web.dir}">
<include name="*-bin.tar.gz" />
<include name="*-doc.tar.gz" />
<include name="*-src.tar.gz" />
- <include name="*-bin.zip" />
- <include name="*-doc.zip" />
- <include name="*-src.zip" />
</fileset>
</copy>
+ <zip destfile="${package.jsword.dir}/${name.timestamped}-bin.zip">
+ <tarfileset src="${package.jsword.dir}/${name.timestamped}-bin.tar.gz"/>
+ </zip>
+ <zip destfile="${package.jsword.dir}/${name.timestamped}-doc.zip">
+ <tarfileset src="${package.jsword.dir}/${name.timestamped}-doc.tar.gz"/>
+ </zip>
+ <zip destfile="${package.jsword.dir}/${name.timestamped}-src.zip">
+ <tarfileset src="${package.jsword.dir}/${name.timestamped}-src.tar.gz"/>
+ </zip>
+ <symlink
+ link="${package.jsword.dir}/${ant.project.name}-latest-bin.tar.gz"
+ resource="${package.jsword.dir}/${name.timestamped}-bin.tar.gz"
+ overwrite="true"
+ failonerror="false"/>
+ <symlink
+ link="${package.jsword.dir}/${ant.project.name}-latest-bin.zip"
+ resource="${package.jsword.dir}/${name.timestamped}-bin.zip"
+ overwrite="true"
+ failonerror="false"/>
+ <symlink
+ link="${package.jsword.dir}/${ant.project.name}-latest-doc.tar.gz"
+ resource="${package.jsword.dir}/${name.timestamped}-doc.tar.gz"
+ overwrite="true"
+ failonerror="false"/>
+ <symlink
+ link="${package.jsword.dir}/${ant.project.name}-latest-doc.zip"
+ resource="${package.jsword.dir}/${name.timestamped}-doc.zip"
+ overwrite="true"
+ failonerror="false"/>
+ <symlink
+ link="${package.jsword.dir}/${ant.project.name}-latest-src.tar.gz"
+ resource="${package.jsword.dir}/${name.timestamped}-src.tar.gz"
+ overwrite="true"
+ failonerror="false"/>
+ <symlink
+ link="${package.jsword.dir}/${ant.project.name}-latest-src.zip"
+ resource="${package.jsword.dir}/${name.timestamped}-src.zip"
+ overwrite="true"
+ failonerror="false"/>
</target>
<target name="package.extra" description="Build an unpacked war file">
More information about the jsword-svn
mailing list