X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=38b86e26458cc567a57a0189f33a84632cc6038a;hb=b03899b976eaea0d850429cae78aca08f64245c6;hp=72090f3902f249de15e8f7a3edd6d9e71970f635;hpb=a1ce6c986c3fae204a0d94dc6c5ba0ecfc21d7f7;p=inkscape.git

diff --git a/build.xml b/build.xml
index 72090f390..38b86e264 100644
--- a/build.xml
+++ b/build.xml
@@ -41,17 +41,26 @@
     </description>
 
   <!-- set global properties for this build -->
-  <property name="version"     value="0.46dev"/>
-  <property name="arch"        value="i686-pc-mingw32-"/>
-  <!--<property name="archutil"    value="${arch}"/>-->
-  <property name="archutil"    value=""/>
+  <property environment="env"/>
+  <property name="version"     value="0.46+devel"/>
   <property name="src"         location="src"/>
-  <property name="gtk"         location="c:/gtk210"/>
   <property name="lib"         location="lib"/>
   <property name="build"       location="build"/>
   <property name="dist"        location="inkscape"/>
 
+  <!-- Use these settings for the native compiler -->  
+  <!-- -->
+  <property name="arch"        value="mingw32-"/>
+  <property name="archutil"    value=""/>
+  <property name="gtk"         location="c:/devlibs"/>
+  <!-- -->
 
+  <!-- Use these settings for the cross compiler -->  
+  <!--
+  <property name="arch"        value="i686-pc-mingw32-"/>
+  <property name="archutil"    value="${arch}"/>
+  <property name="gtk"         location="/target"/>
+  -->
 
 
 
@@ -62,7 +71,7 @@
   -->
   <target name="init"
       description=
-      "Do all prepatory tasks, like make directories and copy files">
+      "Do all preparatory tasks, like make directories and copy files">
 
 
     <!-- example of the <pkg-config> task
@@ -75,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"
@@ -82,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_
@@ -121,6 +134,7 @@
         #define HAVE_MALLOC_H                 1
         #define HAVE_STDLIB_H                 1
         #define HAVE_SYS_STAT_H               1
+        #define HAVE_INTTYPES_H               1
 
         #define ENABLE_LCMS                   1
 
@@ -144,6 +158,16 @@
         /* shared whiteboard */
         #define WITH_INKBOARD                 1
         #define HAVE_SSL                      1
+        
+        /* use poppler for pdf import? */
+        #define HAVE_POPPLER                  1
+        #define HAVE_POPPLER_CAIRO            1
+
+        /* do we want bitmap manipulation? */
+        #define WITH_IMAGE_MAGICK             1
+
+        /* Allow reading WordPerfect? */
+        #define WITH_LIBWPG                   1
 
         #endif /* _CONFIG_H_ */
     </makefile>
@@ -177,11 +201,11 @@
              destdir="${build}/obj">
         <fileset dir="${src}">
             <!-- THINGS TO EXCLUDE -->
+            <exclude name="2geom/chebyshev.cpp"/>
             <exclude name="ast/.*"/>
             <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"/>
@@ -189,7 +213,7 @@
             <exclude name="dom/odf/SvgOdg.cpp"/>
             <exclude name="extension/api.cpp"/>
             <exclude name="extension/dxf2svg/.*"/>
-            <exclude name="extension/internal/gnome.cpp"/>
+            <exclude name="extension/implementation/plugin.cpp"/>
             <exclude name="extension/script/bindtest.cpp"/>
             <exclude name="extension/script/cpptest.cpp"/>
             <exclude name="extension/plugin/.*"/>
@@ -239,7 +263,7 @@
             <exclude name="dialogs/whiteboard-sharewithuser-dialog.cpp"/>
             <exclude name="jabber_whiteboard/node-tracker.cpp"/>
             <exclude name="jabber_whiteboard/node-utilities.cpp"/>
-            <!--WHITEBOARD-->
+            <!--OVERLAP-->
             <exclude name="removeoverlap/placement_SolveVPSC.cpp"/>
             <exclude name="removeoverlap/placement_SolveVPSC.h"/>
             <exclude name="removeoverlap/test.cpp"/>
@@ -247,7 +271,8 @@
             <exclude name="removeoverlap/remove_rectangle_overlap-test.h"/>
         </fileset>
         <flags>
-            -Wall -O3
+            -Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
+            -O2
             -mms-bitfields
         </flags>
         <defines>
@@ -255,6 +280,7 @@
             -DHAVE_CONFIG_H
             -DXP_WIN <!-- for JS -->
             -D_INTL_REDIRECT_INLINE
+            -DHAVE_SSL
             -DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }" <!-- inkboard -->
         </defines>
         <includes>
@@ -281,20 +307,38 @@
             -I${gtk}/include/libxml2 
             -I${gtk}/include/freetype2
             -I${gtk}/include/cairo
