[jsword-svn] r1173 - in trunk: bibledesktop bibledesktop/etc/installer/macosx bibledesktop/etc/installer/win32 bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop bibledesktop-web/src/web/stable common

dmsmith at www.crosswire.org dmsmith at www.crosswire.org
Fri Oct 20 19:59:36 MST 2006


Author: dmsmith
Date: 2006-10-20 19:57:52 -0700 (Fri, 20 Oct 2006)
New Revision: 1173

Added:
   trunk/bibledesktop-web/src/web/stable/BibleDesktop-v1.0.5.dmg
   trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jar
   trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jnlp
   trunk/bibledesktop-web/src/web/stable/jsword-1.0.5.jar
   trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.5.jar
   trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.5.jar
   trunk/bibledesktop/ReleaseInstructions.txt
Removed:
   trunk/bibledesktop-web/src/web/stable/BibleDesktop-v1.0.4.dmg
   trunk/bibledesktop-web/src/web/stable/BibleDesktop.exe
   trunk/bibledesktop-web/src/web/stable/BibleDesktopSetup.exe
   trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.4.jnlp
   trunk/bibledesktop-web/src/web/stable/jsword-1.0.4.jar
   trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.4.jar
   trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.4.jar
Modified:
   trunk/bibledesktop-web/src/web/stable/commons-codec-1.3.jar
   trunk/bibledesktop-web/src/web/stable/commons-httpclient-3.0.1.jar
   trunk/bibledesktop-web/src/web/stable/commons-logging-1.1.jar
   trunk/bibledesktop-web/src/web/stable/commons-net-1.4.1.jar
   trunk/bibledesktop-web/src/web/stable/javatar-2.5.jar
   trunk/bibledesktop-web/src/web/stable/jdom-1.0.jar
   trunk/bibledesktop-web/src/web/stable/jlfgr-1_0.jar
   trunk/bibledesktop-web/src/web/stable/lucene-core-2.0.0.jar
   trunk/bibledesktop/etc/installer/macosx/Info.plist
   trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Msg.properties
   trunk/common/core.xml
Log:
Preparing for a release.

Added: trunk/bibledesktop/ReleaseInstructions.txt
===================================================================
--- trunk/bibledesktop/ReleaseInstructions.txt	2006-10-20 17:04:37 UTC (rev 1172)
+++ trunk/bibledesktop/ReleaseInstructions.txt	2006-10-21 02:57:52 UTC (rev 1173)
@@ -0,0 +1,63 @@
+Release process:
+
+Step 1: Update the application's release number
+
+On a Major release update the second number, on a minor change the third.
+The first gets changed if there is a super major change.
+Pretend that 1.0.9 is the next release number (because the current release is 1.0.8).
+Change org.crosswire.bibledesktop.desktop.Msg.properties Desktop.Version=1.0.9
+In the ant file common/core.xml change to <property name="release.version" value="1.0.9"/>
+Update bibledesktop/etc/installer/macosx/info.plist. The release number is repeated many times.
+Update bibledesktop/etc/installer/win32/BibleDesktop.nsi PROCUCT_VERSION "1.09"
+
+Step 2: Update the release files for the current jar names.
+Update bibledesktop/etc/installer/macosx/info.plist
+Update bibledesktop/etc/jnlp/bibledesktop.jnlp
+Check in the changes for these 2 steps.
+
+Step 3: Perform a clean build
+
+Execute an ant build all in jsword-web. (jsword-web-ant-all in Eclipse)
+Clean up all findbugs, pmd and checkstyle issues that make sense to do.
+(Currently there are 1 findbugs, 1 pmd and 2 checkstyle issues that can be ignored.)
+Fix any javadoc issues.
+Check in any files that changed.
+Re-execute the ant if any files changed.
+
+Step 4: Build the Windows installer
+Right click on bibledesktop/etc/installer/win32/BibleDesktop.nsi and compile the NSIS script.
+(You need to be in Windows with NSIS installed)
+Verify that the installer works.
+You can perform part of step 7 now.
+
+Step 5: Build the MacOS X installer
+Get bibledesktop-web/src/web/stable/BibleDesktop-v1.0.8.dmg
+Open it to get a copy of the BibleDesktop.app
+Get a copy of the previous BibleDesktop.app from the previous dmg.
+Replace BibleDesktop.app/Contents/info.plist with bibledesktop/etc/installer/macosx/info.plist
+Replace all the jar files in BibleDesktop.app/Contents/Resources/Java with those from bibledesktop/target/installed
+Control(Right) Click on the BibleDesktop dmg and Open With Disk Utility.
+Convert the dmg to read/write, mount and open it.
+Copy the modified BibleDesktop.app into the opened, r/w disk image.
+Eject the disk image.
+Convert it to a compressed image and take the opportunity to rename it.
+Save it into the bibledesktop/etc/installers/macosx directory, temporarily.
+Don't check in the disk image.
+Verify that the installer works.
+You can perform part of step 7 now.
+
+Step 6: Build the Linux installers
+(None at this time)
+
+Step 7: Copy the release files to stable
+Delete all the files in bibledesktop-web/src/web/stable
+Copy the following to bibledesktop-web/src/web/stable
+	All the files in bibledesktop/target/installed
+Move the following to bibledesktop-web/src/web/stable
+	From bibledesktop/etc/installer/macosx copy BibleDesktop-v1.0.9.dmg
+	From bibledesktop/etc/installer/win32 copy BibleDesktop.exe and BibleDesktopSetup.exe
+	From bibldesktop/etc/installers/rpm copy ??? (rpm and deb files)
+Update bibledesktop-web/src/web/stable/bibledesktop-1.0.9.jnlp with the following
+	codebase="http://www.crosswire.org/bibledesktop/stable"
+	href="http://www.crosswire.org/bibledesktop"
+

