[jsword-svn] r1314 - in trunk: common jsword/etc/build

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2007-05-04 13:44:27 -0700 (Fri, 04 May 2007)
New Revision: 1314

Modified:
   trunk/common/core.xml
   trunk/jsword/etc/build/settings.crosswire.org.sh
   trunk/jsword/etc/build/settings.global.sh
Log:
Fixing nightly build to use a real certificate.

Modified: trunk/common/core.xml
===================================================================
--- trunk/common/core.xml	2007-05-04 20:40:19 UTC (rev 1313)
+++ trunk/common/core.xml	2007-05-04 20:44:27 UTC (rev 1314)
@@ -24,7 +24,8 @@
   <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.file"   value="../common/common.keystore"/>
+  <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"/>
@@ -397,7 +398,7 @@
 	  <signjar
       	  storepass="${keystore.pswd}"
       	  alias="${keystore.alias}"
-      	  keystore="../common/crosswire.keystore"
+      	  keystore="${keystore.file}"
       	  keypass="${keystore.pswd}"
       	  jar="@{srcdir}/@{jar}"
       	  signedjar="@{destdir}/@{jar}"/>
@@ -415,7 +416,7 @@
     <echo message="Generating keystore for signing jars"/>
     <genkey alias="${keystore.alias}"
           storepass="${keystore.pswd}"
-          keystore="${keystore.file}">
+          keystore="${keystore.devfile}">
       <dname>
         <param name="CN" value="JSword Project"/>
         <param name="OU" value="Test Builds"/>
@@ -428,7 +429,7 @@
           description="Check the keystore is there">
     <available
         property="keygen.uptodate"
-        file="${keystore.file}"/>
+        file="${keystore.devfile}"/>
   </target>
 
   <!--=======================================================================

Modified: trunk/jsword/etc/build/settings.crosswire.org.sh
===================================================================
--- trunk/jsword/etc/build/settings.crosswire.org.sh	2007-05-04 20:40:19 UTC (rev 1313)
+++ trunk/jsword/etc/build/settings.crosswire.org.sh	2007-05-04 20:44:27 UTC (rev 1314)
@@ -8,6 +8,7 @@
 
 export JNLP_CODEBASE=$JNLP_HOMEPAGE/nightly
 export JNLP_INSTALLED=$WEBAPP_BIBLEDESKTOP/nightly
+export KEYSTORE_FILE=../common/crosswire.keystore
 
 export EMAIL="joe at eireneh.com dmsmith555 at yahoo.com"
 export ANT_HOME=/home/jsword/ant

Modified: trunk/jsword/etc/build/settings.global.sh
===================================================================
--- trunk/jsword/etc/build/settings.global.sh	2007-05-04 20:40:19 UTC (rev 1313)
+++ trunk/jsword/etc/build/settings.global.sh	2007-05-04 20:44:27 UTC (rev 1314)
@@ -12,3 +12,4 @@
 export PROPERTIES="$PROPERTIES -Djnlp.homepage=$JNLP_HOMEPAGE"
 export PROPERTIES="$PROPERTIES -Djnlp.codebase=$JNLP_CODEBASE"
 export PROPERTIES="$PROPERTIES -Djnlp.installed=$JNLP_INSTALLED"
+export PROPERTIES="$PROPERTIES -Dkeystore.file=$KEYSTORE_FILE"