X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=99e221e64662e95b705b4300d8c5fe57c50dcb02;hb=fce046713c4cb905f38bf489cc4a73af425f3037;hp=224892d1ada665ebc6029c40a60b35fc629f15ea;hpb=5ec48800c13563ae3689d679bb063ea5445fb4af;p=inkscape.git

diff --git a/build.xml b/build.xml
index 224892d1a..99e221e64 100644
--- a/build.xml
+++ b/build.xml
@@ -31,18 +31,18 @@
 ## P R O J E C T   :   I N K S C A P E
 ########################################################################
 -->
-<project name="Inkscape" default="dist-inkscape" basedir=".">
+<project name="Inkscape" default="dist-all" basedir=".">
     <description>
         Build file for the Inkscape SVG editor.  This file
         was written for GTK-2.10 on Win32, but it should work
         well for other types of builds with only minor adjustments.
-        Note that the default target is 'dist'.  You can execute other
+        Note that the default target is 'dist-all'.  You can execute other
         targets instead, by "btool {target}",  like  "btool compile", if
-        you want to save time.
+        you want to save time, or "dist-inkscape" if you don't want inkview.
     </description>
 
   <!-- set global properties for this build -->
-  <property name="version"       value="0.46+devel"/>
+  <property name="version"       value="0.47+devel"/>
   <property name="src"           location="src"/>
   <property name="lib"           location="lib"/>
   <property name="build"         location="build"/>
@@ -52,8 +52,10 @@
   <!-- -->
   <property name="arch"          value="mingw32-"/>
   <property name="archutil"      value=""/>
-  <property name="devlibs"       location="c:/devlibs"/>
+  <property name="devlibs"       location="${env.DEVLIBS_PATH}"/>
+  <property name="mingw_bin"     location="${env.MINGW_BIN}"/>
   <property name="cxxtest"       location="cxxtest"/>
+  <property name="python"        location="${devlibs}/python/python.exe"/>
   <!-- -->
 
   <!-- Use these settings for the cross compiler -->  
@@ -61,6 +63,9 @@
   <property name="arch"          value="i686-pc-mingw32-"/>
   <property name="archutil"      value="${arch}"/>
   <property name="devlibs"       location="/target"/>
+  <property name="mingw_bin"     location="${env.MINGW_BIN}"/>
+  <property name="cxxtest"       location="cxxtest"/>
+  <property name="python"        location="python"/>
   -->
 
   <!-- Extra properties -->  
@@ -89,15 +94,22 @@
     <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"
           tofile="${src}/helper/sp-marshal.h"/>
     <copy file="${src}/helper/sp-marshal.cpp.mingw"
           tofile="${src}/helper/sp-marshal.cpp"/>
-    <makefile file="inkscape_version.h">
-        #define INKSCAPE_VERSION "${version}"
+          
+    <!--makefile file="${src}/inkscape-version.cpp">
+        namespace Inkscape {
+            char const *version_string = "${version} ${svn.revision}";
+        }
+    </makefile-->
+    <makefile file="${src}/inkscape-version.cpp">
+        namespace Inkscape {
+            char const *version_string = "${version}";
+        }
     </makefile>
     <makefile file="config.h">
         #ifndef _CONFIG_H_
@@ -137,6 +149,7 @@
         #define HAVE_STDLIB_H                 1
         #define HAVE_SYS_STAT_H               1
         #define HAVE_INTTYPES_H               1
+        #define HAVE_OPENMP                   1
 
         #define ENABLE_LCMS                   1
 
@@ -158,8 +171,8 @@
         #define WITH_PYTHON                   1
 
         /* shared whiteboard */
-        #define WITH_INKBOARD                 1
-        #define HAVE_SSL                      1
+        #undef WITH_INKBOARD
+        #undef HAVE_SSL
         
         /* use poppler for pdf import? */
         #define HAVE_POPPLER                  1
@@ -171,25 +184,18 @@
         /* Allow reading WordPerfect? */
         #define WITH_LIBWPG                   1
 
