Revert 2055, 2056, 2057

This commit is contained in:
Carlos Ruiz 2007-04-11 13:37:33 +00:00
parent 8f479b9d9e
commit 43a2c201f9
5 changed files with 20 additions and 6 deletions

View File

@ -144,6 +144,18 @@
storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" /> storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
<copy file="buildALib/Adempiere1.jar" tofile="lib/Adempiere.jar" overwrite="yes" /> <copy file="buildALib/Adempiere1.jar" tofile="lib/Adempiere.jar" overwrite="yes" />
<!-- Sign patches Jar -->
<copy file="lib/patches.jar" tofile="buildALib/patches1.jar" overwrite="yes" />
<signjar jar="buildALib/patches1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}"
storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
<copy file="buildALib/patches1.jar" tofile="lib/patches.jar" overwrite="yes" />
<!-- Sign customization Jar -->
<copy file="lib/customization.jar" tofile="buildALib/customization1.jar" overwrite="yes" />
<signjar jar="buildALib/customization1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}"
storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
<copy file="buildALib/customization1.jar" tofile="lib/customization.jar" overwrite="yes" />
<delete dir="buildALib" /> <delete dir="buildALib" />
</target> </target>
@ -279,7 +291,7 @@
<zipfileset dir="utils" prefix="Adempiere" <zipfileset dir="utils" prefix="Adempiere"
includes="WinEnv.js" /> includes="WinEnv.js" />
<zipfileset dir="lib" prefix="Adempiere/lib" <zipfileset dir="lib" prefix="Adempiere/lib"
includes="Adempiere.exe,*.ico,CompiereJasperReqs.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" /> includes="Adempiere.exe,*.ico,customization.jar,patches.jar,CompiereJasperReqs.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" />
</zip> </zip>
<!-- Save properties --> <!-- Save properties -->
@ -300,7 +312,7 @@
<zipfileset dir="utils" prefix="Adempiere" <zipfileset dir="utils" prefix="Adempiere"
includes="WinEnv.js" /> includes="WinEnv.js" />
<zipfileset dir="lib" prefix="Adempiere/lib" <zipfileset dir="lib" prefix="Adempiere/lib"
includes="Adempiere.exe,*.ico,CompiereJasperReqs.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" /> includes="Adempiere.exe,*.ico,customization.jar,patches.jar,CompiereJasperReqs.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" />
</zip> </zip>
</target> </target>

View File

@ -14,6 +14,8 @@
<icon>Adempiere.ico</icon> <icon>Adempiere.ico</icon>
<classPath> <classPath>
<mainClass>org.compiere.Adempiere</mainClass> <mainClass>org.compiere.Adempiere</mainClass>
<cp>customization.jar</cp>
<cp>patches.jar</cp>
<cp>Adempiere.jar</cp> <cp>Adempiere.jar</cp>
<cp>AdempiereCLib.jar</cp> <cp>AdempiereCLib.jar</cp>
<cp>CompiereJasperReqs.jar</cp> <cp>CompiereJasperReqs.jar</cp>

Binary file not shown.

View File

@ -22,7 +22,7 @@
:CHECK_ADEMPIERE :CHECK_ADEMPIERE
@if not "%ADEMPIERE_HOME%" == "" goto ADEMPIERE_HOME_OK @if not "%ADEMPIERE_HOME%" == "" goto ADEMPIERE_HOME_OK
Set CLASSPATH=lib\Adempiere.jar;lib\AdempiereCLib.jar;lib\CompiereJasperReqs.jar;%CLASSPATH% Set CLASSPATH=lib\customization.jar;lib\patches.jar;lib\Adempiere.jar;lib\AdempiereCLib.jar;lib\CompiereJasperReqs.jar;%CLASSPATH%
set ADEMPIERE_HOME=%~dp0.. set ADEMPIERE_HOME=%~dp0..
@Echo ADEMPIERE_HOME is not set. @Echo ADEMPIERE_HOME is not set.
@Echo You may not be able to start Adempiere @Echo You may not be able to start Adempiere
@ -31,7 +31,7 @@ set ADEMPIERE_HOME=%~dp0..
@Echo cscript WinEnv.js C:\Adempiere C:\j2sdk1.4.2_08 @Echo cscript WinEnv.js C:\Adempiere C:\j2sdk1.4.2_08
@goto MULTI_INSTALL @goto MULTI_INSTALL
:ADEMPIERE_HOME_OK :ADEMPIERE_HOME_OK
@Set CLASSPATH=%ADEMPIERE_HOME%\lib\Adempiere.jar;%ADEMPIERE_HOME%\lib\AdempiereCLib.jar;%ADEMPIERE_HOME%\lib\CompiereJasperReqs.jar;%CLASSPATH% @Set CLASSPATH=%ADEMPIERE_HOME%\lib\customization.jar;%ADEMPIERE_HOME%\lib\patches.jar;%ADEMPIERE_HOME%\lib\CompiereJasperReqs.jar;%ADEMPIERE_HOME%\lib\Adempiere.jar;%ADEMPIERE_HOME%\lib\AdempiereCLib.jar;%CLASSPATH%
:MULTI_INSTALL :MULTI_INSTALL
@REM To switch between multiple installs, copy the created Adempiere.properties file @REM To switch between multiple installs, copy the created Adempiere.properties file

View File

@ -19,9 +19,9 @@ fi
## Check Adempiere Home ## Check Adempiere Home
if [ $ADEMPIERE_HOME ]; then if [ $ADEMPIERE_HOME ]; then
CLASSPATH=$ADEMPIERE_HOME/lib/Adempiere.jar:$ADEMPIERE_HOME/lib/AdempiereCLib.jar:$ADEMPIERE_HOME/lib/CompiereJasperReqs.jar:$CLASSPATH CLASSPATH=$ADEMPIERE_HOME/lib/customization.jar:$ADEMPIERE_HOME/lib/patches.jar:$ADEMPIERE_HOME/lib/Adempiere.jar:$ADEMPIERE_HOME/lib/AdempiereCLib.jar:$ADEMPIERE_HOME/lib/CompiereJasperReqs.jar:$CLASSPATH
else else
CLASSPATH=lib/Adempiere.jar:lib/AdempiereCLib.jar:lib/CompiereJasperReqs.jar:$CLASSPATH CLASSPATH=lib/customization.jar:lib/patches.jar:lib/Adempiere.jar:lib/AdempiereCLib.jar:lib/CompiereJasperReqs.jar:$CLASSPATH
echo ADEMPIERE_HOME is not set echo ADEMPIERE_HOME is not set
echo You may not be able to start Adempiere echo You may not be able to start Adempiere
echo Set ADEMPIERE_HOME to the directory of Adempiere. echo Set ADEMPIERE_HOME to the directory of Adempiere.