File subversion.java14.patch of Package subversion

File subversion.java14.patch of Package subversion (Revision 10)

Currently displaying revision 10, show latest

---
 build/generator/gen_make.py                     |    2 +-
 build/generator/gen_win.py                      |    2 +-
 configure.in                                    |    2 +-
 subversion/bindings/java/javahl/build/build.xml |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

Index: subversion-1.4.x/build/generator/gen_make.py
===================================================================
--- subversion-1.4.x.orig/build/generator/gen_make.py
+++ subversion-1.4.x/build/generator/gen_make.py
@@ -292,7 +292,7 @@ class Generator(gen_base.GeneratorBase):
           self.ofile.write(
             '%s_SRC = %s\n'
             '$(%s_OBJECTS): $(%s_SRC)\n'
-            '\t%s -d %s -classpath %s:$(%s_CLASSPATH) $(%s_SRC)\n'
+            '\t%s -source 1.4 -target 1.4 -d %s -classpath %s:$(%s_CLASSPATH) $(%s_SRC)\n'
             % (targ_varname, string.join(object_srcs),
 
                targ_varname, targ_varname,
Index: subversion-1.4.x/build/generator/gen_win.py
===================================================================
--- subversion-1.4.x.orig/build/generator/gen_win.py
+++ subversion-1.4.x/build/generator/gen_win.py
@@ -315,7 +315,7 @@ class WinGeneratorBase(GeneratorBase):
 
           sourcepath = self.path(source.sourcepath)
 
-          cbuild = "javac -g -target 1.2 -source 1.3 -classpath %s -d %s " \
+          cbuild = "javac -g -target 1.4 -source 1.4 -classpath %s -d %s " \
                    "-sourcepath %s $(InputPath)" \
                    % tuple(map(self.quote, (classes, targetdir, sourcepath)))
 
Index: subversion-1.4.x/configure.in
===================================================================
--- subversion-1.4.x.orig/configure.in
+++ subversion-1.4.x/configure.in
@@ -552,7 +552,7 @@ fi
 AC_PATH_PROGS(PYTHON, "$PYTHON", none)
 
 # The minimum version for the JVM runtime for our Java bytecode.
-JAVA_OLDEST_WORKING_VER='1.2'
+JAVA_OLDEST_WORKING_VER='1.4'
 # SVN_CHECK_JDK sets $JAVA_CLASSPATH
 SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
 
Index: subversion-1.4.x/subversion/bindings/java/javahl/build/build.xml
===================================================================
--- subversion-1.4.x.orig/subversion/bindings/java/javahl/build/build.xml
+++ subversion-1.4.x/subversion/bindings/java/javahl/build/build.xml
@@ -17,13 +17,13 @@
         </javah>
     </target>
     <target name="javac" unless="junit.path">
-        <javac compiler="modern" destdir="classes">
+        <javac source="1.4" target="1.4" destdir="classes">
             <src path="src"/>
             <exclude name="org/tigris/subversion/javahl/tests/**"/>
         </javac>
     </target>
     <target name="javac-tests" if="junit.path">
-        <javac compiler="modern" destdir="classes">
+        <javac source="1.4" target="1.4" destdir="classes">
             <src path="src"/>
             <classpath path="${junit.path}"/>
         </javac>