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

diff --git a/build.xml b/build.xml
index 984f4603f..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" 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,14 +52,20 @@
   <!-- -->
   <property name="arch"          value="mingw32-"/>
   <property name="archutil"      value=""/>
-  <property name="gtk"           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 -->  
   <!--
   <property name="arch"          value="i686-pc-mingw32-"/>
   <property name="archutil"      value="${arch}"/>
-  <property name="gtk"           location="/target"/>
+  <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 -->  
@@ -70,8 +76,8 @@
     queries can be as simple as ${pcc.packageName} for cflags, and
     ${pcl.packageName} for libs.  Dependencies are calculated automatically.
   -->
-  <property name="pkg-config-path"   location="${gtk}/lib/pkgconfig"/>
-  <property name="pkg-config-prefix" location="${gtk}"/>
+  <property name="pkg-config-path"   location="${devlibs}/lib/pkgconfig"/>
+  <property name="pkg-config-prefix" location="${devlibs}"/>
 
 
   <!--
@@ -88,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_
@@ -136,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
 
@@ -157,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
@@ -170,22 +184,104 @@
         /* Allow reading WordPerfect? */
         #define WITH_LIBWPG                   1
 
+        /* 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
+
         #endif /* _CONFIG_H_ */
     </makefile>
   </target>
 
-
-
   <!--
   ########################################################################
-  ## T A R G E T    :    T O U C H A B O U T
+  ## T A R G E T    :    C X X T E S 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"/>
+  <target name="cxxtest" depends="init"
+        description="generate test files" >
+
+    <!-- Generate CxxTest files -->
+    <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"/>
+            <include name="syle-test.h"/>
+            <include name="test-helpers.h"/>
+            <include name="verbs-test.h"/>
+        </fileset>
+    </cxxtestpart>
+    <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"
+                 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"
+                 out="${src}/libnr/test-nr.cpp">
+        <fileset dir="${src}/libnr">
+            <include name="nr-compose-test.h"/>
+            <include name="nr-types-test.h"/>
+            <include name="nr-translate-test.h"/>
+            <include name="nr-rotate-test.h"/>
+            <include name="nr-scale-test.h"/>
+            <include name="nr-point-fns-test.h"/>
+            <include name="nr-rotate-fns-test.h"/>
+            <include name="in-svg-plane-test.h"/>
+            <include name="nr-matrix-test.h"/>
+        </fileset>
+    </cxxtestpart>
+    <cxxtestpart command="${python} ${cxxtest}/cxxtestgen.py --have-eh"
+                 out="${src}/svg/test-svg.cpp">
+        <fileset dir="${src}/svg">
+            <include name="css-ostringstream-test.h"/>
+            <include name="stringstream-test.h"/>
+            <include name="svg-affine-test.h"/>
+            <include name="svg-color-test.h"/>
+            <include name="svg-length-test.h"/>
+            <include name="svg-path-geom-test.h"/>
+        </fileset>
+    </cxxtestpart>
+    <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"
+                 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" 
+                 out="${src}/test-main.cpp"
+                 template="${src}/cxxtest-template.tpl">
+        <fileset dir="${src}">
+            <include name="MultiPrinter.h"/>
+            <include name="PylogFormatter.h"/>
+            <include name="TRPIFormatter.h"/>
+        </fileset>
+    </cxxtestroot>
   </target>
 
 
@@ -194,23 +290,25 @@
   ## T A R G E T    :    C O M P I L E
   ########################################################################
   -->
-  <target name="compile" depends="init"
+  <target name="compile" depends="cxxtest"
         description="compile the source to .o" >
 
     <!-- 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="test-all.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"/>
@@ -222,12 +320,10 @@
             <exclude name="extract-uri-test.cpp"/>
             <exclude name="helper/units-test.cpp"/>
             <!-- exclude name="inkview.cpp"/-->
-            <exclude name="libnr/test-nr.cpp"/>
+            <!--<exclude name="libnr/test-nr.cpp"/>-->
             <exclude name="libnr/test-nr-main.cpp"/>
             <exclude name="libnr/testnr.cpp"/>
             <exclude name="libnr/in-svg-plane-test.cpp"/>
