[jsword-svn] r2303 - in trunk: bibledesktop bibledesktop-web jsword-web jsword-web/src/main/java/org/crosswire/jsword/view/web jsword-web/src/main/webapp
dmsmith at crosswire.org
dmsmith at crosswire.org
Mon Mar 11 09:41:08 MST 2013
Author: dmsmith
Date: 2013-03-11 09:41:07 -0700 (Mon, 11 Mar 2013)
New Revision: 2303
Modified:
trunk/bibledesktop-web/build.xml
trunk/bibledesktop/build.xml
trunk/jsword-web/build.xml
trunk/jsword-web/src/main/java/org/crosswire/jsword/view/web/DownloadSet.java
trunk/jsword-web/src/main/webapp/download.jsp
Log:
Improve download page
Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml 2013-03-11 12:39:34 UTC (rev 2302)
+++ trunk/bibledesktop/build.xml 2013-03-11 16:41:07 UTC (rev 2303)
@@ -67,17 +67,16 @@
<include name="*.bat"/>
</fixcrlf>
- <!-- Convert the zip into a tar.gz -->
- <tar tarfile="${dest.install.pkg.dir}/${name.timestamped}-bin.tar.gz" compression="gzip">
- <tarfileset prefix="${name.versioned}" dir="${lib.dir}">
+ <zip destfile="${dest.install.pkg.dir}/${name.timestamped}-bin.zip">
+ <zipfileset 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>
+ </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>
</target>
<!-- Prepare the WebStart distribution -->
Modified: trunk/bibledesktop-web/build.xml
===================================================================
--- trunk/bibledesktop-web/build.xml 2013-03-11 12:39:34 UTC (rev 2302)
+++ trunk/bibledesktop-web/build.xml 2013-03-11 16:41:07 UTC (rev 2303)
@@ -36,9 +36,9 @@
description="Create extra project packaging">
<copy todir="${website.bd.dir}">
<fileset dir="${dest.install.web.dir}">
- <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" />
@@ -53,48 +53,48 @@
</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>
<symlink
- link="${package.jsword.dir}/${ant.project.name}-latest-bin.tar.gz"
- resource="${package.jsword.dir}/${name.timestamped}-bin.tar.gz"
+ 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"
+ 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"
+ link="${package.jsword.dir}/${ant.project.name}-latest-src.zip"
+ resource="${package.jsword.dir}/${name.timestamped}-src.zip"
overwrite="true"
failonerror="false"/>
-<!-- <zip destfile="${package.jsword.dir}/${name.timestamped}-bin.zip">
- <tarfileset src="${dest.install.pkg.dir}/${name.timestamped}-bin.tar.gz"/>
- </zip>
- <zip destfile="${package.jsword.dir}/${name.timestamped}-doc.zip">
- <tarfileset src="${dest.install.pkg.dir}/${name.timestamped}-doc.tar.gz"/>
- </zip>
- <zip destfile="${package.jsword.dir}/${name.timestamped}-src.zip">
- <tarfileset src="${dest.install.pkg.dir}/${name.timestamped}-src.tar.gz"/>
- </zip>
+<!-- <tar destfile="${package.jsword.dir}/${name.timestamped}-bin.tar.gz" compression="gzip">
+ <zipfileset src="${dest.install.pkg.dir}/${name.timestamped}-bin.zip"/>
+ </tar>
+ <tar destfile="${package.jsword.dir}/${name.timestamped}-doc.tar.gz" compression="gzip">
+ <zipfileset src="${dest.install.pkg.dir}/${name.timestamped}-doc.zip"/>
+ </tar>
+ <tar destfile="${package.jsword.dir}/${name.timestamped}-src.tar.gz" compression="gzip">
+ <zipfileset src="${dest.install.pkg.dir}/${name.timestamped}-src.zip"/>
+ </tar>
<symlink
- link="${package.jsword.dir}/${ant.project.name}-latest-bin.zip"
- resource="${package.jsword.dir}/${name.timestamped}-bin.zip"
+ 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-doc.zip"
- resource="${package.jsword.dir}/${name.timestamped}-doc.zip"
+ 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-src.zip"
- resource="${package.jsword.dir}/${name.timestamped}-src.zip"
+ link="${package.jsword.dir}/${ant.project.name}-latest-src.tar.gz"
+ resource="${package.jsword.dir}/${name.timestamped}-src.tar.gz"
overwrite="true"
failonerror="false"/>
-->
Modified: trunk/jsword-web/build.xml
===================================================================
--- trunk/jsword-web/build.xml 2013-03-11 12:39:34 UTC (rev 2302)
+++ trunk/jsword-web/build.xml 2013-03-11 16:41:07 UTC (rev 2303)
@@ -40,7 +40,17 @@
<!-- There is nothing to look at -->
</target>
+ <!-- source packages -->
+ <target name="package.src"/>
+
+ <!-- doc packages -->
+ <target name="package.doc"/>
+
+ <!-- binary packages -->
+ <target name="package.bin"/>
+
<!--=======================================================================-->
+ <!-- Don't slam jsword.jar but create jsword-web.jar -->
<target name="build"
description="Run a full build"
depends="compile">
@@ -53,56 +63,56 @@
description="Create extra project packaging">
<copy todir="${website.jsword.dir}">
<fileset dir="${dest.install.web.dir}">
- <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="${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>
<symlink
- link="${package.jsword.dir}/${ant.project.name}-latest-bin.tar.gz"
- resource="${package.jsword.dir}/${name.timestamped}-bin.tar.gz"
+ 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"
+ 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"
+ link="${package.jsword.dir}/${ant.project.name}-latest-src.zip"
+ resource="${package.jsword.dir}/${name.timestamped}-src.zip"
overwrite="true"
failonerror="false"/>
<!--
- <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>
+ <tar destfile="${package.jsword.dir}/${name.timestamped}-bin.tar.gz" compression="gzip">
+ <zipfileset src="${package.jsword.dir}/${name.timestamped}-bin.zip"/>
+ </tar>
+ <tar destfile="${package.jsword.dir}/${name.timestamped}-doc.tar.gz" compression="gzip">
+ <zipfileset src="${package.jsword.dir}/${name.timestamped}-doc.zip"/>
+ </tar>
+ <tar destfile="${package.jsword.dir}/${name.timestamped}-src.tar.gz" compression="gzip">
+ <zipfileset src="${package.jsword.dir}/${name.timestamped}-src.zip"/>
+ </tar>
<symlink
- link="${package.jsword.dir}/${ant.project.name}-latest-src.zip"
- resource="${package.jsword.dir}/${name.timestamped}-src.zip"
+ 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-bin.zip"
- resource="${package.jsword.dir}/${name.timestamped}-bin.zip"
+ 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-doc.zip"
- resource="${package.jsword.dir}/${name.timestamped}-doc.zip"
+ link="${package.jsword.dir}/${ant.project.name}-latest-doc.tar.gz"
+ resource="${package.jsword.dir}/${name.timestamped}-doc.tar.gz"
overwrite="true"
failonerror="false"/>
-->
Modified: trunk/jsword-web/src/main/java/org/crosswire/jsword/view/web/DownloadSet.java
===================================================================
--- trunk/jsword-web/src/main/java/org/crosswire/jsword/view/web/DownloadSet.java 2013-03-11 12:39:34 UTC (rev 2302)
+++ trunk/jsword-web/src/main/java/org/crosswire/jsword/view/web/DownloadSet.java 2013-03-11 16:41:07 UTC (rev 2303)
@@ -46,7 +46,7 @@
public class DownloadSet implements Comparable<DownloadSet> {
public static final String BIN_ZIP = "-bin.zip";
public static final String BIN_TGZ = "-bin.tar.gz";
- public static final String LATEST = "latest-bin.tar.gz";
+ public static final String LATEST = "latest-bin.zip";
public static final String SRC_ZIP = "-src.zip";
public static final String SRC_TGZ = "-src.tar.gz";
public static final String DOC_ZIP = "-doc.zip";
@@ -69,7 +69,7 @@
log.debug("Examine file: {}", name);
return file.canRead()
&& name.startsWith(TEST_PREFIX)
- && name.endsWith(BIN_TGZ)
+ && name.endsWith(BIN_ZIP)
&& !name.endsWith(LATEST);
}
});
@@ -78,7 +78,7 @@
for (int i = 0; i < files.length; i++) {
String name = files[i].getName();
log.debug("adding {}", name);
- String sets = name.substring(TEST_PREFIX.length(), name.length() - BIN_TGZ.length());
+ String sets = name.substring(TEST_PREFIX.length(), name.length() - BIN_ZIP.length());
reply.add(new DownloadSet(localprefix, webprefix, sets, datesort));
}
Modified: trunk/jsword-web/src/main/webapp/download.jsp
===================================================================
--- trunk/jsword-web/src/main/webapp/download.jsp 2013-03-11 12:39:34 UTC (rev 2302)
+++ trunk/jsword-web/src/main/webapp/download.jsp 2013-03-11 16:41:07 UTC (rev 2303)
@@ -9,7 +9,7 @@
<jsp:directive.page import="org.crosswire.jsword.view.web.DownloadSet" contentType="text/html"/>
<jsp:scriptlet><![CDATA[
- String scm = "SVN";
+ String scm = "Git";
String ftpBase = application.getInitParameter("ftp.base");
if (ftpBase == null)
@@ -27,22 +27,20 @@
<h1>Bible Desktop</h1>
<p>
The Desktop GUI of JSword is called Bible Desktop and it has it's own
- <a href="/bibledesktop/download.html">download page</a>. This provides a WebStart installer and
- installers for Windows, Linux and Apple.
+ <a href="/bibledesktop/download.html">download page</a>. Bible Desktop
+ provides installers for Windows, Linux and Mac.
</p>
<h1>JSword</h1>
<h2>Stable Release</h2>
<p>
If the Bible Desktop installers do not work for you or you want an earlier release,
- you can obtain a binary install from here. These files are in tar.gz format. Some require GNU tar.
+ you can obtain a binary install from here. These include JSword, Bible Desktop and
+ all the required 3-rd party jars.
</p>
<p>
- We keep official releases hanging around for a long, long time.
+ We keep official releases hanging around for a long, long time. These files are in zip format.
</p>
-<p>
- Source does not contain third party source. You can obtain these from <jsp:expression>scm</jsp:expression>.
-</p>
<table width="50%" align="center" border="1" bordercolor="#000000" cellspacing="0" cellpadding="2">
<tr>
<td>-</td>
@@ -57,9 +55,9 @@
]]></jsp:scriptlet>
<tr>
<td><jsp:expression>dls[i].getVersionString()</jsp:expression></td>
- <td><jsp:expression>dls[i].getLinkString(DownloadSet.BIN_TGZ)</jsp:expression></td>
- <td><jsp:expression>dls[i].getLinkString(DownloadSet.SRC_TGZ)</jsp:expression></td>
- <td><jsp:expression>dls[i].getLinkString(DownloadSet.DOC_TGZ)</jsp:expression></td>
+ <td><jsp:expression>dls[i].getLinkString(DownloadSet.BIN_ZIP)</jsp:expression></td>
+ <td><jsp:expression>dls[i].getLinkString(DownloadSet.SRC_ZIP)</jsp:expression></td>
+ <td><jsp:expression>dls[i].getLinkString(DownloadSet.DOC_ZIP)</jsp:expression></td>
</tr>
<jsp:scriptlet><![CDATA[
}
@@ -69,11 +67,11 @@
<h2>Nightly Builds</h2>
<p>
- Nightly builds are made and stored for a short time. These files are in tar.gz format. Some require GNU tar.
+ Nightly builds are made and stored for a short time. These files are in zip format.
</p>
<p>
- Source does not contain third party source. You can obtain these from <jsp:expression>scm</jsp:expression>.
+ These builds merely contains JSword. They do not include Bible Desktop or any of the 3-rd party dependencies.
</p>
<table width="50%" align="center" border="1" bordercolor="#000000" cellspacing="0" cellpadding="2">
<tr>
@@ -89,9 +87,9 @@
]]></jsp:scriptlet>
<tr>
<td><jsp:expression>dls[i].getDateString()</jsp:expression></td>
- <td><jsp:expression>dls[i].getLinkString(DownloadSet.BIN_TGZ)</jsp:expression></td>
- <td><jsp:expression>dls[i].getLinkString(DownloadSet.SRC_TGZ)</jsp:expression></td>
- <td><jsp:expression>dls[i].getLinkString(DownloadSet.DOC_TGZ)</jsp:expression></td>
+ <td><jsp:expression>dls[i].getLinkString(DownloadSet.BIN_ZIP)</jsp:expression></td>
+ <td><jsp:expression>dls[i].getLinkString(DownloadSet.SRC_ZIP)</jsp:expression></td>
+ <td><jsp:expression>dls[i].getLinkString(DownloadSet.DOC_ZIP)</jsp:expression></td>
</tr>
<jsp:scriptlet><![CDATA[
}
More information about the jsword-svn
mailing list