Merge from fe-moved

[inkscape.git] / build.xml

diff --git a/build.xml b/build.xml
index 4a8bb093363df78a19646f20f7bc26c182533b99..8b89656800084afce01934a649732fbe872ff9ba 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -89,15 +89,15 @@
     <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}"
+        #define INKSCAPE_VERSION "${version}, revision ${svn.revision}"
     </makefile>
     <makefile file="config.h">
         #ifndef _CONFIG_H_
@@ -171,6 +171,9 @@
         /* Allow reading WordPerfect? */
         #define WITH_LIBWPG                   1
 
+        /* Do we support SVG Fonts? */
+        #define ENABLE_SVG_FONTS              1
+
         #endif /* _CONFIG_H_ */
     </makefile>
   </target>
@@ -183,10 +186,11 @@
   ########################################################################
   -->
   <target name="touchabout"
-      description="update the modification time of aboutdialog.cpp">
-    <!-- not good <touch file="${src}/ui/dialog/aboutdialog.cpp"/> -->
+      description="update the modification time of aboutbox.cpp">
+    <!-- not good <touch file="${src}/ui/dialog/aboutbox.cpp"/> -->
     <!-- better -->
-    <delete file="${build}/obj/ui/dialog/aboutdialog.o"/>
+    <delete file="${build}/obj/ui/dialog/aboutbox.o"/>
+    <delete file="inkscape_version.h"/>
   </target>
 
 
@@ -251,7 +255,6 @@
             <include name="svg-color-test.h"/>
             <include name="svg-length-test.h"/>
             <include name="svg-path-geom-test.h"/>
-            <include name="svg-path-nr-test.h"/>
         </fileset>
     </cxxtestpart>
     <cxxtestpart command="python ${cxxtest}/cxxtestgen.py --have-eh"
@@ -290,8 +293,8 @@
     <!-- 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"/>
@@ -300,6 +303,7 @@
             <exclude name="deptool.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/.*"/>
@@ -339,8 +343,8 @@
             <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"/>
@@ -479,6 +483,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} 
@@ -633,6 +638,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"/>
@@ -787,15 +793,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>
 
 
@@ -860,11 +863,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>
 
 
@@ -883,6 +886,7 @@
     <delete dir="${dist}"/>
     <delete file="build.dep"/>
     <delete file="config.h"/>
+    <delete file="inkscape_version.h"/>
 
     <delete file="${src}/test-main.cpp"/>
     <delete file="${src}/test-src.cpp"/>