X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=25a1a2c9670f04a4efd5613da3b42359acdf237c;hb=91cdc6c06e37ed5336e3e5f81dc8a6f39c07b500;hp=3b8b7a6a825e979f0b4eadad9fdcd38e4c54747d;hpb=04640b554cdb5c31110decfb241cb12fe8747272;p=inkscape.git

diff --git a/build.xml b/build.xml
index 3b8b7a6a8..25a1a2c96 100644
--- 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_
@@ -156,7 +162,7 @@
         
         /* use poppler for pdf import? */
         #define HAVE_POPPLER                  1
-        //#define HAVE_POPPLER_CAIRO            1
+        #define HAVE_POPPLER_CAIRO            1
 
         /* do we want bitmap manipulation? */
         #define WITH_IMAGE_MAGICK             1
@@ -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"/>
@@ -210,7 +215,6 @@
             <exclude name="extension/api.cpp"/>
             <exclude name="extension/dxf2svg/.*"/>
             <exclude name="extension/implementation/plugin.cpp"/>
-            <exclude name="extension/internal/gnome.cpp"/>
             <exclude name="extension/script/bindtest.cpp"/>
             <exclude name="extension/script/cpptest.cpp"/>
             <exclude name="extension/plugin/.*"/>
@@ -269,7 +273,7 @@
         </fileset>
         <flags>
             -Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
-            -O3
+            -O2
             -mms-bitfields
         </flags>
         <defines>
@@ -309,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"
@@ -373,8 +391,7 @@
     <link command="${arch}g++" out="${build}/inkscape.exe"
               strip="true" symfile="${build}/inkscape.dbg"
               stripcommand="${archutil}strip"
-              objcopycommand="${archutil}objcopy"
-              >
+              objcopycommand="${archutil}objcopy">
        <flags>
            -mwindows
        </flags>
@@ -386,7 +403,8 @@
        </fileset>
        <libs>
            -L${gtk}/lib
-           -lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4
+           -lpoppler-cairo -lpoppler-glib -lpoppler.dll 
+           -lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4 
            -latkmm-1.6 -lpangomm-1.4 -lsigc-2.0
            -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0
            -lgdk_pixbuf-2.0
@@ -398,9 +416,9 @@
            -L${gtk}/python/libs -lpython25
            ${gtk}/bin/libxml2.dll
            ${gtk}/bin/libxslt.dll
-           -lpoppler-cairo -lpoppler
            -lcairo.dll
-           -lwpg-0.1.dll -lwpg-stream-0.1.dll
+           -lcairomm-1.0.dll
+		   -lwpg-0.1.dll -lwpg-stream-0.1.dll
            -lwpd-0.8.dll -lwpd-stream-0.8.dll
            ${gtk}/lib/iconv.lib
            -lMagick++ -lWand -lMagick
@@ -438,8 +456,7 @@
     <link command="${arch}g++" out="${build}/inkview.exe"
               strip="true" symfile="${build}/inkview.dbg"
               stripcommand="${archutil}strip"
-              objcopycommand="${archutil}objcopy"
-              >
+              objcopycommand="${archutil}objcopy">
        <flags>
        </flags>
        <fileset dir="${build}">
@@ -449,24 +466,29 @@
        </fileset>
        <libs>
            -L${gtk}/lib
+           -lpoppler-cairo -lpoppler-glib -lpoppler.dll 
            -lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4
            -latkmm-1.6 -lpangomm-1.4 -lsigc-2.0
            -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0
            -lgdk_pixbuf-2.0
            -lpangocairo-1.0 -lpangoft2-1.0 -lpangowin32-1.0 -lpango-1.0
-           -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lcairo
+           -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lcairo -lcairomm-1.0
            <!-- PERL -->
            -L${gtk}/perl/lib/CORE -lperl58
            <!-- PYTHON -->
-           -L${gtk}/python/libs -lpython24
+           -L${gtk}/python/libs -lpython25
            ${gtk}/bin/libxml2.dll
            ${gtk}/bin/libxslt.dll
            ${gtk}/lib/iconv.lib
+		   -lcairo.dll -lcairomm-1.0.dll
+           -lwpg-0.1.dll -lwpg-stream-0.1.dll
+           -lMagick++ -lWand -lMagick
            -lfreetype.dll -lfontconfig.dll
            -llcms.dll
            -lssl -lcrypto
-           -lpng -lpopt ${gtk}/lib/zdll.lib
-           -lgc -mwindows -lws2_32 -lintl -lm
+           -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
+           -lgc -mwindows
+		   -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
        </libs>
     </link>
   </target>
@@ -483,7 +505,7 @@
 
     <!-- Create the distribution directory -->
     <copy file="${build}/inkscape.exe" todir="${dist}"/>
-    <copy file="${build}/inkscape.dbg" todir="${dist}"/>
+	<copy file="${build}/inkscape.dbg" todir="${dist}"/>
     <copy file="AUTHORS" todir="${dist}"/>
     <copy file="COPYING" todir="${dist}"/>
     <copy file="COPYING.LIB" todir="${dist}"/>
@@ -562,19 +584,23 @@
     <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>
 
     <!--<copy file="${gtk}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>-->
     <makefile file="${dist}/etc/gtk-2.0/gtkrc">
-    gtk-icon-sizes = "gtk-menu=13,13:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32:inkscape-decoration=16,16"
+    gtk-icon-sizes = "gtk-menu=16,16:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32:inkscape-decoration=16,16"
     gtk-toolbar-icon-size = small-toolbar
 
     # disable images in buttons. i've only seen ugly delphi apps use this feature.
@@ -629,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}"/>
@@ -637,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>
+
 
 
   <!--
@@ -644,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}"/>