-            <exclude name="libnr/nr-compose-reference.cpp"/>
-            <exclude name="libnr/nr-compose-test.cpp"/>
             <exclude name="libnr/nr-matrix-test.cpp"/>
             <exclude name="libnr/nr-point-fns-test.cpp"/>
             <exclude name="libnr/nr-rotate-fns-test.cpp"/>
@@ -240,15 +336,16 @@
             <exclude name="trace/potrace/potest.cpp"/>
             <exclude name="round-test.cpp"/>
             <exclude name="sp-gradient-test.cpp"/>
+            <exclude name="style-test.cpp"/>
             <exclude name="svg/ftos.cpp"/>
-            <exclude name="svg/test-svg.cpp"/>
+            <!--<exclude name="svg/test-svg.cpp"/>-->
             <exclude name="svg/test-svg-main.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-main.cpp"/>-->
             <exclude name="io/streamtest.cpp"/>
             <!--JABBER-->
             <exclude name="pedro/pedrogui.cpp"/>
@@ -279,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}\"
@@ -286,23 +384,24 @@
             -D_INTL_REDIRECT_INLINE
             -DHAVE_SSL
             -DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }" <!-- inkboard -->
+            -DPOPPLER_NEW_GFXFONT <!-- poppler changed the api for 0.8.3 -->
         </defines>
         <includes>
-            -I${gtk}/include
+            -I${devlibs}/include
             <!-- GTK / GTKMM -->
             ${pcc.gtkmm-2.4}
             <!-- OTHER -->
-            -I${gtk}/include/libxml2 
-            -I${gtk}/include/freetype2
-            -I${gtk}/include/cairo
-            -I${gtk}/include/poppler
-            -I${gtk}/include/gc
-            -I${gtk}/include/libwpg-0.1
-            -I${gtk}/include/libwpd-0.8
+            -I${devlibs}/include/libxml2 
+            ${pcc.freetype2}
+            ${pcc.cairo}
+            ${pcc.poppler}
+            -I${devlibs}/include/gc
+            ${pcc.libwpg-0.1} ${pcc.libwpg-stream-0.1}
+            -I${cxxtest}
             <!-- PERL -->
-            <!-- -Wno-comment -I${gtk}/perl/lib/CORE -->
+            <!-- -Wno-comment -I${devlibs}/perl/lib/CORE -->
             <!-- PYTHON -->
-            -I${gtk}/python/include
+            -I${devlibs}/python/include
             <!-- JAVA -->
             -I${src}/bind/javainc -I${src}/bind/javainc/win32
         </includes>
@@ -323,6 +422,16 @@
            <exclude name="main.o"/>
            <exclude name="winmain.o"/>
            <exclude name="inkview.o"/>
+           <!-- CxxTest -->
+           <exclude name="test-main.o"/>
+           <exclude name="test-src.o"/>
+           <exclude name="display/test-display.o"/>
+           <exclude name="helper/test-helper.o"/>
+           <exclude name="libnr/nr-compose-reference.o"/>
+           <exclude name="libnr/test-nr.o"/>
+           <exclude name="svg/test-svg.o"/>
+           <exclude name="util/test-util.o"/>
+           <exclude name="xml/test-xml.o"/>
        </fileset>
     </staticlib>
   </target>
@@ -368,7 +477,8 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
-           -mwindows
+           -mconsole
+           -mthreads
        </flags>
        <fileset dir="${build}">
            <include name="inkres.o"/>
@@ -376,31 +486,26 @@
            <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${gtk}/lib
-           -lpoppler-cairo -lpoppler-glib -lpoppler.dll 
+           -L${devlibs}/lib
+           ${pcl.poppler-cairo} ${pcl.poppler-glib} ${pcl.poppler} 
            ${pcl.gtkmm-2.4}  ${pcl.pangoft2} ${pcl.gthread-2.0}