-        #endif /* _CONFIG_H_ */
-    </makefile>
-  </target>
+        /* Do we support SVG Fonts? */
+        #define ENABLE_SVG_FONTS              1
 
+        /* Do we want experimental, unsupported, unguaranteed, etc., LivePathEffects enabled? */
+        #define LPE_ENABLE_TEST_EFFECTS    1
 
+        #define HAVE_ASPELL                   1
 
-  <!--
-  ########################################################################
-  ## T A R G E T    :    T O U C H A B O U T
-  ########################################################################
-  -->
-  <target name="touchabout"
-      description="update the modification time of aboutdialog.cpp">
-    <!-- not good <touch file="${src}/ui/dialog/aboutdialog.cpp"/> -->
-    <!-- better -->
-    <delete file="${build}/obj/ui/dialog/aboutdialog.o"/>
+        #endif /* _CONFIG_H_ */
+    </makefile>
   </target>
 
-
   <!--
   ########################################################################
   ## T A R G E T    :    C X X T E S T
@@ -199,14 +205,16 @@
         description="generate test files" >
 
     <!-- Generate CxxTest files -->
-    <cxxtestpart command="python ${cxxtest}/cxxtestgen.py"
+    <cxxtestpart command="${python} ${cxxtest}/cxxtestgen.py --have-eh"
                  out="${src}/test-src.cpp">
         <fileset dir="${src}">
             <include name="attributes-test.h"/>
             <include name="color-profile-test.h"/>
             <include name="dir-util-test.h"/>
             <include name="extract-uri-test.h"/>
+            <include name="marker-test.h"/>
             <include name="mod360-test.h"/>
+            <include name="preferences-test.h"/>
             <include name="round-test.h"/>
             <include name="sp-gradient-test.h"/>
             <include name="sp-style-elem-test.h"/>
@@ -215,19 +223,19 @@
             <include name="verbs-test.h"/>
         </fileset>
     </cxxtestpart>
-    <cxxtestpart command="python ${cxxtest}/cxxtestgen.py" 
+    <cxxtestpart command="${python} ${cxxtest}/cxxtestgen.py --have-eh"
                  out="${src}/display/test-display.cpp">
         <fileset dir="${src}/display">
-            <include name="bezier-utils-test.h"/>
+            <include name="curve-test.h"/>
         </fileset>
     </cxxtestpart>
-    <cxxtestpart command="python ${cxxtest}/cxxtestgen.py" 
+    <cxxtestpart command="${python} ${cxxtest}/cxxtestgen.py --have-eh"
                  out="${src}/helper/test-helper.cpp">
         <fileset dir="${src}/helper">
             <include name="units-test.h"/>
         </fileset>
     </cxxtestpart>
-    <cxxtestpart command="python ${cxxtest}/cxxtestgen.py" 
+    <cxxtestpart command="${python} ${cxxtest}/cxxtestgen.py --have-eh"
                  out="${src}/libnr/test-nr.cpp">
         <fileset dir="${src}/libnr">
             <include name="nr-compose-test.h"/>
@@ -241,7 +249,7 @@
             <include name="nr-matrix-test.h"/>
         </fileset>
     </cxxtestpart>
-    <cxxtestpart command="python ${cxxtest}/cxxtestgen.py" 
+    <cxxtestpart command="${python} ${cxxtest}/cxxtestgen.py --have-eh"
                  out="${src}/svg/test-svg.cpp">
         <fileset dir="${src}/svg">
             <include name="css-ostringstream-test.h"/>
@@ -249,25 +257,25 @@
             <include name="svg-affine-test.h"/>
             <include name="svg-color-test.h"/>
             <include name="svg-length-test.h"/>
-            <include name="svg-path-test.h"/>
+            <include name="svg-path-geom-test.h"/>
         </fileset>
     </cxxtestpart>
-    <cxxtestpart command="python ${cxxtest}/cxxtestgen.py" 
+    <cxxtestpart command="${python} ${cxxtest}/cxxtestgen.py --have-eh"
                  out="${src}/util/test-util.cpp">
         <fileset dir="${src}/util">
             <include name="list-container-test.h"/>
         </fileset>
     </cxxtestpart>