Modified: trunk/bibledesktop/etc/installer/macosx/Info.plist
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/Info.plist	2006-10-20 17:04:37 UTC (rev 1172)
+++ trunk/bibledesktop/etc/installer/macosx/Info.plist	2006-10-21 02:57:52 UTC (rev 1173)
@@ -7,7 +7,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.crosswire.jsword</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.4</string>
+	<string>1.0.5</string>
 	<key>CFBundleAllowMixedLocalizations</key>
 	<string>true</string>
 	<key>CFBundleExecutable</key>
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Bible Desktop v1.0.4 (c) 2006</string>
+	<string>Bible Desktop v1.0.5 (c) 2006</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleIconFile</key>
@@ -36,7 +36,7 @@
 		<string>1.4+</string>
 		<key>ClassPath</key>
 			<array>
-			<string>$JAVAROOT/bibledesktop-1.0.4.jar</string>
+			<string>$JAVAROOT/bibledesktop-1.0.5.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>
@@ -44,9 +44,9 @@
 			<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.4.jar</string>
-			<string>$JAVAROOT/jsword-common-1.0.4.jar</string>
-			<string>$JAVAROOT/jsword-common-swing-1.0.4.jar</string>
+			<string>$JAVAROOT/jsword-1.0.5.jar</string>
+			<string>$JAVAROOT/jsword-common-1.0.5.jar</string>
+			<string>$JAVAROOT/jsword-common-swing-1.0.5.jar</string>
 			<string>$JAVAROOT/lucene-core-2.0.0.jar</string>
 			</array>
 		<key>Properties</key>

Modified: trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi
===================================================================
--- trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi	2006-10-20 17:04:37 UTC (rev 1172)
+++ trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi	2006-10-21 02:57:52 UTC (rev 1173)
@@ -4,13 +4,12 @@
 !include LogicLib.nsh
 
 !define PRODUCT_NAME "BibleDesktop"
-!define PRODUCT_VERSION "1.0.4"
+!define PRODUCT_VERSION "1.0.5"
 !define CLASS "org.crosswire.bibledesktop.desktop.Desktop"
 !define JAVALIB "$EXEDIR"
 
 !define JRE_VERSION "1.4.2"
 !define JRE_URL "http://dlc.sun.com/jdk/j2re-1_4_2_07-windows-i586-p.exe"