-           <!-- PERL -->
-           <!-- -L${gtk}/perl/lib/CORE -lperl58 -->
-           <!-- PYTHON -->
-           <!-- -L${gtk}/python/libs -lpython25 -->
-           ${gtk}/bin/libxml2.dll
-           ${gtk}/bin/libxslt.dll
-           -lcairo.dll
-           -lcairomm-1.0.dll
-		   -lwpg-0.1.dll -lwpg-stream-0.1.dll
-           -lwpd-0.8.dll -lwpd-stream-0.8.dll
-           ${gtk}/lib/iconv.lib
-           -lMagick++ -lWand -lMagick
-           -lfreetype.dll -lfontconfig.dll
+           ${devlibs}/bin/libxml2.dll
+           ${devlibs}/bin/libxslt.dll
+           ${pcl.cairo} ${pcl.cairomm-1.0}
+           ${pcl.libwpg-0.1} ${pcl.libwpg-stream-0.1}
+           ${devlibs}/lib/iconv.lib
+           ${pcl.ImageMagick++}
+           ${pcl.fontconfig} ${pcl.freetype2}
            -lssl -lcrypto
-           -llcms.dll
-           -lgsl
-           -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
+           ${pcl.lcms}
+           ${pcl.gsl}
+           -lpng -ljpeg.dll -ltiff.dll -lpopt ${devlibs}/lib/zdll.lib
            -lgc
-		   -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-           <!-- 2geom -->
-           <!-- -l2geom -->
+           -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+           -lgomp -lpthreadGC2 -laspell
+           -lmscms  <!-- required for color profiles -->
        </libs>
     </link>
   </target>
@@ -429,6 +534,8 @@
               stripcommand="${archutil}strip"
               objcopycommand="${archutil}objcopy">
        <flags>
+           -mconsole
+           -mthreads
        </flags>
        <fileset dir="${build}">
            <include name="inkviewres.o"/>
@@ -436,25 +543,24 @@
            <include name="libinkscape.a"/>
        </fileset>
        <libs>
-           -L${gtk}/lib
-           -lpoppler-cairo -lpoppler-glib -lpoppler.dll 
-           ${pcl.gtkmm-2.4}
-           <!-- PERL -->
-           -L${gtk}/perl/lib/CORE -lperl58
-           <!-- PYTHON -->
-           -L${gtk}/python/libs -lpython25
-           ${gtk}/bin/libxml2.dll
-           ${gtk}/bin/libxslt.dll
-           ${gtk}/lib/iconv.lib
-		   -lcairo.dll -lcairomm-1.0.dll
-           -lwpg-0.1.dll -lwpg-stream-0.1.dll
-           -lMagick++ -lWand -lMagick
-           -lfreetype.dll -lfontconfig.dll
-           -llcms.dll
+           -L${devlibs}/lib
+           ${pcl.poppler-cairo} ${pcl.poppler-glib} ${pcl.poppler} 
+           ${pcl.gtkmm-2.4}  ${pcl.pangoft2} ${pcl.gthread-2.0}
+           ${devlibs}/bin/libxml2.dll
+           ${devlibs}/bin/libxslt.dll
+           ${pcl.cairo} ${pcl.cairomm-1.0}
+           ${pcl.libwpg-0.1} ${pcl.libwpg-stream-0.1}
+           ${devlibs}/lib/iconv.lib
+           ${pcl.ImageMagick++}
+           ${pcl.fontconfig} ${pcl.freetype2}
            -lssl -lcrypto
-           -lpng -ljpeg.dll -ltiff.dll -lpopt ${gtk}/lib/zdll.lib
-           -lgc -mwindows
-		   -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
+           ${pcl.lcms}
+           ${pcl.gsl}
+           -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>
@@ -463,64 +569,119 @@
 
   <!--
   ########################################################################
-  ## T A R G E T    :    D I S T
+  ## T A R G E T    :    L I N K C X X T E S T S
   ########################################################################
   -->
