[patchlogo]

Debian patch tracking system

- svnkit - svnkit/1.3.3+dfsg-1 - series patch 01_build_with_debian_jars.diff

svnkit (1.3.3+dfsg-1) 01_build_with_debian_jars.diff

Summary

 build.xml |   66 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)
download this patch

Patch contents

Author: Miguel Landaeta <miguel@miguel.cc>
Subject: compile svnkit using libraries installed on system
diff --git a/build.xml b/build.xml
index 5d90b32..047a90b 100644
--- a/build.xml
+++ b/build.xml
@@ -29,30 +29,26 @@
     <target name="compile-library">
         <mkdir dir="svnkit/bin" />
         <mkdir dir="svnkit-cli/bin" />
-        <mkdir dir="contrib/javahl/bin" />
         <mkdir dir="contrib/sequence/bin" />
 
         <path id="library.classpath">
-            <pathelement location="contrib/trilead/trilead.jar" />
-            <pathelement location="contrib/jna/jna.jar" />            
-            <pathelement location="contrib/sqljet/antlr-runtime-${antlr.version}.jar" />            
-            <pathelement location="contrib/sqljet/sqljet.jar" />            
-
-        	<pathelement path="contrib/javahl/bin" />
+            <fileset dir="/" includesfile="debian/classpath-debian"/>
             <pathelement path="contrib/sequence/bin" />
             <pathelement path="svnkit/bin" />
         </path>
 
+        <!--
         <javac debug="true" destdir="contrib/javahl/bin" srcdir="contrib/javahl/src">
             <exclude name="**/SVNClient.java" />
             <exclude name="**/SVNAdmin.java" />
             <exclude name="**/Path.java" />
         </javac>
+        -->
         <javac debug="true" destdir="contrib/sequence/bin" srcdir="contrib/sequence/src" />
         <javac debug="true" destdir="svnkit/bin" srcdir="svnkit/src" classpathref="library.classpath">
             <exclude name="org/tmatesoft/svn/util/SVNTest.java"/>
             <exclude name="org/tmatesoft/svn/core/internal/wc/FSMergerBySequenceTest.java"/>
-            <exclude name="org/tmatesoft/svn/core/internal/io/svn/sasl/**"/>
+            <!--<exclude name="org/tmatesoft/svn/core/internal/io/svn/sasl/**"/>-->
             <exclude name="org/tmatesoft/svn/core/internal/io/fs/repcache/**"/>
         </javac>
         <javac debug="true"
@@ -64,9 +60,7 @@
 
 	<target name="compile-library-eclipse" depends="init-environment" if="eclipse.present"> 
         <path id="library-eclipse.classpath">
-            <pathelement location="contrib/trilead/trilead.jar" />
-            <pathelement location="contrib/jna/jna.jar" />
-            <pathelement path="contrib/javahl/bin" />
+            <fileset dir="/" includesfile="debian/classpath-debian"/>
             <pathelement path="contrib/sequence/bin" />
         	<fileset dir="${eclipse.home}/plugins">
     	        <include name="**/*.jar"/>
@@ -97,8 +91,7 @@
 		
         <path id="eclipse.classpath">
             <pathelement path="build/lib/svnkit.jar" />
-            <pathelement path="build/lib/trilead.jar" />
-            <pathelement path="build/lib/jna.jar" />
+            <fileset dir="/" includesfile="debian/classpath-debian"/>
         	<fileset dir="${eclipse.home}/plugins">
     	        <include name="**/*.jar"/>
 	        </fileset>
@@ -119,11 +112,7 @@
         <mkdir dir="svnkit-test/bin" />
 
         <path id="tests.classpath">
-            <pathelement location="contrib/trilead/trilead.jar" />
-            <pathelement location="contrib/jna/jna.jar" />
-            <pathelement location="contrib/junit/junit.jar" />
-            <pathelement path="contrib/javahl/bin" />
-            <pathelement path="contrib/javahl/bin-test" />
+            <fileset dir="/" includesfile="debian/classpath-debian"/>
             <pathelement path="contrib/sequence/bin" />
             <pathelement path="contrib/sequence/bin-test" />
             <pathelement path="svnkit/bin" />
@@ -131,13 +120,10 @@
         </path>
 
         <path id="sequence.tests.classpath">
-            <pathelement location="contrib/junit/junit.jar" />
             <pathelement path="contrib/sequence/bin" />
         </path>
 
         <path id="javahl.tests.classpath">
-            <pathelement location="contrib/junit/junit.jar" />
-            <pathelement path="contrib/javahl/bin" />
             <pathelement path="svnkit/bin" />
         </path>
 
@@ -197,6 +183,7 @@
             <fileset dir="svnkit/bin">
                 <include name="org/tigris/**" />
             </fileset>