-;!define JRE_URL "http://nsis.sourceforge.net/mediawiki/images/b/b4/InetLoad.zip"
 
 SetCompressor lzma
 

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Msg.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Msg.properties	2006-10-20 17:04:37 UTC (rev 1172)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Msg.properties	2006-10-21 02:57:52 UTC (rev 1173)
@@ -8,7 +8,7 @@
 # Property describing the name and version of the program
 Desktop.Title=Bible Desktop
 Desktop.Splash=Bible Desktop
-Desktop.Version=1.0.4
+Desktop.Version=1.0.5
 Desktop.VersionTitle=Version {0}
 Desktop.VersionAppTitle={0} v{1}
 

Deleted: trunk/bibledesktop-web/src/web/stable/BibleDesktop-v1.0.4.dmg
===================================================================
(Binary files differ)

Added: trunk/bibledesktop-web/src/web/stable/BibleDesktop-v1.0.5.dmg
===================================================================
(Binary files differ)


Property changes on: trunk/bibledesktop-web/src/web/stable/BibleDesktop-v1.0.5.dmg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/bibledesktop-web/src/web/stable/BibleDesktop.exe
===================================================================
(Binary files differ)

Deleted: trunk/bibledesktop-web/src/web/stable/BibleDesktopSetup.exe
===================================================================
(Binary files differ)

Deleted: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.4.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.4.jnlp	2006-10-20 17:04:37 UTC (rev 1172)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.4.jnlp	2006-10-21 02:57:52 UTC (rev 1173)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/stable" href="bibledesktop-1.0.4.jnlp">
-
-  <information>
-    <title>Bible Desktop v.1.0.4</title>
-    <vendor>Crosswire Bible Society</vendor>
-    <homepage href="http://www.crosswire.org/bibledesktop"/>
-    <description>Bible Desktop - Bible Study Software based on the Sword project</description>
-    <description kind="short">Bible Desktop is a Bible study package available over the internet</description>
-    <description kind="tooltip">Bible Desktop Application</description>
-    <icon href="icon32.gif"/>
-    <icon kind="splash" href="icon64.gif"/>    
-    <offline-allowed/>
-    <shortcut online="false"> 
-      <desktop/> 
-      <menu submenu="Bible Desktop"/> 
-    </shortcut> 
-  </information>
-
-  <security>
-    <!--
-    We need disk io to read installed Sword Bibles,
-    network access to install new ones, and the ability to read system vars
-    I'm not sure there is much point in asking for less that everything
-    -->
-    <all-permissions/>
-  </security>
-
-  <resources>
-    <j2se version="1.4+"/>
-    <jar href="bibledesktop-1.0.4.jar"/>
-    <jar href="jsword-1.0.4.jar"/>
-    <jar href="jsword-common-1.0.4.jar"/>
-    <jar href="jsword-common-swing-1.0.4.jar"/>
-    <jar href="javatar-2.5.jar"/>
-    <jar href="jdom-1.0.jar"/>
-    <jar href="commons-codec-1.3.jar"/>
-    <jar href="commons-httpclient-3.0.1.jar"/>
-    <jar href="commons-logging-1.1.jar"/>
-    <jar href="commons-net-1.4.1.jar"/>
-    <jar href="lucene-core-2.0.0.jar"/>
-    <jar href="jlfgr-1_0.jar"/>
-    <property name="apple.laf.useScreenMenuBar" value="true"/>
-    <property name="com.apple.mrj.application.apple.menu.about.name" value="BibleDesktop"/>
-  </resources>
-
-  <application-desc main-class="org.crosswire.bibledesktop.desktop.Desktop"/>
-
-</jnlp>

Added: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jar
===================================================================
(Binary files differ)


