c++ part of binding can be compiled now without needing a jdk installed. Uses a...

[inkscape.git] / build.xml

diff --git a/build.xml b/build.xml
index c13f7a4b16131fbc41c4390dd4eeeef4eff8baf8..38f51f16044c01c90c0dcec480514c7e35589854 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -41,7 +41,8 @@
     </description>
 
   <!-- set global properties for this build -->
-  <property name="version"     value="0.45+devel"/>
+  <property environment="env"/>
+  <property name="version"     value="0.46+devel"/>
   <property name="src"         location="src"/>
   <property name="lib"         location="lib"/>
   <property name="build"       location="build"/>
@@ -83,6 +84,10 @@
                 query="both" property="gtkmm" prefix="${gtk}"/>
     -->
 
+    <mkdir dir="${build}"/>
+    <mkdir dir="${build}/java"/>
+    <mkdir dir="${build}/java/classes"/>
+
     <mkdir dir="${build}"/>
     <mkdir dir="${dist}"/>
     <copy file="${src}/helper/sp-marshal.h.mingw"
@@ -90,7 +95,7 @@
     <copy file="${src}/helper/sp-marshal.cpp.mingw"
           tofile="${src}/helper/sp-marshal.cpp"/>
     <makefile file="inkscape_version.h">
-        #define INKSCAPE_VERSION "${version}+devel"
+        #define INKSCAPE_VERSION "${version}"
     </makefile>
     <makefile file="config.h">
         #ifndef _CONFIG_H_
@@ -307,19 +312,33 @@
             -I${gtk}/include/libwpg-0.1
             -I${gtk}/include/libwpd-0.8
             <!-- PERL -->
-            -Wno-comment -I${gtk}/perl/lib/CORE
+            <!-- -Wno-comment -I${gtk}/perl/lib/CORE -->
             <!-- PYTHON -->
             -I${gtk}/python/include
+            <!-- JAVA -->
+            -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
   ########################################################################
   -->
+  <!-- set depends to "compile,java" if you want to test that -->
   <target name="lib" depends="compile"
       description="create a static library">
     <staticlib command="${archutil}ar crsv"
@@ -480,7 +499,7 @@
   ## T A R G E T    :    D I S T
   ########################################################################
   -->
-  <target name="dist" depends="link,linkinkview,i18n"
+  <target name="dist" depends="link,i18n"
       description="generate the distribution directory with all needed files">
 
     <!-- Create the distribution directory -->
@@ -631,7 +650,7 @@
   ## T A R G E T    :    D I S T - A L L
   ########################################################################
   -->
-  <target name="dist-all" depends="dist,linkinkview"
+  <target name="dist-all" depends="dist"
         description="generate the distribution, along with inkview" >
 
     <copy file="${build}/inkview.exe" todir="${dist}"/>