* Improve build performance

- remove unnecessary unjar
This commit is contained in:
Heng Sin Low 2007-06-04 15:26:15 +00:00
parent 976a825fbd
commit ad72056739
3 changed files with 159 additions and 58 deletions

View File

@ -1,19 +1,24 @@
@Title Build Tools @Title Build Tools
@Rem $Header: /cvsroot/adempiere/tools/RUN_build.bat,v 1.16 2005/09/11 02:28:11 jjanke Exp $ @Rem $Header: /cvsroot/adempiere/tools/RUN_build.bat,v 1.16 2005/09/11 02:28:11 jjanke Exp $
@CALL ..\utils_dev\myDevEnv.bat @Rem Check java home
@IF NOT %ADEMPIERE_ENV%==Y GOTO NOBUILD @IF NOT EXIST "%JAVA_HOME%\bin" ECHO "** JAVA_HOME NOT found"
@SET PATH=%JAVA_HOME%\bin;%PATH%
@Rem Set ant classpath
@SET ANT_CLASSPATH=%CLASSPATH%;..\tools\lib\ant.jar;..\tools\lib\ant-launcher.jar;..\tools\lib\ant-swing.jar;..\tools\lib\ant-commons-net.jar;..\tools\lib\commons-net-1.4.0.jar
@SET ANT_CLASSPATH=%ANT_CLASSPATH%;"%JAVA_HOME%\lib\tools.jar"
@SET ANT_OPTS=-Xms512m -Xmx512m
@echo Cleanup ... @echo Cleanup ...
@"%JAVA_HOME%\bin\java" -Dant.home="." %ANT_PROPERTIES% org.apache.tools.ant.launch.Launcher clean @"%JAVA_HOME%\bin\java" %ANT_OPTS% -classpath %ANT_CLASSPATH% -Dant.home="." %ANT_PROPERTIES% org.apache.tools.ant.launch.Launcher clean
@echo Building ... @echo Building ...
@"%JAVA_HOME%\bin\java" -Dant.home="." %ANT_PROPERTIES% org.apache.tools.ant.launch.Launcher toolsDistribution @"%JAVA_HOME%\bin\java" %ANT_OPTS% -classpath %ANT_CLASSPATH% -Dant.home="." %ANT_PROPERTIES% org.apache.tools.ant.launch.Launcher toolsDistribution
@Echo Done ... @Echo Done ...
@sleep 60 @pause
@exit @exit
:NOBUILD :NOBUILD
@Echo Check myDevEnv.bat (copy from myDevEnvTemplate.bat)
@Pause @Pause

View File

@ -2,17 +2,24 @@
# Ported from Windows script Marek Mosiewicz<marek.mosiewicz@jotel.com.pl> # Ported from Windows script Marek Mosiewicz<marek.mosiewicz@jotel.com.pl>
SAVED_DIR=`pwd` #save current dir #check java home
cd `dirname $0`/../utils_dev #change dir to place where script resides - doesn not work with sym links if [ $JAVA_HOME ]; then
UTILS_DEV=`pwd` #this is adempiere source export PATH=$JAVA_HOME/bin:$PATH
cd $SAVED_DIR #back to the saved directory else
echo JAVA_HOME is not set.
. $UTILS_DEV/myDevEnv.sh #call environment echo You may not be able to build Adempiere
echo done echo Set JAVA_HOME to the directory of your local JDK.
if [ ! $ADEMPIERE_ENV==Y ] ; then exit
echo "Can't set developemeent environemnt - check myDevEnv.sh"
exit 1
fi fi
# check jdk
if [ ! -f $JAVA_HOME/lib/tools.jar ] ; then
echo "** Need full Java SDK **"
exit
fi
#classpath
export ANT_CLASSPATH=$CLASSPATH:../tools/lib/ant.jar:../tools/lib/ant-launcher.jar:../tools/lib/ant-swing.jar:../tools/lib/ant-commons-net.jar:../tools/lib/commons-net.jar:$JAVA_HOME/lib/tools.jar
echo running Ant echo running Ant
$JAVA_HOME/bin/java -Dant.home="." $ANT_PROPERTIES org.apache.tools.ant.Main $JAVA_HOME/bin/java -Xmx512m -classpath $ANT_CLASSPATH -Dant.home="." $ANT_PROPERTIES org.apache.tools.ant.Main

View File

