Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > 45467149d0d9b46b5e49cef73da298c0 > files > 2

svnkit-1.2.0-0.0.2.rc4mdv2009.0.src.rpm

--- svnkit-src-1.1.4/build.xml.orig	2007-07-20 22:58:54.000000000 +0200
+++ svnkit-src-1.1.4/build.xml	2007-07-25 09:18:08.000000000 +0200
@@ -28,20 +28,13 @@
 
     <target name="compile-library">
         <mkdir dir="svnkit/bin" />
-        <mkdir dir="contrib/javahl/bin" />
         <mkdir dir="contrib/sequence/bin" />
 
         <path id="library.classpath">
             <pathelement location="contrib/ganymed/ganymed.jar" />
-            <pathelement path="contrib/javahl/bin" />
             <pathelement path="contrib/sequence/bin" />
         </path>
 
-        <javac debug="true" destdir="contrib/javahl/bin" srcdir="contrib/javahl/src">
-            <exclude name="**/SVNClient.java" />
-            <exclude name="**/SVNAdmin.java" />
-            <exclude name="org/tigris/subversion/javahl/tests/**" />
-        </javac>
         <javac debug="true" destdir="contrib/sequence/bin" srcdir="contrib/sequence/src" />
         <javac debug="true"
                destdir="svnkit/bin"
@@ -56,7 +49,6 @@
 	<target name="compile-library-eclipse" depends="init-environment" if="eclipse.present"> 
         <path id="library-eclipse.classpath">
             <pathelement location="contrib/ganymed/ganymed.jar" />
-            <pathelement path="contrib/javahl/bin" />
             <pathelement path="contrib/sequence/bin" />
         	<fileset dir="${eclipse.home}/plugins">
     	        <include name="**/*.jar"/>
@@ -108,7 +100,6 @@
         <path id="tests.classpath">
             <pathelement location="contrib/ganymed/ganymed.jar" />
             <pathelement location="contrib/junit/junit.jar" />
-            <pathelement path="contrib/javahl/bin" />
             <pathelement path="contrib/sequence/bin" />
             <pathelement path="contrib/sequence/bin-test" />
             <pathelement path="svnkit/bin" />
@@ -140,8 +131,6 @@
         <jar destfile="build/lib/svnkit.jar">
             <fileset dir="svnkit/bin">
                 <exclude name="org/tmatesoft/svn/cli/**" />
-                <exclude name="org/tigris/subversion/javahl/SVNClient**" />
-                <exclude name="org/tigris/subversion/javahl/SVNAdmin**" />
             </fileset>
             <fileset dir="${basedir}" >
                 <include name="COPYING" />
@@ -160,21 +149,6 @@
                 <include name="org/tmatesoft/svn/core/wc/xml/schema/**" />
             </fileset>
         </jar>
-        <jar destfile="build/lib/svnkit-javahl.jar">
-            <fileset dir="svnkit/bin">
-                <include name="org/tigris/**" />
-            </fileset>
-            <fileset dir="contrib/javahl/bin" >
-                <exclude name="org/tigris/subversion/javahl/tests/**" />
-                <exclude name="org/tigris/subversion/javahl/SVNClient.class" />
-                <exclude name="org/tigris/subversion/javahl/SVNClient$*.class" />
-                <exclude name="org/tigris/subversion/javahl/SVNAdmin.class" />
-                <exclude name="org/tigris/subversion/javahl/SVNAdmin$*.class" />
-            </fileset>
-            <fileset dir="contrib/javahl">
-                <include name="JAVAHL-LICENSE" />
-            </fileset>
-        </jar>
         <copy file="contrib/ganymed/ganymed.jar" todir="build/lib" />
         <copy file="svnkit/native/jsvncrypt.dll" todir="build/lib" />
     	<!-- copy licences and changelog -->
@@ -183,7 +157,6 @@
                 <include name="changelog.txt" />
                 <include name="README.txt" />
                 <include name="COPYING" />
-                <include name="contrib/javahl/JAVAHL-LICENSE" />
                 <include name="contrib/sequence/SEQUENCE-LICENSE" />
                 <include name="contrib/ganymed/GANYMED-LICENSE" />
             </fileset>
@@ -216,10 +189,6 @@
         <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"/>
-            </fileset>
             <fileset dir="contrib/sequence/src" />
             <fileset dir="${basedir}" >
                 <include name="COPYING" />
@@ -227,9 +196,6 @@
             <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>
@@ -260,7 +226,6 @@
                 <include name="COPYING" />
                 <include name="GANYMED-LICENSE" />
                 <include name="SEQUENCE-LICENSE" />
-                <include name="JAVAHL-LICENSE" />
             </fileset>
             <fileset dir="svnkit-eclipse/org.tmatesoft.svnkit">
                 <include name="plugin.xml" />
@@ -298,7 +263,6 @@
     	<path id="doc.classpath">
             <pathelement path="svnkit/bin" />
             <pathelement path="contrib/sequence/bin" />
-            <pathelement path="contrib/javahl/bin" />
 		</path>
     	<javadoc destdir="build/doc/javadoc" failonerror="false"
                  windowtitle="JavaDoc :: Documentation :: Pure Java Subversion (SVN) Client Library"
@@ -330,7 +294,6 @@
         <!-- delete all compiled classes -->
         <delete>
             <fileset dir=".">
-                <include name="contrib/javahl/bin/**" />
                 <include name="contrib/sequence/bin/**" />
                 <include name="contrib/sequence/bin-test/**" />
                 <include name="svnkit/bin/**" />
@@ -375,10 +338,6 @@
                 <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**" />
-			</fileset>
 			<fileset dir="contrib/sequence/bin">
 				<include name="**"/>
 			</fileset>
@@ -388,9 +347,6 @@
             <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>
@@ -410,12 +366,6 @@
 				<exclude name=".svn"/>
 				<exclude name=".svn/**"/>
 			</fileset>
-			<fileset dir="contrib/javahl/src">
-				<exclude name=".svn"/>
-				<exclude name=".svn/**"/>
-                <exclude name="org/tigris/subversion/javahl/SVNClient.java" />
-                <exclude name="org/tigris/subversion/javahl/SVNAdmin.java" />
-			</fileset>
 			<fileset dir="contrib/sequence/src">
 				<exclude name=".svn"/>
 				<exclude name=".svn/**"/>
@@ -426,9 +376,6 @@
             <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>