X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=432fcdd38241ab6b491369caa00af437105fe98f;hb=9d4225c904513bee8ac0f2c850b021b9aff16464;hp=76e3f783c4ba14d3d7296ccaa43e81d1a1d6cfc6;hpb=6e358295904dc1d27ca651950be9fb74611983d5;p=inkscape.git

diff --git a/build.xml b/build.xml
index 76e3f783c..432fcdd38 100644
--- a/build.xml
+++ b/build.xml
@@ -87,6 +87,7 @@
     <mkdir dir="${build}"/>
     <mkdir dir="${build}/java"/>
     <mkdir dir="${build}/java/classes"/>
+    <mkdir dir="${build}/java/lib"/>
 
     <mkdir dir="${build}"/>
     <mkdir dir="${dist}"/>
@@ -203,7 +204,6 @@
             <!-- THINGS TO EXCLUDE -->
             <exclude name="2geom/chebyshev.cpp"/>
             <exclude name="ast/.*"/>
-            <exclude name="bind/.*"/><!-- comment this for binding-->
             <exclude name="bonobo/.*"/>
             <exclude name="deptool.cpp"/>
             <exclude name="test-all.cpp"/>
@@ -271,6 +271,9 @@
             <exclude name="removeoverlap/remove_rectangle_overlap-test.cpp"/>
             <exclude name="removeoverlap/remove_rectangle_overlap-test.h"/>
         </fileset>
+        <excludeinc dir="${src}">
+            <file name="extension/param"/>
+        </excludeinc>
         <flags>
             -Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
             -O2
@@ -317,23 +320,12 @@
             <!-- PYTHON -->
             -I${gtk}/python/include
             <!-- JAVA -->
-            <!-- -I${env.JAVA_HOME}/include -I${env.JAVA_HOME}/include/win32 -->
+            -I${src}/bind/javainc -I${src}/bind/javainc/win32
         </includes>
     </cc>
   </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
@@ -529,7 +521,7 @@
     <copy file="${gtk}/bin/libgtk-win32-2.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libgthread-2.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libcairo-2.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libpoppler-2.dll" todir="${dist}"/>
+    <copy file="${gtk}/bin/libpoppler-3.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libpangocairo-1.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libpango-1.0-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libpangoft2-1.0-0.dll" todir="${dist}"/>
@@ -590,6 +582,7 @@
     <!-- PYTHON -->
     <copy file="${gtk}/python/python25.dll" todir="${dist}"/>
     <copy file="${gtk}/python/python.exe" todir="${dist}/python"/>
+    <copy file="${gtk}/python/pythonw.exe" todir="${dist}/python"/>
     <copy todir="${dist}/python"> <fileset dir="${gtk}/python/Lib"/> </copy>
     <copy todir="${dist}/python"> <fileset dir="${gtk}/python/DLLs"/> </copy>
     <copy todir="${dist}/python"> <fileset dir="${gtk}/python/Scripts"/> </copy>
@@ -644,6 +637,51 @@
   </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    :    JAR
+  ########################################################################
+  -->
+  <target name="jar" depends="javac"
+      description="pack java classes and resources into a jar file">
+    <copy todir="${build}/java/classes"> <fileset dir="${gtk}/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/bind"> <fileset dir="${gtk}/bind/java"/> </copy>
+    <copy todir="${dist}/share/bind/java"> <fileset dir="${build}/java/lib"/> </copy>
+
+  </target>
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    BINDCLEAN
+  ########################################################################
+  -->
+  <target name="bindclean" depends=""
+      description="clean up java binding classes">
+        <delete dir="${build}/java"/>
+  </target>
+
+
 
 
   <!--
@@ -661,12 +699,13 @@
 
 
 
+
   <!--
   ########################################################################
   ## T A R G E T    :    C L E A N
   ########################################################################
   -->
-  <target name="clean"
+  <target name="clean" depends="bindclean"
         description="clean up.  deleting build and distro dirs" >
 
     <delete dir="${build}"/>