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

diff --git a/build.xml b/build.xml
index ce09ddfea..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"/>
@@ -55,6 +55,7 @@
   <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 -->  
@@ -62,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 -->  
@@ -97,9 +101,14 @@
     <copy file="${src}/helper/sp-marshal.cpp.mingw"
           tofile="${src}/helper/sp-marshal.cpp"/>
           
+    <!--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} r${svn.revision}";
+            char const *version_string = "${version}";
         }
     </makefile>
     <makefile file="config.h">
@@ -162,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
@@ -179,7 +188,9 @@
         #define ENABLE_SVG_FONTS              1
 
         /* Do we want experimental, unsupported, unguaranteed, etc., LivePathEffects enabled? */
-        // #define LPE_ENABLE_TEST_EFFECTS    1
+        #define LPE_ENABLE_TEST_EFFECTS    1
+
+        #define HAVE_ASPELL                   1
 
         #endif /* _CONFIG_H_ */
     </makefile>
@@ -194,13 +205,14 @@
         description="generate test files" >
 
     <!-- Generate CxxTest files -->
-    <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
+    <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"/>
@@ -211,19 +223,19 @@
             <include name="verbs-test.h"/>
         </fileset>
     </cxxtestpart>
-    <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
+    <cxxtestpart command="${python} ${cxxtest}/cxxtestgen.py --have-eh"
                  out="${src}/display/test-display.cpp">
         <fileset dir="${src}/display">
             <include name="curve-test.h"/>
         </fileset>
     </cxxtestpart>
-    <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
+    <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 --have-eh"
+    <cxxtestpart command="${python} ${cxxtest}/cxxtestgen.py --have-eh"
                  out="${src}/libnr/test-nr.cpp">
         <fileset dir="${src}/libnr">
             <include name="nr-compose-test.h"/>
@@ -237,7 +249,7 @@
             <include name="nr-matrix-test.h"/>
         </fileset>
     </cxxtestpart>
-    <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
+    <cxxtestpart command="${python} ${cxxtest}/cxxtestgen.py --have-eh"
                  out="${src}/svg/test-svg.cpp">
         <fileset dir="${src}/svg">
             <include name="css-ostringstream-test.h"/>
@@ -248,20 +260,20 @@
             <include name="svg-path-geom-test.h"/>
         </fileset>
     </cxxtestpart>
-    <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
+    <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 --have-eh"
+    <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}/cxxtest-template.tpl">
         <fileset dir="${src}">
@@ -292,6 +304,7 @@
             <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"/>
@@ -327,7 +340,6 @@
             <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="util/list-container-test.cpp"/>
             <exclude name="widgets/test-widgets.cpp"/>
             <exclude name="xml/quote-test.cpp"/>
@@ -367,7 +379,7 @@
             -fopenmp
         </flags>
         <defines>
-            -DINKSCAPE_VERSION=\"${version}\"
+            -DVERSION=\"${version}\"
             -DHAVE_CONFIG_H
             -D_INTL_REDIRECT_INLINE
             -DHAVE_SSL
@@ -465,7 +477,7 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
-           -mwindows
+           -mconsole
            -mthreads
        </flags>
        <fileset dir="${build}">
@@ -492,7 +504,8 @@
            -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-           -lgomp -lpthreadGC2
+           -lgomp -lpthreadGC2 -laspell
+           -lmscms  <!-- required for color profiles -->
        </libs>
     </link>
   </target>
@@ -521,7 +534,7 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
-           -mwindows
+           -mconsole
            -mthreads
        </flags>
        <fileset dir="${build}">
@@ -546,7 +559,8 @@
            -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-           -lgomp -lpthreadGC2
+           -lgomp -lpthreadGC2 -laspell
+           -lmscms  <!-- required for color profiles -->
        </libs>
     </link>
   </target>
@@ -597,7 +611,8 @@
            -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-           -lgomp -lpthreadGC2
+           -lgomp -lpthreadGC2 -laspell
+           -lmscms  <!-- required for color profiles -->
        </libs>
     </link>
   </target>
@@ -687,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>
@@ -694,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"/>
@@ -886,7 +906,6 @@
     <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"/>