Property changes on: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jnlp	2006-10-20 17:04:37 UTC (rev 1172)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.5.jnlp	2006-10-21 02:57:52 UTC (rev 1173)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0+" codebase="http://www.crosswire.org/bibledesktop/stable" href="bibledesktop-1.0.5.jnlp">
+
+  <information>
+    <title>Bible Desktop v.1.0.5</title>
+    <vendor>Crosswire Bible Society</vendor>
+    <homepage href="http://www.crosswire.org/bibledesktop/stable"/>
+    <description>Bible Desktop - Bible Study Software based on the Sword project</description>
+    <description kind="short">Bible Desktop is a Bible study package available over the internet</description>
+    <description kind="tooltip">Bible Desktop Application</description>
+    <icon href="icon32.gif"/>
+    <icon kind="splash" href="icon64.gif"/>    
+    <offline-allowed/>
+    <shortcut online="false"> 
+      <desktop/> 
+      <menu submenu="Bible Desktop"/> 
+    </shortcut> 
+  </information>
+
+  <security>
+    <!--
+    We need disk io to read installed Sword Bibles,
+    network access to install new ones, and the ability to read system vars
+    I'm not sure there is much point in asking for less that everything
+    -->
+    <all-permissions/>
+  </security>
+
+  <resources>
+    <j2se version="1.4+"/>
+    <jar href="bibledesktop-1.0.5.jar"/>
+    <jar href="jsword-1.0.5.jar"/>
+    <jar href="jsword-common-1.0.5.jar"/>
+    <jar href="jsword-common-swing-1.0.5.jar"/>
+    <jar href="javatar-2.5.jar"/>
+    <jar href="jdom-1.0.jar"/>
+    <jar href="commons-codec-1.3.jar"/>
+    <jar href="commons-httpclient-3.0.1.jar"/>
+    <jar href="commons-logging-1.1.jar"/>
+    <jar href="commons-net-1.4.1.jar"/>
+    <jar href="lucene-core-2.0.0.jar"/>
+    <jar href="jlfgr-1_0.jar"/>
+    <property name="apple.laf.useScreenMenuBar" value="true"/>
+    <property name="com.apple.mrj.application.apple.menu.about.name" value="BibleDesktop"/>
+  </resources>
+
+  <application-desc main-class="org.crosswire.bibledesktop.desktop.Desktop"/>
+
+</jnlp>

Modified: trunk/bibledesktop-web/src/web/stable/commons-codec-1.3.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/commons-httpclient-3.0.1.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/commons-logging-1.1.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/commons-net-1.4.1.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/javatar-2.5.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/jdom-1.0.jar
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop-web/src/web/stable/jlfgr-1_0.jar
===================================================================
(Binary files differ)

Deleted: trunk/bibledesktop-web/src/web/stable/jsword-1.0.4.jar
===================================================================
(Binary files differ)

Added: trunk/bibledesktop-web/src/web/stable/jsword-1.0.5.jar
===================================================================
(Binary files differ)


Property changes on: trunk/bibledesktop-web/src/web/stable/jsword-1.0.5.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.4.jar
===================================================================
(Binary files differ)

Added: trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.5.jar
===================================================================
(Binary files differ)


Property changes on: trunk/bibledesktop-web/src/web/stable/jsword-common-1.0.5.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.4.jar
===================================================================
(Binary files differ)

Added: trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.5.jar
===================================================================
(Binary files differ)


Property changes on: trunk/bibledesktop-web/src/web/stable/jsword-common-swing-1.0.5.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/bibledesktop-web/src/web/stable/lucene-core-2.0.0.jar
===================================================================
(Binary files differ)

Modified: trunk/common/core.xml
===================================================================
--- trunk/common/core.xml	2006-10-20 17:04:37 UTC (rev 1172)
+++ trunk/common/core.xml	2006-10-21 02:57:52 UTC (rev 1173)
@@ -10,7 +10,7 @@
     == 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.4"/>
+  <property name="release.version" value="1.0.5"/>
   <property name="source.root"     value="src"/>
   <property name="source.etc"      value="etc"/>
   <property name="source.jar"      value="jar"/>




More information about the jsword-svn mailing list