update buildtool files for our new Dwarf2 EH

diff --git a/build28.xml b/build28.xml
deleted file mode 100644 (file)
index f0bff1c..0000000
--- a/build28.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<project name="Sands" default="dist" basedir=".">\r
-    <description>\r
-        Build file for Sands office data tool\r
-    </description>\r
-\r
-  <!-- set global properties for this build -->\r
-  <property name="version"     location="0.45"/>\r
-  <property name="src"         location="src"/>\r
-  <property name="gtk"         location="c:/gtk28"/>\r
-  <property name="lib"         location="lib"/>\r
-  <property name="build"       location="build"/>\r
-  <property name="dist"        location="inkscape"/>\r
-\r
-  <target name="init">\r
-    <!-- Create the build directory structure used by compile -->\r
-    <mkdir dir="${build}"/>\r
-    <copy file="config.h.mingw" tofile="config.h"/>\r
-  </target>\r
-\r
-  <target name="compile" depends="init"\r
-        description="compile the source " >\r
-    <!-- Compile from source to build -->\r
-    <cc cc="gcc" cxx="g++" destdir="${build}/obj">\r
-           <fileset dir="${src}">\r
-            <!-- THINGS TO EXCLUDE -->\r
-               <exclude name="ast/.*"/>\r
-               <exclude name="bonobo/.*"/>\r
-               <exclude name="deptool.cpp"/>\r
-               <exclude name="dialogs/filedialog-win32.cpp"/>\r
-               <exclude name="display/testnr.cpp"/>\r
-               <exclude name="display/bezier-utils-test.cpp"/>\r
-               <exclude name="dom/jsdombind.cpp"/>\r
-               <exclude name="dom/work/.*"/>\r
-               <exclude name="dom/odf/SvgOdg.cpp"/>\r
-               <exclude name="extension/api.cpp"/>\r
-               <exclude name="extension/dxf2svg/.*"/>\r
-               <exclude name="extension/internal/gnome.cpp"/>\r
-               <exclude name="extension/script/bindtest.cpp"/>\r
-               <exclude name="extension/script/cpptest.cpp"/>\r
-               <exclude name="extension/plugin/.*"/>\r
-               <exclude name="extract-uri-test.cpp"/>\r
-               <exclude name="helper/units-test.cpp"/>\r
-               <exclude name="inkview.cpp"/>\r
-               <exclude name="libnr/in-svg-plane-test.cpp"/>\r
-               <exclude name="libnr/nr-compose-reference.cpp"/>\r
-               <exclude name="libnr/nr-compose-test.cpp"/>\r
-               <exclude name="libnr/nr-matrix-test.cpp"/>\r
-               <exclude name="libnr/nr-point-fns-test.cpp"/>\r
-               <exclude name="libnr/nr-rotate-fns-test.cpp"/>\r
-               <exclude name="libnr/nr-rotate-test.cpp"/>\r
-               <exclude name="libnr/nr-scale-test.cpp"/>\r
-               <exclude name="libnr/nr-translate-test.cpp"/>\r
-               <exclude name="libnr/nr-types-test.cpp"/>\r
-               <exclude name="livarot/Path-test.cpp"/>\r
-               <exclude name="mod360-test.cpp"/>\r
-               <exclude name="trace/potrace/potest.cpp"/>\r
-               <exclude name="round-test.cpp"/>\r
-               <exclude name="sp-gradient-test.cpp"/>\r
-               <exclude name="svg/ftos.cpp"/>\r
-               <exclude name="utest/.*"/>\r
-               <exclude name="widgets/test-widgets.cpp"/>\r
-               <exclude name="xml/quote-test.cpp"/>\r
-               <exclude name="xml/repr-action-test.cpp"/>\r
-               <exclude name="io/streamtest.cpp"/>\r
-            <!--JABBER-->\r
-               <exclude name="pedro/pedrogui.cpp"/>\r
-               <exclude name="pedro/pedrogui.h"/>\r
-               <exclude name="pedro/work/.*"/>\r
-            <!--WHITEBOARD-->\r
-               <exclude name="ui/dialog/session-player.cpp"/>\r
-               <exclude name="ui/dialog/whiteboard-connect.cpp"/>\r
-               <exclude name="ui/dialog/whiteboard-sharewithchat.cpp"/>\r
-               <exclude name="ui/dialog/whiteboard-sharewithuser.cpp"/>\r
-               <exclude name="dialogs/whiteboard-connect-dialog.cpp"/>\r
-               <exclude name="dialogs/whiteboard-common-dialog.cpp"/>\r
-               <exclude name="dialogs/whiteboard-sharewithchat-dialog.cpp"/>\r
-               <exclude name="dialogs/whiteboard-sharewithuser-dialog.cpp"/>\r
-               <exclude name="jabber_whiteboard/node-tracker.cpp"/>\r
-               <exclude name="jabber_whiteboard/node-utilities.cpp"/>\r
-            <!--WHITEBOARD-->\r
-               <exclude name="removeoverlap/placement_SolveVPSC.cpp"/>\r
-               <exclude name="removeoverlap/placement_SolveVPSC.h"/>\r
-               <exclude name="removeoverlap/test.cpp"/>\r
-               <exclude name="removeoverlap/remove_rectangle_overlap-test.cpp"/>\r
-               <exclude name="removeoverlap/remove_rectangle_overlap-test.h"/>\r
-           </fileset>\r
-        <flags>\r
-            -Wall -O3\r
-                       -mms-bitfields\r
-        </flags>\r
-        <defines>\r
-            -DVERSION=\"${version}\"\r
-            -DHAVE_CONFIG_H\r
-            -DXP_WIN <!-- for JS -->\r
-                       -D_INTL_REDIRECT_INLINE\r
-            -DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }" <!-- inkboard -->\r
-            -DWITH_INKBOARD -DHAVE_SSL <!-- inkboard -->\r
-        </defines>\r
-        <includes>\r
-            -I${gtk}/include\r
-                       <!-- GTK / GTKMM -->\r
-            -I${gtk}/include/glibmm-2.4\r
-                   -I${gtk}/lib/glibmm-2.4/include\r
-            -I${gtk}/include/gtkmm-2.4\r
-                   -I${gtk}/lib/gtkmm-2.4/include\r
-            -I${gtk}/include/gdkmm-2.4\r
-                   -I${gtk}/lib/gdkmm-2.4/include\r
-            -I${gtk}/include/pangomm-1.4\r
-            -I${gtk}/include/atkmm-1.6\r
-            -I${gtk}/include/sigc++-2.0\r
-                   -I${gtk}/lib/sigc++-2.0/include\r
-            -I${gtk}/include/gtk-2.0\r
-                   -I${gtk}/lib/gtk-2.0/include\r
-            -I${gtk}/include/atk-1.0\r
-                   -I${gtk}/include/pango-1.0\r
-            -I${gtk}/include/glib-2.0\r
-                   -I${gtk}/lib/glib-2.0/include\r
-                   <!-- OTHER -->\r
-            -I${gtk}/include/libxml2 \r
-                       -I${gtk}/include/freetype2\r
-                   -I${gtk}/include/cairo\r
-                   <!-- PERL -->\r
-                   -Wno-comment -I${gtk}/perl/lib/CORE\r
-                   <!-- PYTHON -->\r
-                   -I${gtk}/python/include\r
-        </includes>\r
-       </cc>\r
-  </target>\r
-  \r
-  <target name="lib" depends="compile">\r
-    <staticlib file="${build}/libinkscape.a">\r
-          <fileset dir="${build}/obj">\r
-              <exclude name="main,o"/>\r
-              <exclude name="winmain,o"/>\r
-          </fileset>\r
-       </staticlib>\r
-  </target>\r
-\r
-  <target name="i18n" depends="compile">\r
-    <msgfmt todir="${build}/po">\r
-          <fileset dir="po">\r
-          </fileset>\r
-       </msgfmt>\r
-  </target>\r
-\r
-  <target name="link" depends="lib">\r
-    <rc command="windres -o" \r
-           file="${src}/inkscape.rc"\r
-           out="${build}/inkres.o">\r
-               <flags>\r
-               --include-dir=${src}\r
-               </flags>\r
-       </rc>\r
-    <link command="g++" out="${build}/inkscape.exe">\r
-       <flags>\r
-       </flags>\r
-          <fileset>\r
-              <include name="${build}/inkres.o"/>\r
-              <include name="${build}/obj/main.o"/>\r
-              <include name="${build}/obj/winmain.o"/>\r
-              <include name="${build}/libinkscape.a"/>\r
-          </fileset>\r
-          <libs>\r
-              -L${gtk}/lib\r
-           -lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4\r
-           -latkmm-1.6 -lpangomm-1.4 -lsigc-2.0\r
-           -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0\r
-           -lgdk_pixbuf-2.0\r
-           -lpangocairo-1.0 -lpangoft2-1.0 -lpangowin32-1.0 -lpango-1.0\r
-           -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lcairo\r
-           <!-- PERL -->\r
-                  -L${gtk}/perl/lib/CORE -lperl58\r
-           <!-- PYTHON -->\r
-           -L${gtk}/python/libs -lpython24\r
-           ${gtk}/bin/libxml2.dll\r
-           ${gtk}/lib/iconv.lib\r
-           -lfreetype.dll -lfontconfig.dll\r
-           -llcms.dll\r
-           -lssl -lcrypto\r
-           -lpng -lpopt ${gtk}/lib/zdll.lib\r
-           -lgc -mwindows -lws2_32 -lintl -lm\r
-          </libs>\r
-       </link>\r
-       <strip file="${build}/inkscape.exe"/>\r
-  </target>\r
-\r
-  <target name="dist" depends="link,i18n"\r
-        description="generate the distribution" >\r
-    <!-- Create the distribution directory -->\r
-    <copy file="${build}/inkscape.exe" todir="${dist}"/>\r
-    <copy file="AUTHORS" todir="${dist}"/>\r
-    <copy file="COPYING" todir="${dist}"/>\r
-    <copy file="COPYING.LIB" todir="${dist}"/>\r
-    <copy file="NEWS" todir="${dist}"/>\r
-    <copy file="README" todir="${dist}"/>\r
-    <copy file="TRANSLATORS" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libatkmm-1.6-1.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libglibmm-2.4-1.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libgtkmm-2.4-1.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libgdkmm-2.4-1.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libpangomm-1.4-1.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libsigc-2.0-0.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/freetype6.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libatk-1.0-0.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libgdk-win32-2.0-0.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libgdk_pixbuf-2.0-0.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libglib-2.0-0.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libgmodule-2.0-0.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libgobject-2.0-0.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libgtk-win32-2.0-0.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libgthread-2.0-0.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libcairo-2.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libpangocairo-1.0-0.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libpango-1.0-0.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libpangoft2-1.0-0.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libpangowin32-1.0-0.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/freetype6.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libfontconfig-1.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libxml2.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/xmlparse.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/jpeg62.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/libpng13.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/msvcr70.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/msvcr71.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/zlib1.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/iconv.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/popt1.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/liblcms-1.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/intl.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>\r
-\r
-    <!-- MSGFMT files -->\r
-    <copy todir="${dist}"> <fileset dir="${build}/po"/> </copy>\r
-\r
-    <!-- GTK -->\r
-    <copy todir="${dist}"> <fileset dir="${gtk}/etc"/> </copy>\r
-    <copy file="${gtk}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>\r
-    <copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/gtk-2.0"/> </copy>\r
-    <copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/glib-2.0"/> </copy>\r
-    <copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/locale"/> </copy>\r
-    <copy todir="${dist}/lib"> <fileset dir="${gtk}/lib/pango"/> </copy>\r
-    <copy todir="${dist}"> <fileset dir="share"/> </copy>\r
-    <copy todir="${dist}/share"> <fileset dir="${gtk}/share/themes"/> </copy>\r
-    <mkdir dir="${dist}/data"/>\r
-    <mkdir dir="${dist}/locale"/>\r
-    <mkdir dir="${dist}/modules"/>\r
-    <mkdir dir="${dist}/plugins"/>\r
-    <copy file="${gtk}/bin/gdb.exe" todir="${dist}"/>\r
-\r
-    <!-- PERL -->\r
-    <copy file="${gtk}/perl/bin/perl58.dll" todir="${dist}"/>\r
-\r
-    <!-- PYTHON -->\r
-    <copy file="${gtk}/python/python24.dll" todir="${dist}"/>\r
-    <copy file="${gtk}/python/python.exe" todir="${dist}/python"/>\r
-    <copy todir="${dist}/python"> <fileset dir="${gtk}/python/Lib"/> </copy>\r
-    <copy todir="${dist}/python"> <fileset dir="${gtk}/python/DLLs"/> </copy>\r
-    <copy todir="${dist}/python"> <fileset dir="${gtk}/python/Scripts"/> </copy>\r
-\r
-\r
-  </target>\r
-\r
-  <target name="clean"\r
-        description="clean up" >\r
-    <!-- Delete the ${build} and ${dist} directory trees -->\r
-    <delete dir="${build}"/>\r
-    <delete dir="${dist}"/>\r
-  </target>\r
-</project>\r
-\r