-  <target name="dist" depends="link,i18n"
+  <target name="linkcxxtests" depends="lib"
+      description="link objects and library to create executable">
+
+    <link command="${arch}g++" out="${build}/cxxtests.exe"
+              strip="true" symfile="${build}/cxxtests.dbg"
+              stripcommand="${archutil}strip"
+              objcopycommand="${archutil}objcopy">
+       <flags>
+           -mthreads
+       </flags>
+       <fileset dir="${build}">
+           <include name="obj/test-main.o"/>
+           <include name="obj/test-src.o"/>
+           <include name="obj/display/test-display.o"/>
+           <include name="obj/helper/test-helper.o"/>
+           <include name="obj/libnr/nr-compose-reference.o"/>
+           <include name="obj/libnr/test-nr.o"/>
+           <include name="obj/svg/test-svg.o"/>
+           <include name="obj/util/test-util.o"/>
+           <include name="obj/xml/test-xml.o"/>
+           <include name="libinkscape.a"/>
+       </fileset>
+       <libs>
+           -L${devlibs}/lib
+           ${pcl.poppler-cairo} ${pcl.poppler-glib} ${pcl.poppler} 
+           ${pcl.gtkmm-2.4}  ${pcl.pangoft2} ${pcl.gthread-2.0}
+           ${devlibs}/bin/libxml2.dll
+           ${devlibs}/bin/libxslt.dll
+           ${pcl.cairo} ${pcl.cairomm-1.0}
+           ${pcl.libwpg-0.1} ${pcl.libwpg-stream-0.1}
+           ${devlibs}/lib/iconv.lib
+           ${pcl.ImageMagick++}
+           ${pcl.fontconfig} ${pcl.freetype2}
+           -lssl -lcrypto
+           ${pcl.lcms}
+           ${pcl.gsl}
+           -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>
+
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    D I S T B A S E
+  ########################################################################
+  -->
+  <target name="distbase" depends="i18n"
       description="generate the distribution directory with all needed files">
 
     <!-- Create the distribution directory -->
-    <copy file="${build}/inkscape.exe" todir="${dist}"/>
-	<copy file="${build}/inkscape.dbg" todir="${dist}"/>
-    <copy file="AUTHORS" todir="${dist}"/>
-    <copy file="COPYING" todir="${dist}"/>
-    <copy file="COPYING.LIB" todir="${dist}"/>
-    <copy file="NEWS" todir="${dist}"/>
-    <copy file="README" todir="${dist}"/>
-    <copy file="TRANSLATORS" todir="${dist}"/>
-    <copy file="${gtk}/bin/libatkmm-1.6-1.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libglibmm-2.4-1.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libgtkmm-2.4-1.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libgdkmm-2.4-1.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libpangomm-1.4-1.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libcairomm-1.0-1.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libsigc-2.0-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/freetype6.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libatk-1.0-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libgdk-win32-2.0-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libgdk_pixbuf-2.0-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libglib-2.0-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libgmodule-2.0-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libgobject-2.0-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libgtk-win32-2.0-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libgthread-2.0-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libcairo-2.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libpoppler-3.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libpangocairo-1.0-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libpango-1.0-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libpangoft2-1.0-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libpangowin32-1.0-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/freetype6.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libfontconfig-1.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libxml2.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libxslt.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libexpat.dll" todir="${dist}"/>
-    <!--<copy file="${gtk}/bin/libexpat.dll" tofile="${dist}/xmlparse.dll"/>-->
-    <copy file="${gtk}/bin/libwpg-0.1.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libwpg-stream-0.1.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libwpd-0.8.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libwpd-stream-0.8.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/jpeg62.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libpng13.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libtiff3.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/msvcr70.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/msvcr71.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/zlib1.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/iconv.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/libpopt-0.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/liblcms-1.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/intl.dll" todir="${dist}"/>
-    <copy file="${gtk}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>
+    <copy todir="${dist}" file="AUTHORS"/>
+    <copy todir="${dist}" file="COPYING"/>
+    <copy todir="${dist}" file="COPYING.LIB"/>
+    <copy todir="${dist}" file="NEWS"/>
+    <copy todir="${dist}" file="README"/>
+    <copy todir="${dist}" file="TRANSLATORS"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libatkmm-1.6-1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libglibmm-2.4-1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libgtkmm-2.4-1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libgdkmm-2.4-1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libpangomm-1.4-1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libcairomm-1.0-1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libsigc-2.0-0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/freetype6.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libatk-1.0-0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libgdk-win32-2.0-0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libgdk_pixbuf-2.0-0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libglib-2.0-0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libgmodule-2.0-0.dll"/>
+    <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"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libpango-1.0-0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libpangoft2-1.0-0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libpangowin32-1.0-0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/freetype6.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libfontconfig-1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libxml2.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libxslt.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libexpat.dll"/>
+    <!--<copy file="${devlibs}/bin/libexpat.dll" tofile="${dist}/xmlparse.dll"/>-->
+    <copy todir="${dist}" file="${devlibs}/bin/libwpg-0.1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libwpg-stream-0.1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libwpd-0.8.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libwpd-stream-0.8.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/jpeg62.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libpng13.dll"/>
+    <!-- GTK changed their dep file name for PNG!   :-(  -->
+    <copy todir="${dist}" file="${devlibs}/bin/libpng12-0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libtiff3.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/msvcr70.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/msvcr71.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/zlib1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/iconv.dll"/>
+    <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}">
@@ -529,45 +690,55 @@
         </fileset>
     </copy>
 