-    <cxxtestpart command="python ${cxxtest}/cxxtestgen.py" 
+    <cxxtestpart command="${python} ${cxxtest}/cxxtestgen.py --have-eh"
                  out="${src}/xml/test-xml.cpp">
         <fileset dir="${src}/xml">
             <include name="repr-action-test.h"/>
             <include name="quote-test.h"/>
         </fileset>
     </cxxtestpart>
-    <cxxtestroot command="python ${cxxtest}/cxxtestgen.py" 
+    <cxxtestroot command="${python} ${cxxtest}/cxxtestgen.py" 
                  out="${src}/test-main.cpp"
-                 template="${src}/selfname.tpl">
+                 template="${src}/cxxtest-template.tpl">
         <fileset dir="${src}">
             <include name="MultiPrinter.h"/>
             <include name="PylogFormatter.h"/>
@@ -288,18 +296,19 @@
     <!-- Compile from source to build -->
     <cc cc="${arch}gcc" cxx="${arch}g++"
              destdir="${build}/obj"
-			 continueOnError="true"
-			 refreshCache="${refresh}">
+             continueOnError="true"
+             refreshCache="${refresh}">
         <fileset dir="${src}">
             <!-- THINGS TO EXCLUDE -->
             <exclude name="2geom/chebyshev.cpp"/>
             <exclude name="ast/.*"/>
             <exclude name="bonobo/.*"/>
             <exclude name="deptool.cpp"/>
+            <exclude name="cxxtests.cpp"/>
             <!--<exclude name="test-main.cpp"/>-->
             <!--<exclude name="test-src.cpp"/>-->
+            <exclude name="display/test-display.cpp"/>
             <exclude name="display/testnr.cpp"/>
-            <exclude name="display/bezier-utils-test.cpp"/>
             <exclude name="dom/work/.*"/>
             <exclude name="dom/odf/SvgOdg.cpp"/>
             <exclude name="extension/api.cpp"/>
@@ -331,14 +340,12 @@
             <exclude name="svg/ftos.cpp"/>
             <!--<exclude name="svg/test-svg.cpp"/>-->
             <exclude name="svg/test-svg-main.cpp"/>
-            <exclude name="svg/test-stubs.cpp"/>
-            <exclude name="utest/.*"/>
             <exclude name="util/list-container-test.cpp"/>
             <exclude name="widgets/test-widgets.cpp"/>
             <exclude name="xml/quote-test.cpp"/>
             <exclude name="xml/repr-action-test.cpp"/>
-            <!--<exclude name="xml/test-xml.cpp"/>-->
-            <exclude name="xml/test-xml-main.cpp"/>
+            <exclude name="xml/test-xml.cpp"/>
+            <!--<exclude name="xml/test-xml-main.cpp"/>-->
             <exclude name="io/streamtest.cpp"/>
             <!--JABBER-->
             <exclude name="pedro/pedrogui.cpp"/>
@@ -369,6 +376,7 @@
             -Wall -Wformat -Werror=format-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
             -O2
             -mms-bitfields
+            -fopenmp
         </flags>
         <defines>
             -DVERSION=\"${version}\"
@@ -469,7 +477,8 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
-           -mwindows
+           -mconsole
+           -mthreads
        </flags>
        <fileset dir="${build}">
            <include name="inkres.o"/>
@@ -477,6 +486,7 @@
            <include name="obj/winmain.o"/>
            <include name="libinkscape.a"/>
        </fileset>
+       <!-- WARNING: If you change these libraries, don't forget to change them for inkview and cxxtests below as well! -->
        <libs>
            -L${devlibs}/lib
            ${pcl.poppler-cairo} ${pcl.poppler-glib} ${pcl.poppler} 
@@ -494,6 +504,8 @@
            -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+           -lgomp -lpthreadGC2 -laspell
+           -lmscms  <!-- required for color profiles -->
        </libs>
     </link>
   </target>