+            <!--
             <fileset dir="contrib/javahl/bin" >
                 <exclude name="org/tigris/subversion/javahl/SVNClient.class" />
                 <exclude name="org/tigris/subversion/javahl/SVNClient$*.class" />
@@ -207,11 +194,14 @@
             <fileset dir="contrib/javahl">
                 <include name="JAVAHL-LICENSE" />
             </fileset>
+            -->
         </jar>
+        <!--
         <copy file="contrib/trilead/trilead.jar" todir="build/lib" />
         <copy file="contrib/jna/jna.jar" todir="build/lib" />
     	<copy file="contrib/sqljet/sqljet.jar" tofile="build/lib/sqljet.${sqljet.version}.jar" />
     	<copy file="contrib/sqljet/antlr-runtime-${antlr.version}.jar" tofile="build/lib/antlr-runtime-${antlr.version}.jar" />
+        -->
 
     	<!-- copy licences and changelog -->
         <copy todir="build/lib" flatten="true">
@@ -304,11 +294,13 @@
         <zip destfile="build/lib/svnkitsrc.zip">
             <fileset dir="svnkit/src" />
             <fileset dir="svnkit-eclipse/org.tmatesoft.svnkit/src" />
+            <!--
             <fileset dir="contrib/javahl/src">
             	<exclude name="org/tigris/subversion/javahl/SVNAdmin.java"/>
             	<exclude name="org/tigris/subversion/javahl/SVNClient.java"/>
                 <exclude name="org/tigris/subversion/javahl/Path.java"/>
             </fileset>
+            -->
             <fileset dir="contrib/sequence/src" />
             <fileset dir="${basedir}" >
                 <include name="COPYING" />
@@ -316,9 +308,11 @@
             <fileset dir="build/lib" >
                 <include name="svnkit.build.properties" />
             </fileset>
+            <!--
             <fileset dir="contrib/javahl" >
                 <include name="JAVAHL-LICENSE" />
             </fileset>
+            -->
             <fileset dir="contrib/sequence" >
                 <include name="SEQUENCE-LICENSE" />
             </fileset>
@@ -435,7 +429,7 @@
     	<path id="doc.classpath">
             <pathelement path="svnkit/bin" />
             <pathelement path="contrib/sequence/bin" />
-            <pathelement path="contrib/javahl/bin" />
+            <fileset dir="/" includesfile="debian/classpath-debian"/>
 		</path>
     	<javadoc destdir="build/doc/javadoc" failonerror="false"
                  windowtitle="JavaDoc :: Documentation :: Pure Java Subversion (SVN) Client Library"
@@ -542,12 +536,14 @@
                 <include name="org/tmatesoft/svn/core/internal/wc/config/**" />
                 <include name="org/tmatesoft/svn/core/io/repository/**" />
 			</fileset>
+			<!--
 			<fileset dir="contrib/javahl/bin">
                 <exclude name="org/tigris/subversion/javahl/SVNClient**" />
                 <exclude name="org/tigris/subversion/javahl/SVNAdmin**" />
                 <exclude name="org/tigris/subversion/javahl/Path**" />
                 <exclude name="org/tigris/subversion/javahl/tests/**" />
 			</fileset>
+			-->
 			<fileset dir="contrib/sequence/bin">
 				<include name="**"/>
 			</fileset>
@@ -557,9 +553,11 @@
             <fileset dir="build/lib" >
                 <include name="svnkit.build.properties" />
             </fileset>
+            <!--
             <fileset dir="contrib/javahl" >
                 <include name="JAVAHL-LICENSE" />
             </fileset>
+            -->
             <fileset dir="contrib/sequence" >
                 <include name="SEQUENCE-LICENSE" />
             </fileset>
@@ -574,6 +572,7 @@
 				<exclude name=".svn"/>
 				<exclude name=".svn/**"/>
 			</fileset>
+			<!--
 			<fileset dir="contrib/javahl/src">
 				<exclude name=".svn"/>
 				<exclude name=".svn/**"/>
@@ -581,6 +580,7 @@
                 <exclude name="org/tigris/subversion/javahl/SVNAdmin.java" />
                 <exclude name="org/tigris/subversion/javahl/Path.java" />
 			</fileset>
+			-->
 			<fileset dir="contrib/sequence/src">
 				<exclude name=".svn"/>
 				<exclude name=".svn/**"/>
@@ -591,9 +591,11 @@
             <fileset dir="build/lib" >
                 <include name="svnkit.build.properties" />
             </fileset>
+            <!--
             <fileset dir="contrib/javahl" >
                 <include name="JAVAHL-LICENSE" />
             </fileset>
+            -->
             <fileset dir="contrib/sequence" >
                 <include name="SEQUENCE-LICENSE" />
             </fileset>
