From 311edfac2b4fc148f57d03b25dafe2f5d79c955e Mon Sep 17 00:00:00 2001 From: jorton Date: Thu, 29 Mar 2007 18:53:18 +0000 Subject: [PATCH] - second attempt --- subversion-1.1.3-java.patch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/subversion-1.1.3-java.patch b/subversion-1.1.3-java.patch index 8cb39be..8140a30 100644 --- a/subversion-1.1.3-java.patch +++ b/subversion-1.1.3-java.patch @@ -1,3 +1,14 @@ +--- subversion-1.4.3/build/generator/gen_make.py.java ++++ subversion-1.4.3/build/generator/gen_make.py +@@ -277,7 +277,7 @@ + '%s_CLASS_FILENAMES = %s\n' + '%s_CLASSES = %s\n' + '$(%s_HEADERS): $(%s_CLASS_FILENAMES)\n' +- '\t%s -d %s -classpath %s:$(%s_CLASSPATH) $(%s_CLASSES)\n' ++ '\t%s -d %s -classpath %s $(%s_CLASSES)\n' + % (targ_varname, string.join(header_class_filenames), + + targ_varname, string.join(header_classes), --- subversion-1.4.3/build/ac-macros/java.m4.java +++ subversion-1.4.3/build/ac-macros/java.m4 @@ -82,7 +82,7 @@ @@ -20,14 +31,3 @@ # "make check CLEANUP=true" will clean up directories for successful tests. # "make check TESTS=subversion/tests/cmdline/basic_tests.py" ---- subversion-1.4.3/build-outputs.mk.java -+++ subversion-1.4.3/build-outputs.mk -@@ -347,7 +347,7 @@ - javahl-java: $(javahl_java_DEPS) - javahl_java_SRC = $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Notify.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/DirEntry.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/ChangePath.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/LockStatus.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/PromptUserPassword2.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Lock.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Info.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNInputStream.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Notify2.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/BlameCallback.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/PromptUserPassword3.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/CommitMessage.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/PromptUserPassword.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientLogLevel.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Revision.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/PropertyData.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/CommitItem.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/LogMessage.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/StatusKind.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/NodeKind.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Info2.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/OutputInterface.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/NotifyAction.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/NotifyStatus.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/NativeResources.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNOutputStream.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Status.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/RevisionKind.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/ScheduleKind.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Path.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Version.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/JNIError.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/ClientException.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/InputInterface.java - $(javahl_java_OBJECTS): $(javahl_java_SRC) -- $(COMPILE_JAVAHL_JAVAC) -d subversion/bindings/java/javahl/classes -classpath subversion/bindings/java/javahl/classes:$(javahl_java_CLASSPATH) $(javahl_java_SRC) -+ $(COMPILE_JAVAHL_JAVAC) -d subversion/bindings/java/javahl/classes -classpath subversion/bindings/java/javahl/classes $(javahl_java_SRC) - - - javahl_javah_PATH = subversion/bindings/java/javahl/include