[jsword-svn] r2305 - in trunk: bibledesktop bibledesktop/etc/installer/win32 bibledesktop-web

[dmsmith at crosswire.org]

Author: dmsmith
Date: 2013-03-12 11:38:11 -0700 (Tue, 12 Mar 2013)
New Revision: 2305

Modified:
   trunk/bibledesktop-web/build.xml
   trunk/bibledesktop/build.xml
   trunk/bibledesktop/etc/installer/win32/BibleDesktop.exe
   trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi
Log:
Ant build changes

Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml	2013-03-12 01:47:10 UTC (rev 2304)
+++ trunk/bibledesktop/build.xml	2013-03-12 18:38:11 UTC (rev 2305)
@@ -17,6 +17,7 @@
 	<property name="gener.root"	value="${dest.dir}/gener"/>
 
 	<target	name="prepare"
+		    depends="resource.main, resource.test"
 			description="Prepare the build by copying needed jars and files">
 		<copy	verbose="${verbose.copy}"
 				todir="${lib.dir}"
@@ -80,7 +81,8 @@
 	</target>
 
 	<!-- Prepare the WebStart distribution -->
-	<target name="package.webstart">
+    <target name="package.webstart"
+        depends="keygen">
 		<mkdir dir="${dest.install.pkg.dir}"/>
 		<property name="dest.install.webstart.dir" value="${dest.install.pkg.dir}/webstart"/>
 
@@ -197,9 +199,9 @@
 				<filter token="release.version" value="${release.version}"/>
 			</filterset>
 		</copy>
-		<nsis verbosity="1" script="${dest.install.nsis.dir}/BibleDesktop.nsi"/>
-		<nsis verbosity="1" script="${dest.install.nsis.dir}/PortableBibleDesktop.nsi"/>
-		<nsis verbosity="1" script="${dest.install.nsis.dir}/BibleDesktopSetup.nsi"/>
+		<nsis verbosity="2" script="${dest.install.nsis.dir}/BibleDesktop.nsi"/>
+		<nsis verbosity="2" script="${dest.install.nsis.dir}/PortableBibleDesktop.nsi"/>
+		<nsis verbosity="2" script="${dest.install.nsis.dir}/BibleDesktopSetup.nsi"/>
 		<delete file="${dest.install.nsis.dir}/BibleDesktop.nsi"/>
 		<delete file="${dest.install.nsis.dir}/PortableBibleDesktop.nsi"/>
 		<delete file="${dest.install.nsis.dir}/BibleDesktopSetup.nsi"/>

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	2013-03-12 01:47:10 UTC (rev 2304)
+++ trunk/bibledesktop/etc/installer/win32/BibleDesktop.nsi	2013-03-12 18:38:11 UTC (rev 2305)
@@ -2,6 +2,7 @@
 ;--------------
 
 !include LogicLib.nsh
+!include x64.nsh
 
 !define PRODUCT_NAME "BibleDesktop"
 !define PRODUCT_VERSION "@release.version@"
@@ -10,9 +11,9 @@
 ;!define JRE_VERSION "1.5.0"
 ;!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"
+!define JRE_VERSION "6"
 ; The following is 6.0.6 aka 1.6.0 u6
-!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=20287"
+;!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=20287"
 
 SetCompressor lzma
 
@@ -110,18 +111,17 @@
 FunctionEnd
 
 Function GetJRE
-  MessageBox MB_OK "${PRODUCT_NAME} uses Java ${JRE_VERSION} or later, it will now be downloaded and installed."
-
-  StrCpy $2 "$TEMP\Java Runtime Environment.exe"
+  ;StrCpy $2 "$TEMP\Java Runtime Environment.exe"
   ; Obtain from http://nsis.sourceforge.net/Inetc_plug-in
   ; and put inetc.dll from zip file in NSIS plugins directory
-  Inetc::get /POPUP "Getting Java for ${PRODUCT_NAME}" ${JRE_URL} $2
-  Pop $R0 ;Get the return value
-  StrCmp $R0 "OK" +5
+  ;Inetc::get /POPUP "Getting Java for ${PRODUCT_NAME}" ${JRE_URL} $2
+  ;Pop $R0 ;Get the return value
+  ;StrCmp $R0 "OK" +5
   ;NSISdl::download /TIMEOUT=30000 ${JRE_URL} $2
   ;Pop $R0 ;Get the return value
   ;StrCmp $R0 "success" +5
-  MessageBox MB_OK "Could not install Java for you. Please install Java from http://www.java.com then re-run ${PRODUCT_NAME}."
+  ;MessageBox MB_OK "Could not install Java for you. Please install Java from http://www.java.com then re-run ${PRODUCT_NAME}."
+  MessageBox MB_OK "${PRODUCT_NAME} uses Java. Please install Java from http://www.java.com then re-run ${PRODUCT_NAME}."
   StrCpy $0 "http://www.java.com"
   Call openLinkNewWindow
   Quit

Modified: trunk/bibledesktop-web/build.xml
===================================================================
--- trunk/bibledesktop-web/build.xml	2013-03-12 01:47:10 UTC (rev 2304)
+++ trunk/bibledesktop-web/build.xml	2013-03-12 18:38:11 UTC (rev 2305)
@@ -9,8 +9,10 @@
 	<!--=======================================================================-->
 	<!-- override -->
 	<property name="website.bd.dir"			value="${dest.install.web.dir}"/>
-	<!-- override -->
-	<property name="package.bd.dir"			value="${dest.install.pkg.dir}"/>
+    <!-- override -->
+    <property name="package.bd.dir"         value="${dest.install.pkg.dir}"/>
+    <!-- override -->
+    <property name="package.jsword.dir"     value="${dest.install.pkg.dir}"/>
 
 	<!--=======================================================================-->
 	<target name="package.extra" description="Build an unpacked war file">