svn propset svn:eol-style native *.inx

[inkscape.git] / build.xml

diff --git a/build.xml b/build.xml
index 4c0ba1969c240d2e353fb9026bc5361b35af2de2..25a1a2c9670f04a4efd5613da3b42359acdf237c 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -41,7 +41,8 @@
     </description>
 
   <!-- set global properties for this build -->
-  <property name="version"     value="0.46dev"/>
+  <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,11 @@
                 query="both" property="gtkmm" prefix="${gtk}"/>
     -->
 
+    <mkdir dir="${build}"/>
+    <mkdir dir="${build}/java"/>
+    <mkdir dir="${build}/java/classes"/>
+    <mkdir dir="${build}/java/lib"/>
+
     <mkdir dir="${build}"/>
     <mkdir dir="${dist}"/>
     <copy file="${src}/helper/sp-marshal.h.mingw"
@@ -90,7 +96,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_
@@ -201,7 +207,6 @@
             <exclude name="bonobo/.*"/>
             <exclude name="deptool.cpp"/>
             <exclude name="test-all.cpp"/>
-            <exclude name="dialogs/filedialog-win32.cpp"/>
             <exclude name="display/testnr.cpp"/>
             <exclude name="display/bezier-utils-test.cpp"/>
             <exclude name="dom/jsdombind.cpp"/>
@@ -308,19 +313,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"
@@ -565,12 +584,16 @@
     <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}"/>
 
     <!-- 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>
@@ -632,7 +655,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}"/>
@@ -640,6 +663,16 @@
   </target>
 
 
+  <!--
+  ########################################################################
+  ## T A R G E T    :    JAVACLEAN
+  ########################################################################
+  -->
+  <target name="javaclean" depends=""
+      description="clean up java binding classes">
+        <delete dir="${build}/java"/>
+  </target>
+
 
 
   <!--
@@ -647,7 +680,7 @@
   ## T A R G E T    :    C L E A N
   ########################################################################
   -->
-  <target name="clean"
+  <target name="clean" depends="javaclean"
         description="clean up.  deleting build and distro dirs" >
 
     <delete dir="${build}"/>