[jsword-svn] r1328 - in trunk: bibledesktop bibledesktop/etc/installer/macosx bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents bibledesktop-web/src/web bibledesktop-web/src/web/images common jsword/etc/build jsword-web/src/web/images
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Thu May 17 13:21:36 MST 2007
Author: dmsmith
Date: 2007-05-17 13:21:36 -0700 (Thu, 17 May 2007)
New Revision: 1328
Added:
trunk/bibledesktop-web/src/web/images/blueapple.png
trunk/bibledesktop-web/src/web/images/duke.png
trunk/bibledesktop-web/src/web/images/webstart.jpg
trunk/bibledesktop-web/src/web/images/webstart.png
Removed:
trunk/jsword-web/src/web/images/webstart.jpg
Modified:
trunk/bibledesktop-web/src/web/download.html
trunk/bibledesktop/build.xml
trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
trunk/bibledesktop/etc/installer/macosx/readme.txt
trunk/common/core.xml
trunk/jsword/etc/build/settings.crosswire.org.sh
trunk/jsword/etc/build/settings.eireneh.com.sh
trunk/jsword/etc/build/settings.global.sh
Log:
Changed BibleDesktop download page to have a Mac nightly.
Changed the page to make it look nicer.
Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml 2007-05-17 12:50:11 UTC (rev 1327)
+++ trunk/bibledesktop/build.xml 2007-05-17 20:21:36 UTC (rev 1328)
@@ -6,12 +6,10 @@
<property name="dependency.jar" value="../${dependency}/${target.jar}"/>
<!--=======================================================================-->
+ <property name="jnlp.homepage" value="file:///${basedir}/${target.installed}"/> <!-- override -->
+ <property name="jnlp.codebase" value="file:///${basedir}/${target.installed}"/> <!-- override -->
+
<property name="gener.root" value="${target.root}/gener"/>
- <!-- The following works on Windows. Others may need file:// -->
- <property name="jnlp.uninstalled" value="${target.root}/uninstalled"/>
- <property name="jnlp.installed" value="${target.root}/installed"/> <!-- override -->
- <property name="jnlp.homepage" value="file:///${basedir}/${jnlp.installed}"/> <!-- override -->
- <property name="jnlp.codebase" value="file:///${basedir}/${jnlp.installed}"/> <!-- override -->
<!--=======================================================================-->
<target name="testcompile.extra">
@@ -31,42 +29,80 @@
depends="build, keygen, install.check"
unless="install.uptodate"
description="Prepares for web based jnlp deploy">
- <echo message="Building JNLP: uninstalled files in: ${jnlp.uninstalled} and installed in ${jnlp.installed}"/>
+
+ <echo message="Building distribution: installed files in: ${target.installed}"/>
+
+ <!-- Create the installation directory -->
+ <mkdir dir="${target.installed}"/>
+
+ <!--
+ == Prepare the Mac distribution as a zip file.
+ -->
+ <copy file="${source.etc}/installer/macosx/BibleDesktop.app/Contents/Info.plist"
+ toFile="${target.installed}/Info.plist"
+ preservelastmodified="true">
+ <filterset>
+ <filter token="release.version" value="${release.version}"/>
+ </filterset>
+ </copy>
+
+ <zip destfile="${target.installed}/BibleDesktop.app.zip" update="true">
+ <!-- Copy everything but the executable (zip will not preserve permissions)
+ == And Info.plist, which needs to be filtered.
+ -->
+ <zipfileset prefix="BibleDesktop.app"
+ dir="${source.etc}/installer/macosx/BibleDesktop.app">
+ <exclude name="**/*JavaApplicationStub*"/>
+ <exclude name="**/*Info.plist"/>
+ </zipfileset>
+ <!-- Copy the executable and set the right permissions -->
+ <zipfileset prefix="BibleDesktop.app/Contents/MacOS"
+ filemode="755"
+ file="${source.etc}/installer/macosx/BibleDesktop.app/Contents/MacOS/JavaApplicationStub"/>
+ <!-- Copy the filtered Info.plist file -->
+ <zipfileset prefix="BibleDesktop.app/Contents"
+ file="${target.installed}/Info.plist"/>
+ <!-- Add in all the unsigned jars -->
+ <zipfileset prefix="BibleDesktop.app/Contents/Resources/Java"
+ dir="${target.jar}">
+ <patternset refid="internal.built.jars"/>
+ <patternset refid="external.runtime.jars"/>
+ </zipfileset>
+ </zip>
+ <delete file="${target.installed}/Info.plist"/>
+
<!-- sign the jars to a temporary location so they can be reused -->
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="bibledesktop-${release.version}.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jsword-common-${release.version}.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jsword-common-swing-${release.version}.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jsword-common-aqua-${release.version}.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jsword-${release.version}.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="commons-codec-1.3.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="commons-httpclient-3.0.1.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="commons-logging-1.1.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="commons-net-1.4.1.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jdom-1.0.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="javatar-2.5.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jlfgr-1_0.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="lucene-core-2.1.0.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="bibledesktop-${release.version}.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jsword-common-${release.version}.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jsword-common-swing-${release.version}.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jsword-common-aqua-${release.version}.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jsword-${release.version}.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="commons-codec-1.3.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="commons-httpclient-3.0.1.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="commons-logging-1.1.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="commons-net-1.4.1.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jdom-1.0.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="javatar-2.5.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jlfgr-1_0.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="lucene-core-2.1.0.jar"/>
<!--
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="blogapps-1.0.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="gnu-regexp-1.1.4.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="kafenio-0.8.5.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="kafenio-config-0.8.5.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="kafenio-icons-0.8.5.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="rome-0.7.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="werx-051405.jar"/>
- <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="xmlrpc-2.0.1.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="blogapps-1.0.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="gnu-regexp-1.1.4.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="kafenio-0.8.5.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="kafenio-config-0.8.5.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="kafenio-icons-0.8.5.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="rome-0.7.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="werx-051405.jar"/>
+ <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="xmlrpc-2.0.1.jar"/>
-->
<!-- Create a flag file used to determine whether the set of jars needs to be signed -->
<touch file="${target.root}/.flagfile"/>
<!-- Copy the files needed for the distribution -->
- <mkdir dir="${jnlp.uninstalled}"/>
- <copy todir="${jnlp.uninstalled}"
+ <copy todir="${target.installed}"
preservelastmodified="true">
- <fileset dir="${target.signed}"/>
<fileset dir="${source.etc}/jnlp">
- <include name="bibledesktop.jnlp"/>
<include name="*.gif"/>
</fileset>
<fileset dir="${source.etc}/bin"/>
@@ -74,32 +110,10 @@
<include name="bibledesktop.exe"/>
</fileset>
</copy>
- <chmod perm="a+x">
- <fileset dir="${jnlp.uninstalled}">
- <include name="**/*.sh"/>
- </fileset>
- </chmod>
- <fixcrlf srcdir="${jnlp.uninstalled}" eol="lf">
- <include name="**/*.sh"/>
- </fixcrlf>
- <fixcrlf srcdir="${jnlp.uninstalled}" eol="crlf">
- <include name="**/*.bat"/>
- </fixcrlf>
- <!--
- This was done in 2 steps so that we could deploy in other methods, however
- we now customize this deploy so it isn't needed any more. Sometime we should
- perhaps think about making ${jnlp.installed} = ${jnlp.uninstalled}
- The only real difference between installed and uninstalled is that the jnlp
- file has had the homepage and codebase parts filled in.
- -->
- <!--
- Attempt a local deploy, we might be able to get the jnlp file to work
- locally on a relative path, but in the mean time there is always the *.exe
- and *.sh startup files.
- -->
- <mkdir dir="${jnlp.installed}"/>
- <copy file="${jnlp.uninstalled}/bibledesktop.jnlp"
- tofile="${jnlp.installed}/bibledesktop-${release.version}.jnlp"
+
+ <!-- Copy and filter to make it work -->
+ <copy file="${source.etc}/jnlp/bibledesktop.jnlp"
+ tofile="${target.installed}/bibledesktop-${release.version}.jnlp"
filtering="true"
preservelastmodified="true">
<filterset>
@@ -108,38 +122,20 @@
<filter token="release.version" value="${release.version}"/>
</filterset>
</copy>
- <copy todir="${jnlp.installed}"
- filtering="false"
- preservelastmodified="true">
- <fileset dir="${jnlp.uninstalled}">
- <exclude name="**/*.jnlp"/>
- </fileset>
- </copy>
- <!--
- Prepare the Mac distribution.
- Use the unsigned jars to minimize space.
- -->
- <mkdir dir="${jnlp.installed}/BibleDesktop.app"/>
- <copy todir="${jnlp.installed}/BibleDesktop.app">
- <fileset dir="${source.etc}/installer/macosx/BibleDesktop.app">
- <exclude name="**/.DS_Store"/>
- <exclude name="**/.svn"/>
- </fileset>
- </copy>
- <!-- copy does not preserve execution privs. So we reset it -->
- <chmod perm="a+x" file="${jnlp.installed}/BibleDesktop.app/Contents/MacOS/JavaApplicationStub"/>
-
- <copy todir="${jnlp.installed}/BibleDesktop.app/Contents/Resources/Java">
- <fileset dir="${target.jar}">
- <patternset refid="internal.built.jars"/>
- <patternset refid="external.runtime.jars"/>
- </fileset>
- </copy>
-
- <zip destfile="${jnlp.installed}/BibleDesktop.app.zip" update="true">
- <zipfileset dir="${jnlp.installed}/BibleDesktop.app" prefix="BibleDesktop.app"/>
- </zip>
+ <!-- copy does not preserve file permissions, so we reset them -->
+ <chmod perm="a+x">
+ <fileset dir="${target.installed}">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+ <!-- Ensure that line endings are consistent with their target platform -->
+ <fixcrlf srcdir="${target.installed}" eol="lf">
+ <include name="**/*.sh"/>
+ </fixcrlf>
+ <fixcrlf srcdir="${target.installed}" eol="crlf">
+ <include name="**/*.bat"/>
+ </fixcrlf>
</target>
<target name="install.check">
Modified: trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist 2007-05-17 12:50:11 UTC (rev 1327)
+++ trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist 2007-05-17 20:21:36 UTC (rev 1328)
@@ -36,18 +36,19 @@
<string>1.4+</string>
<key>ClassPath</key>
<array>
- <string>$JAVAROOT/bibledesktop-1.0.6.jar</string>
+ <string>$JAVAROOT/bibledesktop- at release.version@.jar</string>
+ <string>$JAVAROOT/jsword- at release.version@.jar</string>
+ <string>$JAVAROOT/jsword-common- at release.version@.jar</string>
+ <string>$JAVAROOT/jsword-common-swing- at release.version@.jar</string>
+ <string>$JAVAROOT/jsword-common-aqua- at release.version@.jar</string>
+ <string>$JAVAROOT/lucene-core-2.1.0.jar</string>
+ <string>$JAVAROOT/jdom-1.0.jar</string>
<string>$JAVAROOT/commons-codec-1.3.jar</string>
<string>$JAVAROOT/commons-httpclient-3.0.1.jar</string>
<string>$JAVAROOT/commons-logging-1.1.jar</string>
<string>$JAVAROOT/commons-net-1.4.1.jar</string>
<string>$JAVAROOT/javatar-2.5.jar</string>
- <string>$JAVAROOT/jdom-1.0.jar</string>
<string>$JAVAROOT/jlfgr-1_0.jar</string>
- <string>$JAVAROOT/jsword-1.0.6.jar</string>
- <string>$JAVAROOT/jsword-common-1.0.6.jar</string>
- <string>$JAVAROOT/jsword-common-swing-1.0.6.jar</string>
- <string>$JAVAROOT/lucene-core-2.1.0.jar</string>
</array>
<key>Properties</key>
<dict>
Modified: trunk/bibledesktop/etc/installer/macosx/readme.txt
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/readme.txt 2007-05-17 12:50:11 UTC (rev 1327)
+++ trunk/bibledesktop/etc/installer/macosx/readme.txt 2007-05-17 20:21:36 UTC (rev 1328)
@@ -5,12 +5,15 @@
Instructions:
Building the App:
-Info.plist is the "app" control file. When jar names change, it needs to change.
-Jars go in BibleDesktop.app/Contents/Resources/Java
+Info.plist is the "app" control file. When 3rd party jar names change, it needs to change.
+Use Ant to build the "app" into the installation target directory.
+This does two things:
+1) It updates the release version number for the BibleDesktop and JSword jars.
+2) It puts the jars in BibleDesktop.app/Contents/Resources/Java
Building the Distribution:
DMG is a Mac Disk Image that can only be built on the Mac.
It is the preferred way of distributing Mac applications.
The easiest way to build a new DMG is to use an old one, replacing BibleDesktop.app with a new one.
-For a nightly build, one can build the app and zip it up.
+
Modified: trunk/bibledesktop-web/src/web/download.html
===================================================================
--- trunk/bibledesktop-web/src/web/download.html 2007-05-17 12:50:11 UTC (rev 1327)
+++ trunk/bibledesktop-web/src/web/download.html 2007-05-17 20:21:36 UTC (rev 1328)
@@ -13,14 +13,14 @@
BibleDesktop using WebStart.
</p>
-<h2>Standard Installers</h2>
<p>
The following installers provide you with the installation your are familiar.
Click on the logo to download for your operating system.
</p>
-<table border="0" align="center" cellpadding="5">
+
+<table border="0" cellpadding="5">
<tr>
- <td><a href="stable/BibleDesktop-v1.0.6.dmg"><img src="images/blueapple.gif" width="56" height="72" border="0"/></a></td>
+ <td><a href="stable/BibleDesktop-v1.0.6.dmg"><img src="images/blueapple.png" width="40" height="40" border="0"/></a></td>
<td>Mac OS X Disk Image</td>
<td>Just download, open the Disk Image and drag to the Application folder.</td>
</tr>
@@ -31,32 +31,61 @@
If you don't have Java that's ok.
Our installer will get it for you.</td>
</tr>
+ <tr>
+ <td><a href="/jsword/release/bibledesktop-1.0.6-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>
+ <tr>
+ <td><a href="stable/bibledesktop-1.0.6.jnlp"><img src="images/webstart.png" width="40" height="40" border="0"/></a></td>
+ <td>WebStart</td>
+ <td>See below for note on WebStart</td>
+ </tr>
</table>
-<h2>WebStart</h2>
+<h1>Sword Modules</h1>
<p>
+ These downloads do not contain Sword modules (Bibles, Commentaries, Dictionaries, Daily Devotionals, General Books...).
+ When you start BibleDesktop for the first time you will be prompted to download the books you want.
+ If you are using a proxy, please set your proxy settings with "Edit Sites".
+</p>
+<p>
+ Most Sword modules are working with BibleDesktop. So, please report any that fail.
+</p>
+<p>
+ At this time, the Personal Commentary does not work.
+</p>
+
+<h1>Nightly Build</h1>
+<p>
+ Every night we automatically create a new nightly release which may have all
+ sorts of strange bugs that could wipe out civilization as we know it.
+ You'll need an installation of Java as for the stable release of Bible Desktop.
+</p>
+<table border="0" cellpadding="5">
+ <tr>
+ <td><a href="nightly/BibleDesktop.app.zip"><img src="images/blueapple.png" width="40" height="40" border="0"/></a></td>
+ <td>Mac OS X Application<br/>(zipped)</td>
+ <td>Just download and unzip, moving the application to the location of your choice.</td>
+ </tr>
+ <tr>
+ <td><a href="nightly/bibledesktop-1.0.6.jnlp"><img src="images/webstart.png" width="40" height="40" border="0"/></a></td>
+ <td>WebStart</td>
+ <td>See below for note on WebStart</td>
+ </tr>
+</table>
+
+<h1>Note on WebStart</h1>
+<p>
WebStart works on all platforms and does not require an active connection to the internet after the program
is run for the first time. To use WebStart you will need to have Java on your computer. You can get Java from
<a href="http://www.java.com">www.java.com</a>. Once Java is installed, you can run BibleDesktop by
- clicking on the "Big Blue Button" below. The first time you run, you will be asked if you trust our application.
+ clicking on the WebStart button. The first time you run, you will be asked if you trust our application.
We have signed it as a "Thawte Freemail Member".
When you are offered a choice to create desktop shortcuts do so. It will make running BibleDesktop so much
easier. You won't need to come back to this page.
</p>
-<div align="center">
- <a href="stable/bibledesktop-1.0.6.jnlp"><img src="images/webstart.jpg" width="247" height="60" border="0"/></a>
-</div>
-<h1>Nightly Release</h1>
-<p>
- Every night we automatically create a new nightly release which may have all
- sorts of strange bugs that could wipe out civilization as we know it.
- You'll need an installation of Java as for the stable release of Bible Desktop.
-</p>
-<div align="center">
- <a href="nightly/bibledesktop-1.0.6.jnlp"><img src="images/webstart.jpg" width="247" height="60" border="0"/></a>
-</div>
-
<h1>Note on Linux</h1>
<p>
Most distributions of Linux pose a challenge to running Java programs:
@@ -66,30 +95,5 @@
before trying to run BibleDesktop.
</p>
-<h1>Binary Downloads</h1>
-<p>
- If you wish to download Bible Desktop without an installer and to run from the command line, it is
- available in the following formats. The links below are all for version 1.0.6,
- (but <a href="/ftpmirror/pub/jsword/release">this link</a> has older versions
- for what they are worth):
-</p>
-<ul>
- <li><a href="/ftpmirror/pub/jsword/release/bibledesktop-1.0.6-bin.zip">For Windows there is a .zip file.</a></li>
- <li><a href="/ftpmirror/pub/jsword/release/bibledesktop-1.0.6-bin.tar.gz">For Linux/Unix there is a .tar.gz file.</a></li>
-</ul>
-
-<h1>Sword Modules</h1>
-<p>
- These downloads do not contain Sword modules (Bibles, Commentaries, Dictionaries, Daily Devotionals, General Books...).
- When you start BibleDesktop for the first time you will be prompted to download the books you want.
- If you are using a proxy, please set your proxy settings with "Edit Sites".
-</p>
-<p>
- Most Sword modules are working with BibleDesktop. So, please report any that fail.
-</p>
-<p>
- At this time, the Personal Commentary does not work.
-</p>
-
</body>
</html>
Added: trunk/bibledesktop-web/src/web/images/blueapple.png
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/images/blueapple.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop-web/src/web/images/duke.png
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/images/duke.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: trunk/bibledesktop-web/src/web/images/webstart.jpg (from rev 1271, trunk/jsword-web/src/web/images/webstart.jpg)
===================================================================
(Binary files differ)
Added: trunk/bibledesktop-web/src/web/images/webstart.png
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop-web/src/web/images/webstart.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/common/core.xml
===================================================================
--- trunk/common/core.xml 2007-05-17 12:50:11 UTC (rev 1327)
+++ trunk/common/core.xml 2007-05-17 20:21:36 UTC (rev 1328)
@@ -10,29 +10,29 @@
== These are the standard locations that this build file uses.
== This assumes that the build file is in the root of the project.
=========================================================================-->
- <property name="release.version" value="1.0.6"/>
- <property name="source.root" value="src"/>
- <property name="source.etc" value="etc"/>
- <property name="source.jar" value="jar"/>
- <property name="source.java" value="${source.root}/main/java"/>
- <property name="source.res" value="${source.root}/main/resources"/>
- <property name="source.test" value="${source.root}/test"/>
- <property name="target.root" value="target"/>
- <property name="target.classes" value="${target.root}/classes"/>
- <property name="target.jar" value="${target.root}/jar"/>
- <property name="target.signed" value="${target.root}/signed"/>
- <property name="test.root" value="${target.root}/test"/>
- <property name="test.classes" value="${test.root}/classes"/>
- <property name="test.jar" value="${test.root}"/>
- <property name="keystore.devfile" value="../common/crosswire.keystore"/>
- <property name="keystore.file" value="${keystore.devfile}"/>
- <property name="keystore.alias" value="jsword"/>
- <property name="keystore.pswd" value="p455w0rd"/>
- <available file="${source.jar}" type="dir" property="jardir.present"/>
- <available file="${source.res}" type="dir" property="resdir.present"/>
-
- <property name="verbose.copy" value="false"/>
+ <property name="release.version" value="1.0.6"/>
+ <property name="source.root" value="src"/>
+ <property name="source.etc" value="etc"/>
+ <property name="source.jar" value="jar"/>
+ <property name="source.java" value="${source.root}/main/java"/>
+ <property name="source.res" value="${source.root}/main/resources"/>
+ <property name="source.test" value="${source.root}/test"/>
+ <property name="target.root" value="target"/>
+ <property name="target.classes" value="${target.root}/classes"/>
+ <property name="target.jar" value="${target.root}/jar"/>
+ <property name="target.installed" value="${target.root}/installed"/> <!-- override -->
+ <property name="test.root" value="${target.root}/test"/>
+ <property name="test.classes" value="${test.root}/classes"/>
+ <property name="test.jar" value="${test.root}"/>
+ <property name="keystore.devfile" value="../common/crosswire.keystore"/>
+ <property name="keystore.file" value="${keystore.devfile}"/>
+ <property name="keystore.alias" value="jsword"/>
+ <property name="keystore.pswd" value="p455w0rd"/>
+ <available file="${source.jar}" type="dir" property="jardir.present"/>
+ <available file="${source.res}" type="dir" property="resdir.present"/>
+ <property name="verbose.copy" value="false"/>
+
<!--=======================================================================
== These jars are built by the various JSword projects.
== It excludes jsword-common-aqua which is treated as an external jar.
@@ -60,7 +60,7 @@
<include name="**/jlfgr-*.jar"/>
<include name="**/jsword-common-aqua-*.jar"/>
<include name="**/javatar-*/*.jar"/>
- <!--
+ <!--
<include name="**/activation.jar"/>
<include name="**/servlet.jar"/>
<include name="**/rome-*.jar"/>
@@ -236,8 +236,8 @@
</target>
<!--=======================================================================
- == Copy all the local 3rd party jars to a single locaton.
- =========================================================================-->
+ == Copy all the local 3rd party jars to a single locaton.
+ =========================================================================-->
<target name="prepare.jars"
if="jardir.present">
<!-- Copy the jars from the std location to the target jar directory -->
@@ -250,15 +250,15 @@
</target>
<!--=======================================================================
- == Copy all the resources to a single locaton.
- =========================================================================-->
+ == Copy all the resources to a single locaton.
+ =========================================================================-->
<target name="prepare.resources"
if="resdir.present">
- <!-- Copy the resources from the std location to the target classes directory -->
- <mkdir dir="${target.classes}"/>
- <copy verbose="${verbose.copy}" todir="${target.classes}" flatten="false" failonerror="false" preservelastmodified="true">
- <fileset dir="${source.res}" includes="**"/>
- </copy>
+ <!-- Copy the resources from the std location to the target classes directory -->
+ <mkdir dir="${target.classes}"/>
+ <copy verbose="${verbose.copy}" todir="${target.classes}" flatten="false" failonerror="false" preservelastmodified="true">
+ <fileset dir="${source.res}" includes="**"/>
+ </copy>
</target>
<!--=======================================================================
@@ -319,14 +319,14 @@
<!-- Copy the adjacent property files to the proper org/crosswire directory.
== The path separator could be either / or \
-->
- <copy verbose="${verbose.copy}"
- todir="${target.classes}"
- includeEmptyDirs="false"
- preservelastmodified="true">
- <fileset dir="${source.java}">
- <patternset refid="java.non.compile"/>
- </fileset>
- </copy>
+ <copy verbose="${verbose.copy}"
+ todir="${target.classes}"
+ includeEmptyDirs="false"
+ preservelastmodified="true">
+ <fileset dir="${source.java}">
+ <patternset refid="java.non.compile"/>
+ </fileset>
+ </copy>
<antcall target="compile.extra"/>
</target>
<target name="compile.check">
@@ -408,14 +408,14 @@
<attribute name="srcdir"/>
<attribute name="destdir"/>
<sequential>
- <mkdir dir="@{destdir}"/>
- <signjar
- storepass="${keystore.pswd}"
- alias="${keystore.alias}"
- keystore="${keystore.file}"
- keypass="${keystore.pswd}"
- jar="@{srcdir}/@{jar}"
- signedjar="@{destdir}/@{jar}"/>
+ <mkdir dir="@{destdir}"/>
+ <signjar
+ storepass="${keystore.pswd}"
+ alias="${keystore.alias}"
+ keystore="${keystore.file}"
+ keypass="${keystore.pswd}"
+ jar="@{srcdir}/@{jar}"
+ signedjar="@{destdir}/@{jar}"/>
</sequential>
</macrodef>
Modified: trunk/jsword/etc/build/settings.crosswire.org.sh
===================================================================
--- trunk/jsword/etc/build/settings.crosswire.org.sh 2007-05-17 12:50:11 UTC (rev 1327)
+++ trunk/jsword/etc/build/settings.crosswire.org.sh 2007-05-17 20:21:36 UTC (rev 1328)
@@ -5,9 +5,9 @@
export FTP_BASE=/home/ftp/pub/jsword
export FTP_PREFIX=http://www.crosswire.org/ftpmirror/pub/jsword
export JNLP_HOMEPAGE=http://www.crosswire.org/bibledesktop
+export JNLP_CODEBASE=$JNLP_HOMEPAGE/nightly
-export JNLP_CODEBASE=$JNLP_HOMEPAGE/nightly
-export JNLP_INSTALLED=$WEBAPP_BIBLEDESKTOP/nightly
+export TARGET_INSTALLED=$WEBAPP_BIBLEDESKTOP/nightly
export KEYSTORE_FILE=../common/crosswire.keystore
export EMAIL="joe at eireneh.com dmsmith555 at yahoo.com"
Modified: trunk/jsword/etc/build/settings.eireneh.com.sh
===================================================================
--- trunk/jsword/etc/build/settings.eireneh.com.sh 2007-05-17 12:50:11 UTC (rev 1327)
+++ trunk/jsword/etc/build/settings.eireneh.com.sh 2007-05-17 20:21:36 UTC (rev 1328)
@@ -5,10 +5,10 @@
export FTP_BASE=/opt/jsword/ftpbase
export FTP_PREFIX=http://www.eireneh.com/no-download-area
export JNLP_HOMEPAGE=http://tameion/bibledesktop
-
export JNLP_CODEBASE=$JNLP_HOMEPAGE/nightly
-export JNLP_INSTALLED=$WEBAPP_BIBLEDESKTOP/nightly
+export TARGET_INSTALLED=$WEBAPP_BIBLEDESKTOP/nightly
+
export EMAIL=joe at eireneh.com
export ANT_HOME=/opt/ant
export JAVA_HOME=/usr/java/j2sdk
Modified: trunk/jsword/etc/build/settings.global.sh
===================================================================
--- trunk/jsword/etc/build/settings.global.sh 2007-05-17 12:50:11 UTC (rev 1327)
+++ trunk/jsword/etc/build/settings.global.sh 2007-05-17 20:21:36 UTC (rev 1328)
@@ -1,9 +1,5 @@
export LOGFILE=$WEBAPP_JSWORD/buildlog.txt
-#export XALAN=$JSWORD_HOME/jar/xalan25d1
-#export ANT_OPTS="-Xmx512m"
-#export ANT_OPTS="-Xmx512m -Xbootclasspath/p:$XALAN/xalan.jar:$XALAN/xercesImpl.jar:$XALAN/xml-apis.jar"
-
export PROPERTIES=
export PROPERTIES="$PROPERTIES -Dwebapp.jsword=$WEBAPP_JSWORD"
export PROPERTIES="$PROPERTIES -Dwebapp.bibledesktop=$WEBAPP_BIBLEDESKTOP"
@@ -11,5 +7,5 @@
export PROPERTIES="$PROPERTIES -Dftp.prefix=$FTP_PREFIX"
export PROPERTIES="$PROPERTIES -Djnlp.homepage=$JNLP_HOMEPAGE"
export PROPERTIES="$PROPERTIES -Djnlp.codebase=$JNLP_CODEBASE"
-export PROPERTIES="$PROPERTIES -Djnlp.installed=$JNLP_INSTALLED"
+export PROPERTIES="$PROPERTIES -Dtarget.installed=$TARGET_INSTALLED"
export PROPERTIES="$PROPERTIES -Dkeystore.file=$KEYSTORE_FILE"
Deleted: trunk/jsword-web/src/web/images/webstart.jpg
===================================================================
(Binary files differ)
More information about the jsword-svn
mailing list