@@ -522,7 +534,8 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
-           -mwindows
+           -mconsole
+           -mthreads
        </flags>
        <fileset dir="${build}">
            <include name="inkviewres.o"/>
@@ -546,6 +559,8 @@
            -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+           -lgomp -lpthreadGC2 -laspell
+           -lmscms  <!-- required for color profiles -->
        </libs>
     </link>
   </target>
@@ -565,6 +580,7 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
+           -mthreads
        </flags>
        <fileset dir="${build}">
            <include name="obj/test-main.o"/>
@@ -595,6 +611,8 @@
            -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+           -lgomp -lpthreadGC2 -laspell
+           -lmscms  <!-- required for color profiles -->
        </libs>
     </link>
   </target>
@@ -631,6 +649,7 @@
     <copy todir="${dist}" file="${devlibs}/bin/libgobject-2.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libgtk-win32-2.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libgthread-2.0-0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libgio-2.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libcairo-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpoppler-3.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpangocairo-1.0-0.dll"/>
@@ -659,7 +678,10 @@
     <copy todir="${dist}" file="${devlibs}/bin/libpopt-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/liblcms-1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/intl.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/pthreadGC2.dll"/>
     <copy file="${devlibs}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>
+    <!-- MINGW dll needed, I think for openmp support  -->
+    <copy todir="${dist}" file="${mingw_bin}/mingwm10.dll"/>
 
     <!-- MSGFMT files -->
     <copy todir="${dist}">
@@ -680,6 +702,8 @@
     <copy todir="${dist}">
         <fileset dir="share">
           <exclude name=".*\.am"/>
+          <exclude name=".*\.in"/>
+          <exclude name=".*\.sh"/>
         </fileset>
     </copy>
     <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/locale"/> </copy>
@@ -687,6 +711,9 @@
     <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/poppler"/> </copy>
     <copy todir="${dist}" file="${devlibs}/bin/gdb.exe"/>
 
+    <!-- Aspell dictionaries -->
+    <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/aspell-0.60"/> </copy>
+
     <!-- Necessary to run extensions on windows if it is not in the path -->
     <copy todir="${dist}" file="${devlibs}/bin/gspawn-win32-helper.exe"/>
     <copy todir="${dist}" file="${devlibs}/bin/gspawn-win32-helper-console.exe"/>
@@ -785,15 +812,12 @@
 
   <!--
   ########################################################################
-  ## T A R G E T    :    D I S T - C X X T E S T S
+  ## T A R G E T    :    C H E C K
   ########################################################################
   -->
-  <target name="dist-cxxtests" depends="linkcxxtests,distbase"
-      description="copy cxxtests to the distribution directory">
-
-    <!-- Create the distribution directory -->
-    <copy todir="${dist}" file="${build}/cxxtests.exe"/>
-    <copy todir="${dist}" file="${build}/cxxtests.dbg"/>
+  <target name="check" depends="linkcxxtests,distbase"
+      description="perform unit tests">
+    <cxxtestrun command="${build}/cxxtests" workingdir="${dist}" />
   </target>
 
 
@@ -858,11 +882,11 @@
 
   <!--
   ########################################################################
-  ## T A R G E T    :    D I S T - A L L - E X T R A
+  ## T A R G E T    :    D I S T - A L L - C H E C K
   ########################################################################
   -->
-  <target name="dist-all-extra" depends="dist-all,dist-cxxtests"
-        description="generate the distribution, along with inkview and cxxtests" >
+  <target name="dist-all-check" depends="dist-all,check"
+        description="generate the distribution, along with inkview and run cxxtests" >
   </target>
 
 
@@ -881,7 +905,7 @@
     <delete dir="${dist}"/>
     <delete file="build.dep"/>
     <delete file="config.h"/>
-
+    <delete file="${src}/inkscape-version.cpp"/>
     <delete file="${src}/test-main.cpp"/>
     <delete file="${src}/test-src.cpp"/>
     <delete file="${src}/display/test-display.cpp"/>