From 693b2580f85fa1c32fb9e58df2ff7f6460726ab0 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Fri, 12 Jan 2007 13:53:44 +0000
Subject: [PATCH] * Improve incremental install build

---
 install/Adempiere/RUN_update.bat |  20 ++++++
 install/Adempiere/RUN_update.sh  |  21 +++++++
 install/Adempiere/build.xml      | 103 +++++++++++++++++++++++--------
 install/build.xml                |   6 +-
 4 files changed, 121 insertions(+), 29 deletions(-)
 create mode 100644 install/Adempiere/RUN_update.bat
 create mode 100644 install/Adempiere/RUN_update.sh

diff --git a/install/Adempiere/RUN_update.bat b/install/Adempiere/RUN_update.bat
new file mode 100644
index 0000000000..a9113d3a78
--- /dev/null
+++ b/install/Adempiere/RUN_update.bat
@@ -0,0 +1,20 @@
+@Title Install Adempiere Server
+@Rem  $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.bat,v 1.19 2005/09/08 21:54:12 jjanke Exp $
+@Echo off
+
+
+@if not "%JAVA_HOME%" == "" goto JAVA_HOME_OK
+@Set JAVA=java
+@Echo JAVA_HOME is not set.  
+@Echo You may not be able to start the required Setup window !!
+@Echo Set JAVA_HOME to the directory of your local 1.5 JDK.
+@Echo If you experience problems, run utils/WinEnv.js
+@Echo Example: cscript utils\WinEnv.js C:\Adempiere "C:\Program Files\Java\jdk1.5.0_04"
+goto START
+
+:JAVA_HOME_OK
+@Set JAVA=%JAVA_HOME%\bin\java
+
+:START
+@"%JAVA%" -classpath lib\CInstall.jar; -DADEMPIERE_HOME=%ADEMPIERE_HOME% -Dant.home="." org.apache.tools.ant.launch.Launcher update
+@pause
\ No newline at end of file
diff --git a/install/Adempiere/RUN_update.sh b/install/Adempiere/RUN_update.sh
new file mode 100644
index 0000000000..e3b06fdce7
--- /dev/null
+++ b/install/Adempiere/RUN_update.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+echo Install Adempiere Server
+# $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.sh,v 1.19 2005/09/08 21:54:12 jjanke Exp $
+
+if [ $JAVA_HOME ]; then
+  JAVA=$JAVA_HOME/bin/java
+  KEYTOOL=$JAVA_HOME/bin/keytool
+else
+  JAVA=java
+  KEYTOOL=keytool
+  echo JAVA_HOME is not set.
+  echo You may not be able to start the Setup
+  echo Set JAVA_HOME to the directory of your local JDK.
+fi
+
+#echo ===================================
+#echo Update Adempiere Server Environment
+#echo ===================================
+CP=lib/CInstall.jar:lib/Adempiere.jar:lib/CCTools.jar:lib/oracle.jar:lib/derby.jar:lib/fyracle.jar:lib/jboss.jar:lib/postgresql.jar:
+$JAVA -classpath $CP -DADEMPIERE_HOME=$ADEMPIERE_HOME -Dant.home="." org.apache.tools.ant.launch.Launcher update
diff --git a/install/Adempiere/build.xml b/install/Adempiere/build.xml
index abda2770fd..d69259cbeb 100644
--- a/install/Adempiere/build.xml
+++ b/install/Adempiere/build.xml
@@ -113,6 +113,8 @@
 	<!-- rebuild Adempiere.jar to include possible customization and patches -->
 	<target name="setupALib" depends="setupInit">
 		<mkdir dir="buildALib" />
+		
+		<!-- pack patches.jar and customization.jar into Adempiere.jar -->
 		<unjar src="lib/Adempiere.jar" dest="buildALib" />
 		<unjar src="lib/patches.jar" dest="buildALib" />
 		<unjar src="lib/customization.jar" dest="buildALib" />
@@ -131,6 +133,12 @@
     		</manifest>
 	    </jar>
 		
+		<!-- Sign Adempiere Jar -->
+		<copy file="lib/Adempiere.jar" tofile="buildALib/Adempiere1.jar" overwrite="yes" />
+		<signjar jar="buildALib/Adempiere1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
+			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
+		<copy file="buildALib/Adempiere1.jar" tofile="lib/Adempiere.jar" overwrite="yes" />
+		
 		<delete dir="buildALib" />
 	</target>
 		
@@ -178,20 +186,6 @@
 		<signjar jar="lib/AdempiereCLib.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
 			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
 
-		<!-- Sign customization Jar 		-->
-		<signjar jar="lib/customization.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
-			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
-
-		<!-- Sign patches Jar 		-->
-		<signjar jar="lib/patches.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
-			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
-				
-		<!-- Sign Adempiere Jar 		-->
-		<copy file="lib/Adempiere.jar" tofile="buildCLib/Adempiere1.jar" overwrite="yes" />
-		<signjar jar="buildCLib/Adempiere1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
-			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
-		<copy file="buildCLib/Adempiere1.jar" tofile="lib/Adempiere.jar" overwrite="yes" />
-
 		<delete dir="buildCLib" />
 	</target>
 
@@ -236,19 +230,30 @@
 		<signjar jar="lib/AdempiereSLib.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
 			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
 		<delete dir="buildSLib" />
+	</target>
+	
+	<!-- Sign other application jars -->
+	<target name="signOtherJars" depends="setupInit" >
 		<!-- Sign AdempiereRoot Jar 		-->
-		<signjar jar="lib/adempiereRoot.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
+		<copy file="lib/adempiereRoot.jar" tofile="lib/adempiereRoot1.jar" overwrite="yes" />
+		<signjar jar="lib/adempiereRoot1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
 			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
