[latexdraw] 116/147: Don't include relative paths in ClassPath in jar

[Stuart Prescott]

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

stuart pushed a commit to branch master
in repository latexdraw.

commit 5b6a37b16457f03b85e988f50a0b7fef30e71dbb
Author: Stuart Prescott <stuart at debian.org>
Date:   Sun Oct 16 23:21:34 2011 +0000

    Don't include relative paths in ClassPath in jar
---
 debian/patches/build_system.patch | 91 +++++++++++++++++++++++++++++++++++----
 1 file changed, 82 insertions(+), 9 deletions(-)

diff --git a/debian/patches/build_system.patch b/debian/patches/build_system.patch
index ea9f11c..dc194e1 100644
--- a/debian/patches/build_system.patch
+++ b/debian/patches/build_system.patch
@@ -1,10 +1,36 @@
 Alter build system to make use of external libraries rather than bundling them into jar file.
 --- a/build.xml
 +++ b/build.xml
-@@ -27,6 +27,13 @@
+@@ -5,9 +5,9 @@
+ 	<property name="dir.report" value="out/report"/>
+ 	<property name="dir.doc" location="doc"/>
+ 	<property name="release.name" value="LaTeXDraw2.0.8" />
+-	
++
+ 	<!-- Creates the output directories -->
+-	<target name="prepare">
++	<target name="prepare">
+     	<mkdir dir="${dir.out}"/>
+     	<mkdir dir="${dir.report}"/>
+     	<mkdir dir="${dir.data}/.cache"/>
+@@ -15,7 +15,7 @@
+     	<mkdir dir="${dir.out}/${release.name}_src"/>
+ 		<mkdir dir="${dir.out}/${release.name}"/>
+ 	</target>
+-		
++
+ 	<target name="doc" depends="jar" description="Generation of the documentation.">
+ 	    <javadoc destdir="${dir.doc}" author="true" version="true" use="true"
+ 	    	notree="false" nonavbar="false" noindex="false" access="private">
+@@ -25,47 +25,50 @@
+ 	      </fileset>
+ 	    </javadoc>
  	</target>
- 		
- 		
+-		
+-		
+-		
++
++
 +	<path id="classpathlib">
 +		<fileset dir="${lib.dir}" includes="**/*.jar"/>
 +	</path>
@@ -12,28 +38,43 @@ Alter build system to make use of external libraries rather than bundling them i
 +	<target name="compile">
 +		<javac srcdir="latexDraw" destdir="" classpathref="classpathlib" debug="on" encoding="utf8" />
 +	</target>
- 		
++
  	<!-- Creates the jar -->
  	<target name="jar" description="Generates latexdraw.jar">
-@@ -35,10 +42,6 @@
+ 		<!-- copies the librairies -->
+ 		<copy todir="${dir.data}/help/" overwrite="true" failonerror="true">
  					<fileset dir="help/" />
  		</copy>
- 		
+-		
 -		<copy todir="${dir.data}/lib/" overwrite="true" failonerror="true">
 -			<fileset dir="lib/" />
 -		</copy>
 -		
++
  		<copy todir="${dir.out}/" overwrite="true" failonerror="true">
  			<fileset dir="" includes="license.txt ; release_note.txt ; readme.txt ; install_vista.vbs ; install_debian_ubuntu"/>
  		</copy>
-@@ -55,12 +58,12 @@
+-		
++
+ 		<copy todir="${dir.data}/.cache" overwrite="true" failonerror="true">
+ 			<fileset dir=".cache/"/>
+ 		</copy>
+-		
++
+ 		<copy todir="${dir.data}/templates" overwrite="true" failonerror="true">
+ 			<fileset dir="templates/"/>
+ 		</copy>
+-		
++
+ 		<jar jarfile="${dir.data}/LaTeXDraw.jar" manifest="META-INF/MANIFEST.MF">
  			<!-- Creates the manifest -->
  			<manifest>
  				<attribute name="Main-Class" value="latexDraw.ui.LaTeXDraw"/>
 -				<attribute name="Class-Path" value="lib/net.sourceforge.jiu.jar lib/jlibeps.jar ./ help/"/>
-+                                <attribute name="Class-Path" value="net.sourceforge.jiu.jar net.sourceforge.jlibeps.jar txt cache .cache/ templates .templates/ help /usr/share/doc/latexdraw/"/>
++				<attribute name="Class-Path" value="net.sourceforge.jiu.jar net.sourceforge.jlibeps.jar"/>
  			</manifest>
- 			
+-			
++
  		 <!-- Filters the files -->
  		 <fileset dir=""
 -			 includes="latexDraw/**/*.class ; res/**/* ; lang/**/*"
@@ -41,3 +82,35 @@ Alter build system to make use of external libraries rather than bundling them i
  			 excludes="latexDraw/**/*.java ; latexDraw/installer/* ; latexDraw/ui/listeners/InstallerListener.*"/>
  		</jar>
  	</target>
+-	
+-	
++
++
+ 
+ 	<target name="zip src" depends="jar">
+         <copy todir="out/${release.name}_src">
+@@ -76,16 +79,16 @@
+ 		</zip>
+         <delete dir="out/${release.name}_src" />
+     </target>
+-	
+-	
++
++
+    <target name="zip jar" depends="zip src">
+         <copy todir="out/${release.name}">
+             <fileset dir="out/" includes="data/ ; install_vista.vbs ; *.txt ; *.jar ; install_debian_ubuntu" />
+-   	    </copy>
+-        <zip destfile="${dir.out}/${release.name}.zip" compress="true">
+-             <fileset dir="out/" includes="${release.name}/"/>
++   	    </copy>
++        <zip destfile="${dir.out}/${release.name}.zip" compress="true">
++             <fileset dir="out/" includes="${release.name}/"/>
+         </zip>
+-   	<delete dir="out/${release.name}" />
+-    </target>
+-	
++   	<delete dir="out/${release.name}" />
++    </target>
++
+ </project>

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