+    <mkdir dir="${dist}/data"/>
+    <mkdir dir="${dist}/locale"/>
+    <mkdir dir="${dist}/modules"/>
+    <mkdir dir="${dist}/plugins"/>
+
     <!-- GTK -->
-    <copy todir="${dist}"> <fileset dir="${gtk}/etc"/> </copy>
-    <copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/gtk-2.0"/> </copy>
-    <copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/glib-2.0"/> </copy>
-    <copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/locale"/> </copy>
+    <copy todir="${dist}">     <fileset dir="${devlibs}/etc"/> </copy>
+    <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/gtk-2.0"/> </copy>
+    <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/glib-2.0"/> </copy>
     <copy todir="${dist}">
         <fileset dir="share">
           <exclude name=".*\.am"/>
+          <exclude name=".*\.in"/>
+          <exclude name=".*\.sh"/>
         </fileset>
     </copy>
-    <copy todir="${dist}/share"> <fileset dir="${gtk}/share/themes"/> </copy>
-    <mkdir dir="${dist}/data"/>
-    <mkdir dir="${dist}/locale"/>
-    <mkdir dir="${dist}/modules"/>
-    <mkdir dir="${dist}/plugins"/>
-    <copy file="${gtk}/bin/gdb.exe" todir="${dist}"/>
+    <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/locale"/> </copy>
+    <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/themes"/> </copy>
+    <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 file="${gtk}/bin/gspawn-win32-helper.exe" todir="${dist}"/>
-    <copy file="${gtk}/bin/gspawn-win32-helper-console.exe" todir="${dist}"/>
+    <copy todir="${dist}" file="${devlibs}/bin/gspawn-win32-helper.exe"/>
+    <copy todir="${dist}" file="${devlibs}/bin/gspawn-win32-helper-console.exe"/>
 
     <!-- PERL -->
-    <copy file="${gtk}/perl/bin/perl58.dll" todir="${dist}"/>
+    <copy todir="${dist}" file="${devlibs}/perl/bin/perl58.dll"/>
 
     <!-- PYTHON -->
-    <copy file="${gtk}/python/python25.dll" todir="${dist}"/>
-    <copy file="${gtk}/python/python.exe" todir="${dist}/python"/>
-    <copy file="${gtk}/python/pythonw.exe" todir="${dist}/python"/>
-    <copy todir="${dist}/python"> <fileset dir="${gtk}/python/Lib"/> </copy>
-    <copy todir="${dist}/python"> <fileset dir="${gtk}/python/DLLs"/> </copy>
-    <copy todir="${dist}/python"> <fileset dir="${gtk}/python/Scripts"/> </copy>
-
-    <!--<copy file="${gtk}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>-->
+    <copy todir="${dist}" file="${devlibs}/python/python25.dll"/>
+    <copy todir="${dist}/python" file="${devlibs}/python/python.exe" />
+    <copy todir="${dist}/python" file="${devlibs}/python/pythonw.exe"/>
+    <copy todir="${dist}/python"> <fileset dir="${devlibs}/python/Lib"/> </copy>
+    <copy todir="${dist}/python"> <fileset dir="${devlibs}/python/DLLs"/> </copy>
+    <copy todir="${dist}/python"> <fileset dir="${devlibs}/python/Scripts"/> </copy>
+
+    <!--<copy file="${devlibs}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>-->
     <makefile file="${dist}/etc/gtk-2.0/gtkrc">
     gtk-icon-sizes = "gtk-menu=16,16:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32:inkscape-decoration=16,16"
     gtk-toolbar-icon-size = small-toolbar
 
     # disable images in buttons. i've only seen ugly delphi apps use this feature.
     gtk-button-images = 0