+		<copy file="lib/adempiereRoot1.jar" tofile="lib/adempiereRoot.jar" overwrite="yes" />
+		<delete file="lib/adempiereRoot1.jar"/>
+		
 		<!-- Sign AdempiereApps Jar 		-->
-		<signjar jar="lib/adempiereApps.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
+		<copy file="lib/adempiereApps.jar" tofile="lib/adempiereApps1.jar" overwrite="yes" />
+		<signjar jar="lib/adempiereApps1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
 			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
+		<copy file="lib/adempiereApps1.jar" tofile="lib/adempiereApps.jar" overwrite="yes" />
+		<delete file="lib/adempiereApps1.jar"/>
 	</target>
 
 
 	<!-- ==================================================== -->
 	<!-- Setup Lib                                            -->
 	<!-- ==================================================== -->
-	<target name="setupLib" depends="setupInit, setupWin, setupNonWin, setupALib, setupCLib, setupSLib" 
+	<target name="setupLib" depends="setupInit, setupWin, setupNonWin, setupALib, setupCLib, setupSLib, signOtherJars" 
 		description="Setup Adempiere Lib directory">
 
 		<!--	Filter files Overwrite			-->
@@ -277,14 +282,23 @@
 		<copy file="Adempiere.properties" 
 			tofile="Adempiere.properties.save" />
 	</target>
+	
+	<!-- Update application library -->
+	<target name="updateLib" depends="setupInit, setupWin, setupNonWin, setupALib, signOtherJars">
+		<!--	Create Client Zip		-->
+		<zip zipfile="${basedir}/lib/AdempiereClient.zip">
+			<zipfileset dir="." prefix="Adempiere" 
+				includes="*.html" />
+			<zipfileset dir="." prefix="Adempiere" 
+				includes="RUN_Adempiere.*" />
+			<zipfileset dir="utils" prefix="Adempiere" 
+				includes="WinEnv.js" />
+			<zipfileset dir="lib" prefix="Adempiere/lib" 
+				includes="Adempiere.exe,*.ico,customization.jar,patches.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" />
+		</zip>
+	</target>
 
-
-	<!-- ==================================================== -->
-	<!-- Setup EAR Libraries                                  -->
-	<!-- ==================================================== -->
-	<target name="setupEAR" depends="setupLib" 
-		description="Setup Adempiere EAR Libraries">
-
+	<target name="createEAR">
 		<!-- Create adempiereRoot war		-->
 		<zip destfile="${basedir}/lib/adempiereRoot.war">
 			<!-- copy Base	-->
@@ -308,11 +322,34 @@
 		</ear>
 	</target>
 
+	<!-- ==================================================== -->
+	<!-- Setup EAR Libraries                                  -->
+	<!-- ==================================================== -->
+	<target name="setupEAR" depends="setupLib" 
+		description="Setup Adempiere EAR Libraries">
 
+		<antcall target="createEAR" inheritall="true"/>
+	</target>
+	
+	<target name="updateEAR" depends="updateLib">
+		<antcall target="createEAR" inheritall="true"/>
+	</target>
+
+	<!-- Update JBoss Server -->
+	<target name="updateJBoss" depends="updateEAR" if="isAppsJBoss" 
+		description="Update JBoss Application Server">
+		
+		<!-- Copy			-->
+		<echo message="AppsDeployment= ${ADEMPIERE_APPS_DEPLOY}" />
+		<!-- Deploy in exploded format for faster startup time -->
+		<unjar dest="${ADEMPIERE_APPS_DEPLOY}/adempiere.ear" src="${basedir}/lib/adempiere.ear" overwrite="true">
+		</unjar>
+	</target>
+	
 	<!-- ==================================================== -->
 	<!-- Setup JBoss Server                                   -->
 	<!-- ==================================================== -->
-	<target name="setupJBoss" depends="setupLib, setupEAR" if="isAppsJBoss" 
+	<target name="setupJBoss" depends="setupEAR" if="isAppsJBoss" 
 		description="Setup JBoss Application Server">
 
 		<!-- Filter JBoss Templates Conf	-->
@@ -386,6 +423,14 @@
 	</target>
 
 
+	<!-- ==================================================== -->
+	<!-- Update J2EE Server                                   -->
+	<!-- ==================================================== -->
+	<target name="updateDeploy" depends="updateJBoss" 
+		description="Update Adempiere Application Server">
+		<echo message="AppsDeployment= ${ADEMPIERE_APPS_DEPLOY}" />
+	</target>
+	
 	<!-- ==================================================== -->
 	<!-- Deploy J2EE Server                                   -->
 	<!-- ==================================================== -->
@@ -394,7 +439,13 @@
 		<echo message="AppsDeployment= ${ADEMPIERE_APPS_DEPLOY}" />
 	</target>
 
-
+	<!-- ==================================================== -->
+	<!-- Update (Main)                                         -->
+	<!-- ==================================================== -->
+	<target name="update" depends="updateDeploy" 
+		description="Update Adempiere Deployment">
+	</target>
+	
 	<!-- ==================================================== -->
 	<!-- Setup (Main)                                         -->
 	<!-- ==================================================== -->
diff --git a/install/build.xml b/install/build.xml
index fb2bc1ff19..bd2e22fc79 100644
--- a/install/build.xml
+++ b/install/build.xml
@@ -190,10 +190,10 @@
 	    <include name="Example*.csv"/>
 	  </fileset>
 	</copy> 
-        <copy todir="${build.dir}/Adempiere/data/">
+    <copy todir="${build.dir}/Adempiere/data/">
 	  <fileset dir="${data.dir}/seed/">
-              <include name="**/*.jar"/>
-          </fileset>
+      	<include name="**/*.jar"/>
+      </fileset>
 	</copy>