X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=build.xml;h=62eda3aaaa577c172e38c5687707ff4f4f6a518d;hb=3c60a84ec01cc697eaa48c4df51aa60c8483a7c1;hp=14c19f6d766b32d7727e2680f2668d56a6f8ebc3;hpb=562c4790d7b51d3f65e8beb118cf44b0eb43bb35;p=inkscape.git

diff --git a/build.xml b/build.xml
index 14c19f6d7..62eda3aaa 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 -->  
@@ -181,6 +185,8 @@
         /* Do we want experimental, unsupported, unguaranteed, etc., LivePathEffects enabled? */
         // #define LPE_ENABLE_TEST_EFFECTS    1
 
+        #define HAVE_ASPELL                   1
+
         #endif /* _CONFIG_H_ */
     </makefile>
   </target>
@@ -194,7 +200,7 @@
         description="generate test files" >
 
     <!-- Generate CxxTest files -->
-    <cxxtestpart command="${devlibs}/python/python.exe ${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"/>
@@ -211,19 +217,19 @@
             <include name="verbs-test.h"/>
         </fileset>
     </cxxtestpart>
-    <cxxtestpart command="${devlibs}/python/python.exe ${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="${devlibs}/python/python.exe ${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="${devlibs}/python/python.exe ${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 +243,7 @@
             <include name="nr-matrix-test.h"/>
         </fileset>
     </cxxtestpart>
-    <cxxtestpart command="${devlibs}/python/python.exe ${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 +254,20 @@
             <include name="svg-path-geom-test.h"/>
         </fileset>
     </cxxtestpart>
-    <cxxtestpart command="${devlibs}/python/python.exe ${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="${devlibs}/python/python.exe ${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="${devlibs}/python/python.exe ${cxxtest}/cxxtestgen.py" 
+    <cxxtestroot command="${python} ${cxxtest}/cxxtestgen.py" 
                  out="${src}/test-main.cpp"
                  template="${src}/cxxtest-template.tpl">
         <fileset dir="${src}">
@@ -327,7 +333,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"/>
@@ -492,7 +497,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>
@@ -597,7 +602,7 @@
            -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
            -lgc
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-           -lgomp -lpthreadGC2 -laspell
+           -lgomp -lpthreadGC2 
        </libs>
     </link>
   </target>
@@ -687,6 +692,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>