+            -I${gtk}/include/poppler
+            -I${gtk}/include/gc
+            -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"
@@ -346,9 +390,9 @@
     <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>
        <fileset dir="${build}">
            <include name="inkres.o"/>
@@ -358,23 +402,33 @@
        </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
            -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
            <!-- PERL -->
            -L${gtk}/perl/lib/CORE -lperl58
            <!-- PYTHON -->
            -L${gtk}/python/libs -lpython25
            ${gtk}/bin/libxml2.dll
+           ${gtk}/bin/libxslt.dll
+           -lcairo.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
            -lfreetype.dll -lfontconfig.dll
-           -llcms.dll
            -lssl -lcrypto
-           -lpng -lpopt ${gtk}/lib/zdll.lib
-           -lgc -mwindows -lws2_32 -lintl -lm
+           -llcms.dll
+           -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
+           -lgc
+		   -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+           <!-- 2geom -->
+           <!-- -l2geom -->
        </libs>
     </link>
   </target>
@@ -401,8 +455,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}">
@@ -412,23 +465,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>
@@ -445,7 +504,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}"/>
@@ -469,6 +528,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/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}"/>
@@ -476,8 +536,13 @@
     <copy file="${gtk}/bin/freetype6.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libfontconfig-1.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libxml2.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/xmlparse.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/xmlparse.dll" tofile="${dist}/libexpat.dll"/>
+    <copy file="${gtk}/bin/libxslt.dll" todir="${dist}"/>
+    <copy file="${gtk}/bin/libexpat.dll" todir="${dist}"/>
+    <!--<copy file="${gtk}/bin/libexpat.dll" tofile="${dist}/xmlparse.dll"/>-->
+    <copy file="${gtk}/bin/libwpg-0.1.dll" todir="${dist}"/>
+    <copy file="${gtk}/bin/libwpg-stream-0.1.dll" todir="${dist}"/>
+    <copy file="${gtk}/bin/libwpd-0.8.dll" todir="${dist}"/>
+    <copy file="${gtk}/bin/libwpd-stream-0.8.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/jpeg62.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libpng13.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/libtiff3.dll" todir="${dist}"/>
@@ -485,7 +550,7 @@
     <copy file="${gtk}/bin/msvcr71.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/zlib1.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/iconv.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/popt1.dll" todir="${dist}"/>
+    <copy file="${gtk}/bin/libpopt-0.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/liblcms-1.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/intl.dll" todir="${dist}"/>
     <copy file="${gtk}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>
@@ -499,7 +564,6 @@
 
     <!-- GTK -->
     <copy todir="${dist}"> <fileset dir="${gtk}/etc"/> </copy>
-    <copy file="${gtk}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>
     <copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/gtk-2.0"/> </copy>
     <copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/glib-2.0"/> </copy>
     <copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/locale"/> </copy>
@@ -515,6 +579,13 @@
     <mkdir dir="${dist}/plugins"/>
     <copy file="${gtk}/bin/gdb.exe" todir="${dist}"/>
 
+    <!-- Necessary to run extensions on windows if it is not in the path -->
+    <copy file="${gtk}/bin/gspawn-win32-helper.exe" todir="${dist}"/>
+    <copy file="${gtk}/bin/gspawn-win32-helper-console.exe" todir="${dist}"/>
+
+    <!-- Java -->
+    <!--<copy todir="${dist}/share"> <fileset dir="${build}/java"/> </copy>-->
+
     <!-- PERL -->
     <copy file="${gtk}/perl/bin/perl58.dll" todir="${dist}"/>
 
@@ -525,6 +596,53 @@
     <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=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.
+    gtk-button-images = 0
+
+    # enable/disable images in menus. most "stock" microsoft apps don't use these, except sparingly.
+    # the office apps use them heavily, though.
+    gtk-menu-images = 1
+
+    # use the win32 button ordering instead of the GNOME HIG one, where applicable
+    gtk-alternative-button-order = 1
+
+    style "msw-default"
+    {
+      GtkWidget::interior-focus = 1
+      GtkOptionMenu::indicator-size = { 9, 5 }
+      GtkOptionMenu::indicator-spacing = { 7, 5, 2, 2 }
+      GtkSpinButton::shadow-type = in
+
+      # Owen and I disagree that these should be themable
+      #GtkUIManager::add-tearoffs = 0
+      #GtkComboBox::add-tearoffs = 0
+
+      GtkComboBox::appears-as-list = 1
+      GtkComboBox::focus-on-click = 0
+
+      GOComboBox::add_tearoffs = 0
+
+      GtkTreeView::allow-rules = 0
+      GtkTreeView::expander-size = 12
+
+      GtkExpander::expander-size = 12
+
+      GtkScrolledWindow::scrollbar_spacing = 1
+
+      GtkSeparatorMenuItem::horizontal-padding = 2
+
+      engine "wimp"
+      {
+      }
+    }
+    class "*" style "msw-default"
+    </makefile>
+
   </target>
 
 
@@ -535,7 +653,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}"/>