Fix [ 1883092 ] Problem redeploying modified customization or patches.jar

This commit is contained in:
Carlos Ruiz 2008-01-30 23:46:23 +00:00
parent deaf41c152
commit 45508244f3
1 changed files with 10 additions and 6 deletions

View File

@ -33,6 +33,7 @@
<!-- create the time stamp and environment --> <!-- create the time stamp and environment -->
<tstamp /> <tstamp />
<available file="${envFile}" property="envFileExists" /> <available file="${envFile}" property="envFileExists" />
<available file="lib/AdempiereOriginal.jar" type="file" property="adempiereOriginal.exists"/>
<fail message="**** RUN_setup was not successful - please re-run ****" unless="envFileExists" /> <fail message="**** RUN_setup was not successful - please re-run ****" unless="envFileExists" />
<property file="${envFile}" /> <property file="${envFile}" />
<filter filtersfile="${envFile}" /> <filter filtersfile="${envFile}" />
@ -118,8 +119,11 @@
</target> </target>
<target name="backupAdempiereOriginal" unless="adempiereOriginal.exists">
<copy file="lib/Adempiere.jar" tofile="lib/AdempiereOriginal.jar" overwrite="yes" />
</target>
<!-- rebuild Adempiere.jar to include possible customization and patches --> <!-- rebuild Adempiere.jar to include possible customization and patches -->
<target name="setupALib" depends="setupInit"> <target name="setupALib" depends="setupInit, backupAdempiereOriginal">
<jar jarfile="lib/Adempiere1.jar" index="yes" duplicate="preserve"> <jar jarfile="lib/Adempiere1.jar" index="yes" duplicate="preserve">
<!-- pack patches.jar and customization.jar into Adempiere.jar --> <!-- pack patches.jar and customization.jar into Adempiere.jar -->
<zipfileset src="lib/customization.jar" > <zipfileset src="lib/customization.jar" >
@ -127,16 +131,16 @@
</zipfileset> </zipfileset>
<zipfileset src="lib/patches.jar" > <zipfileset src="lib/patches.jar" >
<patternset refid="manifest.exclude"/> <patternset refid="manifest.exclude"/>
</zipfileset> </zipfileset>
<!-- posterita packages --> <!-- posterita packages -->
<zipfileset src="lib/posterita.jar" > <zipfileset src="lib/posterita.jar" >
<patternset refid="manifest.exclude"/> <patternset refid="manifest.exclude"/>
</zipfileset> </zipfileset>
<!-- 2pack packages --> <!-- 2pack packages -->
<zipgroupfileset dir="packages" includes="**/lib/*.jar"> <zipgroupfileset dir="packages" includes="**/lib/*.jar">
<patternset refid="manifest.exclude"/> <patternset refid="manifest.exclude"/>
</zipgroupfileset> </zipgroupfileset>
<zipfileset src="lib/Adempiere.jar" > <zipfileset src="lib/AdempiereOriginal.jar" >
<patternset refid="manifest.exclude"/> <patternset refid="manifest.exclude"/>
</zipfileset> </zipfileset>
<indexjars> <indexjars>