From ceb9b97a62780ab7aef6ec4c03f20d776368a112 Mon Sep 17 00:00:00 2001
From: ishmal <ishmal@users.sourceforge.net>
Date: Mon, 31 Mar 2008 18:14:58 +0000
Subject: [PATCH] Add simple <jar> task.  Separate "builddist" target

---
 build.xml     | 68 ++++++++++++++++++++++++++++++++++-----------------
 buildtool.cpp | 40 ++++++++++++++++++++++++++++--
 2 files changed, 83 insertions(+), 25 deletions(-)

diff --git a/build.xml b/build.xml
index 25a1a2c96..82b9e719d 100644
--- a/build.xml
+++ b/build.xml
@@ -323,17 +323,6 @@
   </target>
   
 
-  <!--
-  ########################################################################
-  ## T A R G E T    :    JAVA
-  ########################################################################
-  -->
-  <target name="java" depends="init"
-      description="compile java binding classes">
-    <javac srcdir="${src}/bind/java" destdir="${build}/java/classes"/>
-  </target>
-
-
   <!--
   ########################################################################
   ## T A R G E T    :    L I B
@@ -584,9 +573,6 @@
     <copy file="${gtk}/bin/gspawn-win32-helper.exe" todir="${dist}"/>
     <copy file="${gtk}/bin/gspawn-win32-helper-console.exe" todir="${dist}"/>
 
-    <!-- Java - copying this dir is ok even if you dont use it -->
-    <copy todir="${dist}/share"> <fileset dir="${build}/java"/> </copy>
-
     <!-- PERL -->
     <copy file="${gtk}/perl/bin/perl58.dll" todir="${dist}"/>
 
@@ -648,39 +634,75 @@
   </target>
 
 
+  <!--
+  ########################################################################
+  ## T A R G E T    :    JAVAC
+  ########################################################################
+  -->
+  <target name="javac" depends="init"
+      description="compile java binding classes">
+    <javac srcdir="${src}/bind/java" destdir="${build}/java/classes"/>
+  </target>
 
 
   <!--
   ########################################################################
-  ## T A R G E T    :    D I S T - A L L
+  ## T A R G E T    :    JAR
   ########################################################################
   -->
-  <target name="dist-all" depends="dist"
-        description="generate the distribution, along with inkview" >
-
-    <copy file="${build}/inkview.exe" todir="${dist}"/>
-    <copy file="${build}/inkview.dbg" todir="${dist}"/>
+  <target name="jar" depends="javac"
+      description="pack java classes and resources into a jar file">
+    <copy todir="${build}/java/classes"> <fileset dir="${src}/bind/data"/> </copy>
+    <jar basedir="${build}/java/classes" destfile="${build}/java/lib/inkscape.jar"/>
   </target>
 
+  <!--
+  ########################################################################
+  ## T A R G E T    :    BINDDIST
+  ########################################################################
+  -->
+  <target name="binddist" depends="jar"
+      description="pack java classes and resources into a jar file">
+    <copy todir="${dist}/share"> <fileset dir="share/bind"/> </copy>
+    <copy todir="${dist}/share/bind/java"> <fileset dir="${build}/java/lib"/> </copy>
+
+  </target>
 
   <!--
   ########################################################################
-  ## T A R G E T    :    JAVACLEAN
+  ## T A R G E T    :    BINDCLEAN
   ########################################################################
   -->
-  <target name="javaclean" depends=""
+  <target name="bindclean" depends=""
       description="clean up java binding classes">
         <delete dir="${build}/java"/>
   </target>
 
 
 
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    D I S T - A L L
+  ########################################################################
+  -->
+  <target name="dist-all" depends="dist"
+        description="generate the distribution, along with inkview" >
+
+    <copy file="${build}/inkview.exe" todir="${dist}"/>
+    <copy file="${build}/inkview.dbg" todir="${dist}"/>
+  </target>
+
+
+
+
+
   <!--
   ########################################################################
   ## T A R G E T    :    C L E A N
   ########################################################################
   -->
-  <target name="clean" depends="javaclean"
+  <target name="clean" depends="bindclean"
         description="clean up.  deleting build and distro dirs" >
 
     <delete dir="${build}"/>
diff --git a/buildtool.cpp b/buildtool.cpp
index 24de41077..f912ebdea 100644
--- a/buildtool.cpp
+++ b/buildtool.cpp
@@ -38,7 +38,7 @@
  *
  */
 
-#define BUILDTOOL_VERSION  "BuildTool v0.7.6, 2007-2008 Bob Jamison"
+#define BUILDTOOL_VERSION  "BuildTool v0.7.7, 2007-2008 Bob Jamison"
 
 #include <stdio.h>
 #include <fcntl.h>
@@ -6650,20 +6650,56 @@ class TaskJar : public Task
 public:
 
     TaskJar(MakeBase &par) : Task(par)
-        { type = TASK_JAR; name = "jar"; }
+        { type = TASK_JAR; name = "jar"; command = "jar";}
 
     virtual ~TaskJar()
         {}
 
     virtual bool execute()
         {
+        String cmd = command;
+        cmd.append(" -cf ");
+        cmd.append(destfile);
+        cmd.append(" -C ");
+        cmd.append(basedir);
+        cmd.append(" .");
+
+        String execCmd = cmd;
+
+        String outString, errString;
+        bool ret = executeCommand(execCmd.c_str(), "", outString, errString);
+        if (!ret)
+            {
+            error("<jar> command '%s' failed :\n %s",
+                                      execCmd.c_str(), errString.c_str());
+            return false;
+            }
         return true;
         }
 
     virtual bool parse(Element *elem)
         {
+        String s;
+        if (!parent.getAttribute(elem, "command", s))
+            return false;
+        if (s.size() > 0)
+            command = s;
+        if (!parent.getAttribute(elem, "basedir", basedir))
+            return false;
+        if (!parent.getAttribute(elem, "destfile", destfile))
+            return false;
+        if (basedir.size() == 0 || destfile.size() == 0)
+            {
+            error("<jar> required both basedir and destfile attributes to be set");
+            return false;
+            }
         return true;
         }
+
+private:
+    String command;
+    String basedir;
+    String destfile;
 };
 
 
-- 
2.30.2