+    
+    # disable the annoying beep in editable controls
+    gtk-error-bell = 0
 
     # enable/disable images in menus. most "stock" microsoft apps don't use these, except sparingly.
     # the office apps use them heavily, though.
@@ -611,6 +782,45 @@
   </target>
 
 
+  <!--
+  ########################################################################
+  ## T A R G E T    :    D I S T - I N K S C A P E
+  ########################################################################
+  -->
+  <target name="dist-inkscape" depends="link,distbase"
+      description="copy inkscape to the distribution directory">
+
+    <!-- Create the distribution directory -->
+    <copy todir="${dist}" file="${build}/inkscape.exe"/>
+    <copy todir="${dist}" file="${build}/inkscape.dbg"/>
+  </target>
+
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    D I S T - I N K V I E W
+  ########################################################################
+  -->
+  <target name="dist-inkview" depends="linkinkview,distbase"
+      description="copy inkview to the distribution directory">
+
+    <!-- Create the distribution directory -->
+    <copy todir="${dist}" file="${build}/inkview.exe"/>
+    <copy todir="${dist}" file="${build}/inkview.dbg"/>
+  </target>
+
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    C H E C K
+  ########################################################################
+  -->
+  <target name="check" depends="linkcxxtests,distbase"
+      description="perform unit tests">
+    <cxxtestrun command="${build}/cxxtests" workingdir="${dist}" />
+  </target>
+
+
   <!--
   ########################################################################
   ## T A R G E T    :    JAVAC
@@ -629,7 +839,7 @@
   -->
   <target name="jar" depends="javac"
       description="pack java classes and resources into a jar file">
-    <copy todir="${build}/java/classes"> <fileset dir="${gtk}/bind/data"/> </copy>
+    <copy todir="${build}/java/classes"> <fileset dir="${devlibs}/bind/data"/> </copy>
     <jar basedir="${build}/java/classes" destfile="${build}/java/lib/inkscape.jar"/>
   </target>
 
@@ -640,7 +850,7 @@
   -->
   <target name="binddist" depends="jar"
       description="pack java classes and resources into a jar file">
-    <copy todir="${dist}/share/bind"> <fileset dir="${gtk}/bind/java"/> </copy>
+    <copy todir="${dist}/share/bind"> <fileset dir="${devlibs}/bind/java"/> </copy>
     <copy todir="${dist}/share/bind/java"> <fileset dir="${build}/java/lib"/> </copy>
 
   </target>
@@ -663,11 +873,20 @@
   ## T A R G E T    :    D I S T - A L L
   ########################################################################
   -->
-  <target name="dist-all" depends="dist"
+  <target name="dist-all" depends="dist-inkscape,dist-inkview"
         description="generate the distribution, along with inkview" >
+  </target>
+
+
 
-    <copy file="${build}/inkview.exe" todir="${dist}"/>
-    <copy file="${build}/inkview.dbg" todir="${dist}"/>
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    D I S T - A L L - C H E C K
+  ########################################################################
+  -->
+  <target name="dist-all-check" depends="dist-all,check"
+        description="generate the distribution, along with inkview and run cxxtests" >
   </target>
 
 
@@ -686,6 +905,15 @@
     <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"/>
+    <delete file="${src}/helper/test-helper.cpp"/>
+    <delete file="${src}/libnr/test-nr.cpp"/>
+    <delete file="${src}/svg/test-svg.cpp"/>
+    <delete file="${src}/util/test-util.cpp"/>
+    <delete file="${src}/xml/test-xml.cpp"/>
 
   </target>