@ -29,6 +29,13 @@
<pathelement path="lib/standard.jar"/> <pathelement path="lib/standard.jar"/>
</path> </path>
<patternset id="manifest.exclude">
<exclude name="META-INF/*.DSA"/>
<exclude name="META-INF/*.RSA"/>
<exclude name="META-INF/*.SF"/>
<exclude name="META-INF/MANIFEST.MF"/>
<exclude name="META-INF/INDEX.LIST"/>
</patternset>
<!-- ============================================= --> <!-- ============================================= -->
<!-- Init --> <!-- Init -->
@ -83,13 +90,27 @@
<!-- Create jboss.jar file --> <!-- Create jboss.jar file -->
<jar jarfile="${dist.dir}/jboss.jar" duplicate="preserve"> <jar jarfile="${dist.dir}/jboss.jar" duplicate="preserve">
<zipgroupfileset file="${jboss.dir}/client/jboss-client.jar"/> <zipfileset src="${jboss.dir}/client/jboss-client.jar">
<zipgroupfileset file="${jboss.dir}/client/jboss-common-client.jar"/> <patternset refid="manifest.exclude"/>
<zipgroupfileset file="${jboss.dir}/client/jboss-j2ee.jar"/> </zipfileset>
<zipgroupfileset file="${jboss.dir}/client/jbosssx-client.jar"/> <zipfileset src="${jboss.dir}/client/jboss-common-client.jar">
<zipgroupfileset file="${jboss.dir}/client/jnp-client.jar"/> <patternset refid="manifest.exclude"/>
<zipgroupfileset file="${jboss.dir}/client/jmx-invoker-adaptor-client.jar"/> </zipfileset>
<zipgroupfileset file="${jboss.dir}/client/jboss-transaction-client.jar"/> <zipfileset src="${jboss.dir}/client/jboss-j2ee.jar">
<patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="${jboss.dir}/client/jbosssx-client.jar">
<patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="${jboss.dir}/client/jnp-client.jar">
<patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="${jboss.dir}/client/jmx-invoker-adaptor-client.jar">
<patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="${jboss.dir}/client/jboss-transaction-client.jar">
<patternset refid="manifest.exclude"/>
</zipfileset>
<manifest> <manifest>
<attribute name="Specification-Title" value="Adempiere JBoss Client"/> <attribute name="Specification-Title" value="Adempiere JBoss Client"/>
<attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}"/> <attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}"/>
@ -112,8 +133,13 @@
<!-- Create oracle.jar file --> <!-- Create oracle.jar file -->
<jar jarfile="${dist.dir}/oracle.jar" duplicate="preserve"> <jar jarfile="${dist.dir}/oracle.jar" duplicate="preserve">
<zipgroupfileset file="lib/ojdbc14.jar"/> <zipfileset src="lib/ojdbc14.jar">
<zipgroupfileset file="lib/ocrs12.jar"/> <patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="lib/ocrs12.jar">
<patternset refid="manifest.exclude"/>
</zipfileset>
<manifest> <manifest>
<attribute name="Specification-Title" value="Oracle JDBC"/> <attribute name="Specification-Title" value="Oracle JDBC"/>
<attribute name="Specification-Version" value="10g"/> <attribute name="Specification-Version" value="10g"/>
@ -127,7 +153,10 @@
<!-- Create postgresql.jar file --> <!-- Create postgresql.jar file -->
<jar jarfile="${dist.dir}/postgresql.jar"> <jar jarfile="${dist.dir}/postgresql.jar">
<zipgroupfileset file="lib/postgresql.jar"/> <zipfileset src="lib/postgresql.jar">
<patternset refid="manifest.exclude"/>
</zipfileset>
<manifest> <manifest>
<attribute name="Specification-Title" value="PostgreSQL JDBC"/> <attribute name="Specification-Title" value="PostgreSQL JDBC"/>
<attribute name="Specification-Version" value="postgresql"/> <attribute name="Specification-Version" value="postgresql"/>
@ -151,26 +180,50 @@
<!-- Create CSTools jar --> <!-- Create CSTools jar -->
<jar jarfile="${dist.dir}/CSTools.jar" duplicate="preserve"> <jar jarfile="${dist.dir}/CSTools.jar" duplicate="preserve">
<!-- JSTL --> <!-- JSTL -->
<zipgroupfileset file="lib/jstl.jar"/> <zipfileset src="lib/jstl.jar">
<zipgroupfileset file="lib/standard.jar"/> <patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="lib/standard.jar">
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- ECS --> <!-- ECS -->
<fileset dir="${build.dir}/org/apache/ecs" /> <fileset dir="${build.dir}">
<include name="**/apache/ecs/**"/>
</fileset>
<!-- Payment Processors --> <!-- Payment Processors -->
<zipgroupfileset file="lib/Verisign.jar"/> <zipfileset src="lib/Verisign.jar" >
<zipgroupfileset file="lib/jpayment.jar"/> <patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="lib/jpayment.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- Log4J, jnlp --> <!-- Log4J, jnlp -->
<zipgroupfileset file="lib/log4j.jar" /> <zipfileset src="lib/log4j.jar" >
<zipgroupfileset file="lib/jnlp.jar" /> <patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="lib/jnlp.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- Barcode, ftp --> <!-- Barcode, ftp -->
<zipgroupfileset file="lib/barbecue-1.0.6d.jar" /> <zipfileset src="lib/barbecue-1.0.6d.jar" >
<zipgroupfileset file="lib/commons-net-1.4.0.jar" /> <patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="lib/commons-net-1.4.0.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- Adempiere look and feel --> <!-- Adempiere look and feel -->
<zipgroupfileset file="lib/looks-2.0.4.jar" /> <zipfileset src="lib/looks-2.0.4.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- PDF --> <!-- PDF -->
<zipgroupfileset file="lib/jpedal.jar" /> <zipfileset src="lib/jpedal.jar" >
<zipgroupfileset file="lib/itext-1.4.8.jar" /> <patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="lib/itext-1.4.8.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<manifest> <manifest>
<attribute name="Specification-Title" value="Adempiere Server Tools"/> <attribute name="Specification-Title" value="Adempiere Server Tools"/>
<attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}"/> <attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}"/>
@ -194,34 +247,70 @@
<!-- Create CCTools.jar file --> <!-- Create CCTools.jar file -->
<jar jarfile="${dist.dir}/CCTools.jar" duplicate="preserve"> <jar jarfile="${dist.dir}/CCTools.jar" duplicate="preserve">
<!-- ECS --> <!-- ECS -->
<fileset dir="${build.dir}/org/apache/ecs" /> <fileset dir="${build.dir}">
<include name="**/apache/ecs/**"/>
</fileset>
<!-- Mail --> <!-- Mail -->
<zipgroupfileset file="lib/activation.jar" /> <zipfileset src="lib/activation.jar" >
<zipgroupfileset file="lib/mail.jar" /> <patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="lib/mail.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- Bean Shell --> <!-- Bean Shell -->
<zipgroupfileset file="lib/bsh-1.3.0.jar" /> <zipfileset src="lib/bsh-1.3.0.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- Payment Processors --> <!-- Payment Processors -->
<zipgroupfileset file="lib/Verisign.jar" /> <zipfileset src="lib/Verisign.jar" >
<zipgroupfileset file="lib/jpayment.jar" /> <patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="lib/jpayment.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- Log4J, jnlp --> <!-- Log4J, jnlp -->
<zipgroupfileset file="lib/log4j.jar" /> <zipfileset src="lib/log4j.jar" >
<zipgroupfileset file="lib/jnlp.jar" /> <patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="lib/jnlp.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- Barcode, ftp --> <!-- Barcode, ftp -->
<zipgroupfileset file="lib/barbecue-1.0.6d.jar" /> <zipfileset src="lib/barbecue-1.0.6d.jar" >
<zipgroupfileset file="lib/commons-net-1.4.0.jar" /> <patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="lib/commons-net-1.4.0.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- JFreeChart --> <!-- JFreeChart -->
<zipgroupfileset file="lib/jfreechart-1.0.2.jar" /> <zipfileset src="lib/jfreechart-1.0.2.jar" >
<zipgroupfileset file="lib/jcommon-1.0.5.jar" /> <patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="lib/jcommon-1.0.5.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- Graph --> <!-- Graph -->
<zipgroupfileset file="lib/jgraph.jar" /> <zipfileset src="lib/jgraph.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- Adempeire Look and Feal --> <!-- Adempeire Look and Feal -->
<zipgroupfileset file="lib/looks-2.0.4.jar" /> <zipfileset src="lib/looks-2.0.4.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- jars for 2pack --> <!-- jars for 2pack -->
<zipgroupfileset file="lib/ant.jar" /> <zipfileset src="lib/ant.jar" >
<zipgroupfileset file="lib/xercesImpl.jar" /> <patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="lib/xercesImpl.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<!-- PDF --> <!-- PDF -->
<zipgroupfileset file="lib/jpedal.jar" /> <zipfileset src="lib/jpedal.jar" >
<zipgroupfileset file="lib/itext-1.4.8.jar" /> <patternset refid="manifest.exclude"/>
</zipfileset>
<zipfileset src="lib/itext-1.4.8.jar" >
<patternset refid="manifest.exclude"/>
</zipfileset>
<manifest> <manifest>
<attribute name="Specification-Title" value="Adempiere Client Tools"/> <attribute name="Specification-Title" value="Adempiere Client Tools"/>
<attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}"/> <attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}"/>