76 lines
3.5 KiB
Diff
76 lines
3.5 KiB
Diff
Index: C:/Trifon-CD-0.2/COMAP/adempiere-trunk/install/Adempiere/build.xml
|
|
===================================================================
|
|
--- C:/Trifon-CD-0.2/COMAP/adempiere-trunk/install/Adempiere/build.xml (revision 1227)
|
|
+++ C:/Trifon-CD-0.2/COMAP/adempiere-trunk/install/Adempiere/build.xml (working copy)
|
|
@@ -164,6 +164,9 @@
|
|
<!--end vpj-cd e-evolution-->
|
|
<unjar src="lib/fyracle.jar" dest="buildCLib" />
|
|
|
|
+ <!-- adding the specific CompiereJasper libs -->
|
|
+ <unjar src="lib/CompiereJasperReqs.jar" dest="buildCLib" />
|
|
+
|
|
<unjar src="lib/${ADEMPIERE_APPS_TYPE}.jar" dest="buildCLib" />
|
|
|
|
<!-- Create AdempiereCLib.jar file -->
|
|
@@ -209,6 +212,9 @@
|
|
<!--end vpj-cd e-evolution-->
|
|
<unjar src="lib/fyracle.jar" dest="buildSLib" />
|
|
|
|
+ <!-- adding the specific CompiereJasper libs -->
|
|
+ <unjar src="lib/CompiereJasperReqs.jar" dest="buildSLib" />
|
|
+
|
|
|
|
<!-- Create AdempiereSLib.jar file -->
|
|
<jar jarfile="lib/AdempiereSLib.jar" index="yes">
|
|
@@ -228,6 +234,11 @@
|
|
<signjar jar="lib/AdempiereSLib.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}"
|
|
storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
|
|
<delete dir="buildSLib" />
|
|
+
|
|
+ <!-- Sign CompiereJasperReqs.jar for Java Web Start -->
|
|
+ <signjar jar="lib/CompiereJasperReqs.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}"
|
|
+ storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
|
|
+
|
|
</target>
|
|
|
|
<!-- Sign other application jars -->
|
|
@@ -271,7 +282,7 @@
|
|
<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" />
|
|
+ includes="Adempiere.exe,*.ico,customization.jar,patches.jar,CompiereJasperReqs.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" />
|
|
</zip>
|
|
|
|
<!-- Save properties -->
|
|
@@ -292,7 +303,7 @@
|
|
<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" />
|
|
+ includes="Adempiere.exe,*.ico,customization.jar,patches.jar,CompiereJasperReqs.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" />
|
|
</zip>
|
|
</target>
|
|
|
|
@@ -303,7 +314,7 @@
|
|
<zipfileset src="${basedir}/lib/adempiereRootBase.war" />
|
|
<!-- copy to adempiereHome -->
|
|
<zipfileset dir="${basedir}/lib"
|
|
- includes="AdempiereClient.zip,Adempiere.jar,AdempiereCLib.jar,*.jnlp,*.0,*.html"
|
|
+ includes="AdempiereClient.zip,Adempiere.jar,AdempiereCLib.jar,*.jnlp,*.0,*.html,CompiereJasperReqs.jar,CompiereJasper.jar"
|
|
prefix="adempiereHome" />
|
|
</zip>
|
|
|
|
Index: C:/Trifon-CD-0.2/COMAP/adempiere-trunk/install/build.xml
|
|
===================================================================
|
|
--- C:/Trifon-CD-0.2/COMAP/adempiere-trunk/install/build.xml (revision 1227)
|
|
+++ C:/Trifon-CD-0.2/COMAP/adempiere-trunk/install/build.xml (working copy)
|
|
@@ -155,6 +155,7 @@
|
|
<copy file="CInstall.jar" todir="${build.dir}/Adempiere/lib"/>
|
|
<copy file="../sqlj/sqlj.jar" todir="${build.dir}/Adempiere/lib"/>
|
|
<copy file="../tools/lib/j2ee.jar" todir="${build.dir}/Adempiere/lib"/>
|
|
+ <copy file="../JasperReports/CompiereJasperReqs.jar" todir="${build.dir}/Compiere2/lib"/>
|
|
<concat destfile="${build.dir}/Adempiere/lib/index.html">AdempiereHome</concat>
|
|
|
|
|