[jasperreports] 01/02: Reworked build.path to load only the jar files needed on the classpath

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Oct 21 09:16:39 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jasperreports.

commit 5cf1233af8476b5868b88a3adae0f96036442e45
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 21 11:10:03 2015 +0200

    Reworked build.path to load only the jar files needed on the classpath
---
 debian/patches/build.patch | 51 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 84b225e..25f245b 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -9,15 +9,9 @@ because the necessary files were removed because of DFSG-concerns. Also fix an
 javaflow related build issue and include the required class files.
 
 Forwarded: not-needed
----
- build.xml | 27 ++++++++++++++++++++++-----
- 1 file changed, 22 insertions(+), 5 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index cfa2166..dcc6057 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -6,15 +6,19 @@
+@@ -6,15 +6,47 @@
  
  	<target name="compile" description="Compiles the java source files of the library.">
  		<mkdir dir="./build/classes"/> 
@@ -27,10 +21,39 @@ index cfa2166..dcc6057 100644
  			<classpath>
  				<pathelement location="./build/classes"/>
 -				<fileset dir="./lib">
-+                <fileset dir="/usr/share/java/">
- 					<include name="**/*.jar"/>
-+					<exclude name="**/lucene3-*.jar"/>
-+					<exclude name="**/lucene2-*.jar"/>
+-					<include name="**/*.jar"/>
++				<fileset dir="/usr/share/java/">
++					<include name="**/ant.jar"/>
++					<include name="**/antlr*.jar"/>
++					<include name="**/batik-all.jar"/>
++					<include name="**/bsh.jar"/>
++					<include name="**/castor*.jar"/>
++					<include name="**/commons-beanutils.jar"/>
++					<include name="**/commons-codec.jar"/>
++					<include name="**/commons-collections3.jar"/>
++					<include name="**/commons-digester.jar"/>
++					<include name="**/commons-javaflow.jar"/>
++					<include name="**/commons-logging.jar"/>
++					<include name="**/ecj.jar"/>
++					<include name="**/glassfish-jpa.jar"/>
++					<include name="**/groovy-all-2.x.jar"/>
++					<include name="**/hibernate*.jar"/>
++					<include name="**/httpcore.jar"/>
++					<include name="**/httpclient.jar"/>
++					<include name="**/itext.jar"/>
++					<include name="**/jackson*.jar"/>
++					<include name="**/jaxen.jar"/>
++					<include name="**/jfreechart.jar"/>
++					<include name="**/js.jar"/>
++					<include name="**/jxl.jar"/>
++					<include name="**/lucene-*-4*.jar"/>
++					<include name="**/mondrian.jar"/>
++					<include name="**/olap4j*.jar"/>
++					<include name="**/poi*.jar"/>
++					<include name="**/servlet-api-*.jar"/>
++					<include name="**/spring*.jar"/>
++					<include name="**/velocity.jar"/>
++					<include name="**/xalan2.jar"/>
  				</fileset>
  			</classpath>
  			<src path="./src"/>
@@ -39,7 +62,7 @@ index cfa2166..dcc6057 100644
  			<compilerarg value="-Xlint:unchecked"/>
  			<compilerarg value="-Xlint:-options"/>
  		</javac>
-@@ -64,12 +68,12 @@
+@@ -64,12 +96,12 @@
  		</jar>
  	</target>
  	
@@ -54,7 +77,7 @@ index cfa2166..dcc6057 100644
  					<include name="**/*.jar"/>
  				</fileset>
  				<pathelement location="./build/classes"/>
-@@ -95,6 +99,19 @@
+@@ -95,6 +127,19 @@
  			<include name="net/sf/jasperreports/engine/fill/JRSubreportRunnable.class"/>
  			<include name="net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.class"/>
  			<include name="net/sf/jasperreports/engine/fill/FillerSubreportParent.class"/>
@@ -74,7 +97,7 @@ index cfa2166..dcc6057 100644
  		</javaflow>
  
  		<mkdir dir="./dist"/> 
-@@ -278,6 +295,6 @@
+@@ -278,6 +323,6 @@
  		</copy>
  	</target>
  	

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jasperreports.git



More information about the pkg-java-commits mailing list