X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=build.xml;h=0d917ca71bc02c9e441d4f3265d622c3cb6a7259;hb=ac851ddd38f466093751b7d307d128dd01ee858f;hp=fc20c0a7fe38418addd71d9a6e896a4cd654abdb;hpb=1450839e528788e57ff6f5fb3e2bbc7a8d8ae99b;p=inkscape.git

diff --git a/build.xml b/build.xml
index fc20c0a7f..0d917ca71 100644
--- a/build.xml
+++ b/build.xml
@@ -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,8 +101,10 @@
     <copy file="${src}/helper/sp-marshal.cpp.mingw"
           tofile="${src}/helper/sp-marshal.cpp"/>
           
-    <makefile file="inkscape_version.h">
-        #define INKSCAPE_VERSION "${version}, revision ${svn.revision}"
+    <makefile file="${src}/inkscape-version.cpp">
+        namespace Inkscape {
+            char const *version_string = "${version} r${svn.revision}";
+        }
     </makefile>
     <makefile file="config.h">
         #ifndef _CONFIG_H_
@@ -176,26 +182,15 @@
         /* Do we support SVG Fonts? */
         #define ENABLE_SVG_FONTS              1
 
-        #endif /* _CONFIG_H_ */
-    </makefile>
-  </target>
-
+        /* 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 aboutbox.cpp">
-    <!-- not good <touch file="${src}/ui/dialog/aboutbox.cpp"/> -->
-    <!-- better -->
-    <delete file="${build}/obj/ui/dialog/aboutbox.o"/>
-    <delete file="inkscape_version.h"/>
+        #endif /* _CONFIG_H_ */
+    </makefile>
   </target>
 
-
   <!--
   ########################################################################
   ## T A R G E T    :    C X X T E S T
@@ -205,7 +200,7 @@
         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"/>
@@ -222,19 +217,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"/>
@@ -248,7 +243,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"/>
@@ -259,22 +254,22 @@
             <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}/selfname.tpl">
+                 template="${src}/cxxtest-template.tpl">
         <fileset dir="${src}">
             <include name="MultiPrinter.h"/>
             <include name="PylogFormatter.h"/>
@@ -339,7 +334,6 @@
             <!--<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"/>
@@ -504,7 +498,7 @@
            -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-           -lgomp -lpthreadGC2
+           -lgomp -lpthreadGC2 -laspell
        </libs>
     </link>
   </target>
@@ -609,7 +603,7 @@
            -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-           -lgomp -lpthreadGC2
+           -lgomp -lpthreadGC2 
        </libs>
     </link>
   </target>
@@ -706,6 +700,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"/>
@@ -897,7 +894,7 @@
     <delete dir="${dist}"/>
     <delete file="build.dep"/>
     <delete file="config.h"/>
-    <delete file="inkscape_version.h"/>
+    <delete file="${src}/inkscape-version.cpp"/>
 
     <delete file="${src}/test-main.cpp"/>
     <delete file="${src}/test-src.cpp"/>