@@ -605,6 +607,7 @@
         <replace token="%jna.version%" value="${jna.version}" file="build/maven/org.tmatesoft.svnkit-${build.number}/pom.xml"/>
         <replace token="%sqljet.version%" value="${sqljet.version}" file="build/maven/org.tmatesoft.svnkit-${build.number}/pom.xml"/>
 
+		<!--
 		<copy file="contrib/trilead/pom.xml" tofile="build/maven/com.trilead.ssh2-${trilead.ssh2.version}/pom.xml"/>
 		<replace token="%trilead.ssh2.version%" value="${trilead.ssh2.version}" file="build/maven/com.trilead.ssh2-${trilead.ssh2.version}/pom.xml"/>
 
@@ -614,7 +617,9 @@
 		<copy file="contrib/sqljet/pom.xml" tofile="build/maven/org.tmatesoft.sqljet-${sqljet.version}/pom.xml"/>
 		<replace token="%sqljet.version%" value="${sqljet.version}" file="build/maven/org.tmatesoft.sqljet-${sqljet.version}/pom.xml"/>
 		<replace token="%antlr.version%" value="${antlr.version}" file="build/maven/org.tmatesoft.sqljet-${sqljet.version}/pom.xml"/>
+		-->
 
+		<!--
 		<copy file="contrib/trilead/trilead.jar" tofile="build/maven/com.trilead.ssh2-${trilead.ssh2.version}/trilead-ssh2-${trilead.ssh2.version}.jar" />
 		<copy file="contrib/jna/jna.jar" tofile="build/maven/com.sun.jna-${jna.version}/jna-${jna.version}.jar" />
 		<copy file="contrib/sqljet/sqljet.jar" tofile="build/maven/org.tmatesoft.sqljet-${sqljet.version}/sqljet-${sqljet.version}.jar" />
@@ -624,7 +629,9 @@
                 <include name="**" />
 	        </fileset>
         </jar>
+        -->
 
+		<!--
 		<jar destfile="build/maven/trilead.ssh2-${trilead.ssh2.version}-bundle.jar">
         	<fileset dir="contrib/trilead">
                 <exclude name="pom.xml" />
@@ -654,6 +661,7 @@
             	<include name="**" />
     	    </fileset>
         </jar>
+		-->
 
 		<delete dir="build/maven" >
 			<include name="org.tmatesoft.svnkit-${build.number}/**"/>
@@ -668,6 +676,7 @@
 	</target>
 
 	<target name="deploy-maven" depends="clean,init-environment,build-library,build-doc">
+		<!-- TODO -->
 		<path id="maven-ant-tasks.classpath" path="contrib/maven/maven-ant-tasks-2.0.10.jar" />
 		<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
 		
@@ -852,7 +861,6 @@
 
     <target name="test-java" depends="init-environment,compile-tests">
         <path id="test.classpath">
-            <pathelement path="contrib/junit/junit.jar" />
             <pathelement path="svnkit/bin" />
             <pathelement path="contrib/sequence/bin" />
             <pathelement path="svnkit-test/bin" />
@@ -871,14 +879,10 @@
     	
         <junit fork="true" dir="${javahl.test.home}" >
             <classpath>
-                <pathelement location="contrib/junit/junit.jar" />
-                <pathelement location="contrib/trilead/trilead.jar"/>
-                <pathelement location="contrib/jna/jna.jar"/>
+                <fileset dir="/" includesfile="debian/classpath-debian"/>
                 <pathelement path="svnkit/bin"/>
                 <pathelement path="svnkit/src" />
                 <pathelement path="contrib/sequence/bin" />
-                <pathelement path="contrib/javahl/bin" />
-                <pathelement path="contrib/javahl/bin-test" />
             </classpath>
             <test name="org.tigris.subversion.javahl.BasicTests" />
             <test name="org.tigris.subversion.javahl.SVNAdminTests" />
@@ -943,11 +947,7 @@
     	<path id="python.classpath">
             <pathelement path="build/lib/svnkit.jar" />
             <pathelement path="build/lib/svnkit-cli.jar" />
-            <pathelement path="build/lib/trilead.jar" />
-            <pathelement path="build/lib/jna.jar" />
-            <pathelement path="contrib/junit/junit.jar" />
-            <pathelement path="contrib/sqljet/sqljet.jar" />
-            <pathelement path="contrib/sqljet/antlr-runtime-${antlr.version}.jar" />
+            <fileset dir="/" includesfile="debian/classpath-debian"/>
     		<pathelement path="svnkit-test/bin" />
         </path>
page code/design/content is copyright (c) 2008 sean finney <seanius@debian.org>.
patches viewed/retrieved through this system are copyrighted by their respective authors.
browse git repo - clone git repo