Add more javac stuff. Add target="" attribute to javac

(bzr r5056)

2 files changed, 15 insertions, 3 deletions

diff --git a/build.xml b/build.xml
index 38f51f160..b11905033 100644
--- a/build.xml
+++ b/build.xml
@@ -329,7 +329,7 @@
   -->
   <target name="java" depends="init"
       description="compile java binding classes">
-    <javac srcdir="${src}/bind/java" destdir="${build}/java/classes"/>
+    <javac srcdir="${src}/bind/java" destdir="${build}/java/classes" target="1.5"/>
   </target>
 
 
@@ -583,6 +583,9 @@
     <copy file="${gtk}/bin/gspawn-win32-helper.exe" todir="${dist}"/>
     <copy file="${gtk}/bin/gspawn-win32-helper-console.exe" todir="${dist}"/>
 
+    <!-- Java -->
+    <!--<copy todir="${dist}/share"> <fileset dir="${build}/java"/> </copy>-->
+
     <!-- PERL -->
     <copy file="${gtk}/perl/bin/perl58.dll" todir="${dist}"/>
 
diff --git a/buildtool.cpp b/buildtool.cpp
index 5d0eb429c..c1028c526 100644
--- a/buildtool.cpp
+++ b/buildtool.cpp
@@ -4,7 +4,7 @@
  * Authors:
  *   Bob Jamison
  *
- * Copyright (C) 2006-2007 Bob Jamison
+ * Copyright (C) 2006-2008 Bob Jamison
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -38,7 +38,7 @@
  *
  */
 
-#define BUILDTOOL_VERSION  "BuildTool v0.7.4, 2007 Bob Jamison"
+#define BUILDTOOL_VERSION  "BuildTool v0.7.5, 2007 Bob Jamison"
 
 #include <stdio.h>
 #include <fcntl.h>
@@ -6696,6 +6696,12 @@ public:
         cmd.append(" -sourcepath ");
         cmd.append(srcdir);
         cmd.append(" ");
+        if (target.size()>0)
+            {
+            cmd.append(" -target ");
+            cmd.append(target);
+            cmd.append(" ");
+			}
         for (unsigned int i=0 ; i<fileList.size() ; i++)
             {
             String fname = fileList[i];
@@ -6749,6 +6755,8 @@ public:
             error("<javac> required both srcdir and destdir attributes to be set");
             return false;
             }
+        if (!parent.getAttribute(elem, "target", target))
+            return false;
         return true;
         }
 
@@ -6757,6 +6765,7 @@ private:
     String command;
     String srcdir;
     String destdir;
+    String target;
 
 };