[jsword-svn] r1899 - in trunk/bibledesktop/etc: eclipse installer/macosx/BibleDesktop.app/Contents installer/win32 jnlp

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2008-07-22 17:15:20 -0700 (Tue, 22 Jul 2008)
New Revision: 1899

Modified:
   trunk/bibledesktop/etc/eclipse/BD-ant-all.launch
   trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
   trunk/bibledesktop/etc/installer/win32/BibleDesktop.exe
   trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi
   trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
Log:
Removed icu4j from the release.

Modified: trunk/bibledesktop/etc/eclipse/BD-ant-all.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-ant-all.launch	2008-07-22 18:50:57 UTC (rev 1898)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-all.launch	2008-07-23 00:15:20 UTC (rev 1899)
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/bibledesktop/build.xml"/>
 </listAttribute>
@@ -9,9 +9,10 @@
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/jdk-1.5.0"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk1.5.0"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/bibledesktop/build.xml}"/>
 <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>

Modified: trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist	2008-07-22 18:50:57 UTC (rev 1898)
+++ trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist	2008-07-23 00:15:20 UTC (rev 1899)
@@ -44,7 +44,6 @@
 			<string>$JAVAROOT/lucene-core-2.3.2.jar</string>
 			<string>$JAVAROOT/lucene-snowball-2.3.2.jar</string>
 			<string>$JAVAROOT/lucene-analyzers-2.3.2.jar</string>
-			<string>$JAVAROOT/icu4j-4_0.jar</string>
 			<string>$JAVAROOT/jdom-1.0.jar</string>
 			<string>$JAVAROOT/commons-codec-1.3.jar</string>
 			<string>$JAVAROOT/commons-httpclient-3.1.jar</string>

Modified: trunk/bibledesktop/etc/installer/win32/BibleDesktop.exe
===================================================================
(Binary files differ)

Modified: trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi
===================================================================
--- trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi	2008-07-22 18:50:57 UTC (rev 1898)
+++ trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi	2008-07-23 00:15:20 UTC (rev 1899)
@@ -8,11 +8,11 @@
 !define CLASS "org.crosswire.bibledesktop.desktop.Desktop"
 
 ;!define JRE_VERSION "1.5.0"
-;!define JRE_URL "http://dlc.sun.com/jdk/jre-1_5_0_01-windows-i586-p.exe"
+;!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=11027"
 ; For a listing of Java 6 versions see: http://www.nabber.org/projects/appupdater/metalink/?app=Java
 !define JRE_VERSION "1.6"
-; The following is 6.0.3 aka 1.6.0 u3
-!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=12798"
+; The following is 6.0.6 aka 1.6.0 u6
+!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=20287"
 
 SetCompressor lzma
 

Modified: trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
===================================================================
--- trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp	2008-07-22 18:50:57 UTC (rev 1898)
+++ trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp	2008-07-23 00:15:20 UTC (rev 1899)
@@ -42,7 +42,6 @@
     <jar href="lucene-core-2.3.2.jar"/>
     <jar href="lucene-snowball-2.3.2.jar"/>
     <jar href="lucene-analyzers-2.3.2.jar"/>
-    <jar href="icu4j-4_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="Bible Desktop"/>