138 lines
5.7 KiB
Diff
138 lines
5.7 KiB
Diff
|
? data/import/AccountingFR.csv
|
||
|
|
? install/.externalToolBuilders
|
||
|
|
? utils_dev/.externalToolBuilders
|
||
|
|
? tools/lib/barbecue-1.1.jar
|
||
|
|
? tools/lib/iReport.jar
|
||
|
|
? tools/lib/itext-1.2.jar
|
||
|
|
? tools/lib/jfreechart-0.9.21.jar
|
||
|
|
? tools/lib/xdoclet-1.2.1.jar
|
||
|
|
? tools/lib/xdoclet-ejb-module-1.2.1.jar
|
||
|
|
? tools/lib/xdoclet-jboss-module-1.2.1.jar
|
||
|
|
? tools/lib/xdoclet-jmx-module-1.2.1.jar
|
||
|
|
? tools/lib/xdoclet-web-module-1.2.1.jar
|
||
|
|
? tools/lib/xjavadoc-1.0.3.jar
|
||
|
|
Index: client/build.xml
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cvsroot/compiere/client/build.xml,v
|
||
|
|
retrieving revision 1.25
|
||
|
|
diff -u -r1.25 build.xml
|
||
|
|
--- client/build.xml 22 Jan 2005 21:49:31 -0000 1.25
|
||
|
|
+++ client/build.xml 4 Mar 2005 19:46:39 -0000
|
||
|
|
@@ -94,6 +94,7 @@
|
||
|
|
<unjar src="..\print\Print.jar" dest="${build.dir}" />
|
||
|
|
<unjar src="..\extend\Extend.jar" dest="${build.dir}" />
|
||
|
|
<unjar src="..\interfaces\Interfaces.jar" dest="${build.dir}" />
|
||
|
|
+ <unjar src="..\JasperReports\CompiereJasper.jar" dest="${build.dir}" />
|
||
|
|
<delete dir="${build.dir}/META-INF"/>
|
||
|
|
|
||
|
|
<!-- put everything from ${build.dir} into Compiere.jar file -->
|
||
|
|
|
||
|
|
Index: install/build.xml
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cvsroot/compiere/install/build.xml,v
|
||
|
|
retrieving revision 1.35
|
||
|
|
diff -u -r1.35 build.xml
|
||
|
|
--- install/build.xml 8 Mar 2005 07:15:08 -0000 1.35
|
||
|
|
+++ install/build.xml 10 Mar 2005 09:22:17 -0000
|
||
|
|
@@ -147,6 +147,7 @@
|
||
|
|
<copy file="${launch.dir}/Release/Compiere2.exe" todir="${build.dir}/Compiere2/lib"/>
|
||
|
|
<copy file="CInstall.jar" todir="${build.dir}/Compiere2/lib"/>
|
||
|
|
<copy file="../sqlj/sqlj.jar" todir="${build.dir}/Compiere2/lib"/>
|
||
|
|
+ <copy file="../JasperReports/CompiereJasperReqs.jar" todir="${build.dir}/Compiere2/lib"/>
|
||
|
|
<concat destfile="${build.dir}/Compiere2/lib/index.html">CompiereHome</concat>
|
||
|
|
|
||
|
|
Index: install/Compiere2/build.xml
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cvsroot/compiere/install/Compiere2/build.xml,v
|
||
|
|
retrieving revision 1.30
|
||
|
|
diff -u -r1.30 build.xml
|
||
|
|
--- install/Compiere2/build.xml 31 Jan 2005 06:08:15 -0000 1.30
|
||
|
|
+++ install/Compiere2/build.xml 29 Mar 2005 22:37:21 -0000
|
||
|
|
@@ -130,6 +130,8 @@
|
||
|
|
<unjar src="lib/jPDF.jar" dest="buildCLib" />
|
||
|
|
<unjar src="lib/${COMPIERE_DB_TYPE}.jar" dest="buildCLib" />
|
||
|
|
<unjar src="lib/${COMPIERE_APPS_TYPE}.jar" dest="buildCLib" />
|
||
|
|
+ <!-- adding the specific CompiereJasper libs -->
|
||
|
|
+ <unjar src="lib/CompiereJasperReqs.jar" dest="buildCLib" />
|
||
|
|
|
||
|
|
<!-- Create CompiereCLib.jar file -->
|
||
|
|
<jar jarfile="lib/CompiereCLib.jar" index="yes">
|
||
|
|
@@ -175,7 +177,8 @@
|
||
|
|
<unjar src="lib/CSTools.jar" dest="buildSLib" />
|
||
|
|
<unjar src="lib/jPDF.jar" dest="buildSLib" />
|
||
|
|
<unjar src="lib/${COMPIERE_DB_TYPE}.jar" dest="buildSLib" />
|
||
|
|
-
|
||
|
|
+ <!-- adding the specific CompiereJasper libs -->
|
||
|
|
+ <unjar src="lib/CompiereJasperReqs.jar" dest="buildSLib" />
|
||
|
|
<!-- Create CompiereSLib.jar file -->
|
||
|
|
<jar jarfile="lib/CompiereSLib.jar" index="yes" >
|
||
|
|
<fileset dir="buildSLib"/>
|
||
|
|
@@ -196,9 +199,13 @@
|
||
|
|
storepass="${COMPIERE_KEYSTOREPASS}" keystore="${COMPIERE_KEYSTORE}" />
|
||
|
|
|
||
|
|
<delete dir="buildSLib" />
|
||
|
|
+ <!-- Sign CompiereJasperReqs.jar for Java Web Start -->
|
||
|
|
+ <signjar jar="lib/CompiereJasperReqs.jar"
|
||
|
|
+ alias="${COMPIERE_KEYSTORECODEALIAS}"
|
||
|
|
+ storepass="${COMPIERE_KEYSTOREPASS}" keystore="${COMPIERE_KEYSTORE}" />
|
||
|
|
</target>
|
||
|
|
|
||
|
|
-
|
||
|
|
+
|
||
|
|
<!-- ==================================================== -->
|
||
|
|
<!-- Setup Lib -->
|
||
|
|
<!-- ==================================================== -->
|
||
|
|
@@ -223,7 +230,7 @@
|
||
|
|
<zipfileset dir="utils" prefix="Compiere2"
|
||
|
|
includes="WinEnv.js"/>
|
||
|
|
<zipfileset dir="lib" prefix="Compiere2/lib"
|
||
|
|
- includes="Compiere2.exe,*.ico,Compiere.jar,CompiereCLib.jar,compiereDirect.jnlp,index.html,*.0"/>
|
||
|
|
+ includes="Compiere2.exe,*.ico,Compiere.jar,CompiereJasperReqs.jar,CompiereCLib.jar,compiereDirect.jnlp,index.html,*.0"/>
|
||
|
|
</zip>
|
||
|
|
|
||
|
|
<!-- Save properties -->
|
||
|
|
|
||
|
|
Index: utils_dev/build.xml
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cvsroot/compiere/utils_dev/build.xml,v
|
||
|
|
retrieving revision 1.28
|
||
|
|
diff -u -r1.28 build.xml
|
||
|
|
--- utils_dev/build.xml 11 Mar 2005 07:03:27 -0000 1.28
|
||
|
|
+++ utils_dev/build.xml 21 Mar 2005 15:39:41 -0000
|
||
|
|
@@ -22,6 +22,7 @@
|
||
|
|
<ant inheritAll="false" dir="print"/>
|
||
|
|
<ant inheritAll="false" dir="base"/>
|
||
|
|
<ant inheritAll="false" dir="extend"/>
|
||
|
|
+ <ant inheritAll="false" dir="JasperReports"/>
|
||
|
|
<ant inheritAll="false" dir="client"/>
|
||
|
|
<ant inheritAll="false" dir="serverRoot"/>
|
||
|
|
<ant inheritAll="false" dir="serverApps"/>
|
||
|
|
@@ -36,6 +37,7 @@
|
||
|
|
<ant inheritAll="false" dir="dbPort" target="clean"/>
|
||
|
|
<ant inheritAll="false" dir="base" target="clean"/>
|
||
|
|
<ant inheritAll="false" dir="extend" target="clean"/>
|
||
|
|
+ <ant inheritAll="false" dir="JasperReports" target="clean"/>
|
||
|
|
<ant inheritAll="false" dir="client" target="clean"/>
|
||
|
|
<ant inheritAll="false" dir="serverRoot" target="clean"/>
|
||
|
|
<ant inheritAll="false" dir="serverApps" target="clean"/>
|
||
|
|
Index: tools/lib/.cvsignore
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cvsroot/compiere/tools/lib/.cvsignore,v
|
||
|
|
retrieving revision 1.9
|
||
|
|
diff -u -r1.9 .cvsignore
|
||
|
|
--- tools/lib/.cvsignore 28 Jan 2005 16:53:37 -0000 1.9
|
||
|
|
+++ tools/lib/.cvsignore 9 Mar 2005 19:00:58 -0000
|
||
|
|
@@ -2,3 +2,12 @@
|
||
|
|
ojdbc_doc.tar
|
||
|
|
ojdbc14_g.jar
|
||
|
|
ojdbc_doc.zip
|
||
|
|
+barbecue-1.0.6b.jar
|
||
|
|
+commons-beanutils-1.7.jar
|
||
|
|
+commons-collections-3.1.jar
|
||
|
|
+commons-digester-1.6.jar
|
||
|
|
+commons-logging-1.4.jar
|
||
|
|
+xercesImpl.jar
|
||
|
|
+jasperreports-0.6.5.jar
|
||
|
|
+xml-apis.jar
|
||
|
|
+.cvsignore
|