rollup of buildtool/unix work. compiles and links inkscape

(bzr r5833)

2 files changed, 688 insertions, 3 deletions

diff --git a/build-lx.xml b/build-lx.xml
new file mode 100644
index 000000000..6e0f7918e
--- /dev/null
+++ b/build-lx.xml
@@ -0,0 +1,681 @@
+<!--
+ * Inkscape build file.
+ *
+ * See buildtool.cpp for use.
+ *
+ * Authors:
+ *   Bob Jamison
+ *   Others 
+ *
+ * Copyright (C) 2006-2008 Inkscape.org
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+
+
+
+<!--
+########################################################################
+## P R O J E C T   :   I N K S C A P E
+########################################################################
+-->
+<project name="Inkscape" default="dist" basedir=".">
+    <description>
+        Build file for the Inkscape SVG editor.  This version
+        is configured for Unix/Linux, but hopefully we can merge 
+        in the future.
+    </description>
+
+  <!-- set global properties for this build -->
+  <property name="version"       value="0.46+devel"/>
+  <property name="src"           location="src"/>
+  <property name="lib"           location="lib"/>
+  <property name="build"         location="build"/>
+  <property name="dist"          location="inkscape"/>
+
+  <!-- Use these settings for Unix -->  
+  <!-- -->
+  <property name="arch"          value=""/>
+  <property name="archutil"      value=""/>
+  <property name="devlibs"       location="/usr"/>
+  <!-- -->
+
+  <!-- Use these settings for the MinGW native compiler -->  
+  <!--
+  <property name="arch"          value="mingw32-"/>
+  <property name="archutil"      value=""/>
+  <property name="devlibs"       location="c:/devlibs"/>
+  -->
+
+  <!-- Use these settings for the MinGW cross compiler -->  
+  <!--
+  <property name="arch"          value="i686-pc-mingw32-"/>
+  <property name="archutil"      value="${arch}"/>
+  <property name="gtk"           location="/target"/>
+  -->
+
+  <!-- Extra properties -->  
+  <property name="refresh"       value="false"/>
+
+  <!--
+    This is for package-config.  With these two settings, pkg-config
+    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="${devlibs}/lib/pkgconfig"/>
+  <property name="pkg-config-prefix" location="${devlibs}"/>
+
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    I N I T
+  ########################################################################
+  -->
+  <target name="init"
+      description=
+      "Do all preparatory tasks, like make directories and copy files">
+
+
+    <mkdir dir="${build}"/>
+    <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>
+    <makefile file="config.h">
+        #ifndef _CONFIG_H_
+        #define _CONFIG_H_
+
+        /*######################################
+        ## This is for require-config.h, whose
+        ## purpose I cannot fathom.
+        ######################################*/
+        
+        #define PACKAGE_TARNAME
+
+        /*######################################
+        #### RESOURCE DIRECTORIES
+        ######################################*/
+
+        #define INKSCAPE_DATADIR       "."
+        #define PACKAGE_LOCALE_DIR     "locale"
+
+
+        /*######################################
+        #### OTHER DEFINITIONS
+        ######################################*/
+
+        #define GETTEXT_PACKAGE "inkscape"
+
+        #define PACKAGE_STRING                VERSION
+
+        #define HAVE_GETOPT_H                 1
+        #define HAVE_STRING_H                 1
+        #define HAVE_LIBINTL_H                1
+        #define HAVE_MALLOC_H                 1
+        #define HAVE_STDLIB_H                 1
+        #define HAVE_SYS_STAT_H               1
+        #define HAVE_INTTYPES_H               1
+        #define HAVE_ZLIB_H                   1
+
+        #define ENABLE_LCMS                   1
+
+        #define ENABLE_NLS                    1
+        #define HAVE_BIND_TEXTDOMAIN_CODESET  1
+
+        /* make us relocatable */
+        #define BR_PTHREADS                   1
+        #define ENABLE_BINRELOC               1
+
+        /* CairoPDF options */
+        #define HAVE_CAIRO_PDF                1
+        #define PANGO_ENABLE_ENGINE           1
+        #define RENDER_WITH_PANGO_CAIRO       1
+
+        #define HAVE_GTK_WINDOW_FULLSCREEN    1
+        
+        /* internal interpreter */
+        #define WITH_PYTHON                   1
+
+        /* shared whiteboard */
+        #define WITH_INKBOARD                 1
+        #define HAVE_SSL                      1
+        
+        /* use poppler for pdf import? */
+        #define HAVE_POPPLER                  1
+        #define HAVE_POPPLER_CAIRO            1
+
+        /* do we want bitmap manipulation? */
+        #define WITH_IMAGE_MAGICK             1
+
+        /* Allow reading WordPerfect? */
+        #define WITH_LIBWPG                   1
+
+        #endif /* _CONFIG_H_ */
+    </makefile>
+  </target>
+
+
+
+  <!--
+  ########################################################################
+  ## 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 aboutdialog.cpp">
+    <!-- not good <touch file="${src}/ui/dialog/aboutdialog.cpp"/> -->
+    <!-- better -->
+    <delete file="${build}/obj/ui/dialog/aboutdialog.o"/>
+  </target>
+
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    C O M P I L E
+  ########################################################################
+  -->
+  <target name="compile" depends="init"
+        description="compile the source to .o" >
+
+    <!-- Compile from source to build -->
+    <cc cc="${arch}gcc" cxx="${arch}g++"
+             destdir="${build}/obj"
+			 continueOnError="false"
+			 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="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"/>
+            <exclude name="extension/dxf2svg/.*"/>
+            <exclude name="extension/implementation/plugin.cpp"/>
+            <exclude name="extension/script/bindtest.cpp"/>
+            <exclude name="extension/script/cpptest.cpp"/>
+            <exclude name="extension/plugin/.*"/>
+            <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-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"/>
+            <exclude name="libnr/nr-rotate-test.cpp"/>
+            <exclude name="libnr/nr-scale-test.cpp"/>
+            <exclude name="libnr/nr-translate-test.cpp"/>
+            <exclude name="libnr/nr-types-test.cpp"/>
+            <exclude name="livarot/Path-test.cpp"/>
+            <exclude name="mod360-test.cpp"/>
+            <exclude name="trace/potrace/potest.cpp"/>
+            <exclude name="round-test.cpp"/>
+            <exclude name="sp-gradient-test.cpp"/>
+            <exclude name="svg/ftos.cpp"/>
+            <exclude name="svg/test-svg.cpp"/>
+            <exclude name="svg/test-svg-main.cpp"/>
+            <exclude name="utest/.*"/>
+            <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="io/streamtest.cpp"/>
+            <!--JABBER-->
+            <exclude name="pedro/pedrogui.cpp"/>
+            <exclude name="pedro/pedrogui.h"/>
+            <exclude name="pedro/work/.*"/>
+            <!--WHITEBOARD-->
+            <exclude name="ui/dialog/session-player.cpp"/>
+            <exclude name="ui/dialog/whiteboard-connect.cpp"/>
+            <exclude name="ui/dialog/whiteboard-sharewithchat.cpp"/>
+            <exclude name="ui/dialog/whiteboard-sharewithuser.cpp"/>
+            <exclude name="dialogs/whiteboard-connect-dialog.cpp"/>
+            <exclude name="dialogs/whiteboard-common-dialog.cpp"/>
+            <exclude name="dialogs/whiteboard-sharewithchat-dialog.cpp"/>
+            <exclude name="dialogs/whiteboard-sharewithuser-dialog.cpp"/>
+            <exclude name="jabber_whiteboard/node-tracker.cpp"/>
+            <exclude name="jabber_whiteboard/node-utilities.cpp"/>
+            <!--OVERLAP-->
+            <exclude name="removeoverlap/placement_SolveVPSC.cpp"/>
+            <exclude name="removeoverlap/placement_SolveVPSC.h"/>
+            <exclude name="removeoverlap/test.cpp"/>
+            <exclude name="removeoverlap/remove_rectangle_overlap-test.cpp"/>
+            <exclude name="removeoverlap/remove_rectangle_overlap-test.h"/>
+            <!--WIN32 -->
+            <exclude name="registrytool.cpp"/>
+            <exclude name="extension/internal/win32.cpp"/>
+            <exclude name="libgdl/gdl-win32.c"/>
+        </fileset>
+        <excludeinc dir="${src}">
+            <file name="extension/param"/>
+        </excludeinc>
+        <flags>
+            -Wall -Wformat -Werror=format-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
+            -O2
+            -mms-bitfields
+        </flags>
+        <defines>
+            -DVERSION=\"${version}\"
+            -DHAVE_CONFIG_H
+            -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 -->
+        </defines>
+        <includes>
+            -I${devlibs}/include
+            <!-- GTK / GTKMM -->
+            ${pcc.gtkmm-2.4}
+            <!-- OTHER -->
+            -I${devlibs}/include/libxml2 
+            -I${devlibs}/include/freetype2
+            -I${devlibs}/include/cairo
+            -I${devlibs}/include/poppler
+            -I${devlibs}/include/gc
+            -I${devlibs}/include/libwpg-0.1
+            -I${devlibs}/include/libwpd-0.8
+            <!-- PERL -->
+            <!-- -Wno-comment -I${devlibs}/perl/lib/CORE -->
+            <!-- PYTHON -->
+            -I${devlibs}/python/include
+            <!-- JAVA -->
+            -I${src}/bind/javainc -I${src}/bind/javainc/linux
+        </includes>
+    </cc>
+  </target>
+  
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    L I B
+  ########################################################################
+  -->
+  <target name="lib" depends="compile"
+      description="create a static library">
+    <staticlib command="${archutil}ar crsv"
+           file="${build}/libinkscape.a">
+       <fileset dir="${build}/obj">
+           <exclude name="main.o"/>
+           <exclude name="winmain.o"/>
+           <exclude name="inkview.o"/>
+       </fileset>
+    </staticlib>
+  </target>
+
+
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    I 1 8 N
+  ########################################################################
+  -->
+  <target name="i18n" depends="compile"
+      description="compile gettext .po files to .mo">
+
+    <msgfmt todir="${build}/locale" owndir="true"
+         out="LC_MESSAGES/inkscape.mo">
+       <fileset dir="po">
+       </fileset>
+    </msgfmt>
+  </target>
+
+
+
+
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    L I N K
+  ########################################################################
+  -->
+  <target name="link" depends="lib"
+      description="link objects and library to create executable">
+
+    <link command="${arch}g++" out="${build}/inkscape"
+              strip="true" symfile="${build}/inkscape.dbg"
+              stripcommand="${archutil}strip"
+              objcopycommand="${archutil}objcopy">
+       <flags>
+       </flags>
+       <fileset dir="${build}">
+           <include name="obj/main.o"/>
+           <include name="libinkscape.a"/>
+       </fileset>
+       <libs>
+          -L${devlibs}/lib
+           ${pcl.poppler} ${pcl.poppler-cairo} ${pcl.poppler-glib}
+           ${pcl.gtkmm-2.4}
+           ${pcl.cairo} ${pcl.cairomm-1.0}
+           ${pcl.gthread-2.0}
+           -lxml2 -lxslt
+           -lwpg-0.1 -lwpg-stream-0.1
+           ${pcl.ImageMagick++}
+           ${pcl.fontconfig} ${pcl.freetype2}
+           ${pcl.lcms}
+           ${pcl.gsl}
+           -lssl -lcrypto
+           -lpng -ljpeg -ltiff -lpopt -lz
+           -lgc
+	   -lm
+           <!-- 2geom -->
+           <!-- -l2geom -->
+       </libs>
+    </link>
+  </target>
+  
+
+
+
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    L I N K I N K V I E W
+  ########################################################################
+  -->
+  <target name="linkinkview" depends="lib"
+        description="link objects and library to create Inkview executable">
+
+    <link command="${arch}g++" out="${build}/inkview"
+              strip="true" symfile="${build}/inkview.dbg"
+              stripcommand="${archutil}strip"
+              objcopycommand="${archutil}objcopy">
+       <flags>
+       </flags>
+       <fileset dir="${build}">
+           <include name="obj/inkview.o"/>
+           <include name="libinkscape.a"/>
+       </fileset>
+       <libs>
+           -L${devlibs}/lib
+           ${pcl.poppler}
+           ${pcl.gtkmm-2.4}
+           ${pcl.cairo} ${pcl.cairomm-1.0}
+           <!-- PERL -->
+           -L${devlibs}/perl/lib/CORE -lperl58
+           <!-- PYTHON -->
+           -L${devlibs}/python/libs -lpython25
+           -lxml2 -lxslt
+           -lwpg-0.1 -lwpg-stream-0.1
+           ${pcl.ImageMagick++}
+           ${pcl.fontconfig} ${pcl.freetype2}
+           ${pcl.lcms}
+           -lssl -lcrypto
+           -lpng -ljpeg -ltiff -lpopt -lz
+           -lgc
+	   -lintl -liconv -lm
+       </libs>
+    </link>
+  </target>
+
+
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    D I S T
+  ########################################################################
+  -->
+  <target name="dist" depends="link,i18n"
+      description="generate the distribution directory with all needed files">
+
+    <!-- Create the distribution directory -->
+    <copy file="${build}/inkscape" 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="${devlibs}/bin/libatkmm-1.6-1.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libglibmm-2.4-1.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libgtkmm-2.4-1.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libgdkmm-2.4-1.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libpangomm-1.4-1.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libcairomm-1.0-1.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libsigc-2.0-0.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/freetype6.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libatk-1.0-0.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libgdk-win32-2.0-0.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libgdk_pixbuf-2.0-0.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libglib-2.0-0.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libgmodule-2.0-0.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libgobject-2.0-0.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libgtk-win32-2.0-0.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libgthread-2.0-0.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libcairo-2.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libpoppler-3.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libpangocairo-1.0-0.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libpango-1.0-0.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libpangoft2-1.0-0.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libpangowin32-1.0-0.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/freetype6.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libfontconfig-1.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libxml2.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libxslt.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libexpat.dll" todir="${dist}"/>
+    <!--<copy file="${devlibs}/bin/libexpat.dll" tofile="${dist}/xmlparse.dll"/>-->
+    <copy file="${devlibs}/bin/libwpg-0.1.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libwpg-stream-0.1.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libwpd-0.8.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libwpd-stream-0.8.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/jpeg62.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libpng13.dll" todir="${dist}"/>
+    <!-- GTK changed their dep file name for PNG!   :-(  -->
+    <copy file="${devlibs}/bin/libpng13.dll" tofile="${dist}/libpng12-0.dll"/>
+    <copy file="${devlibs}/bin/libtiff3.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/msvcr70.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/msvcr71.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/zlib1.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/iconv.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/libpopt-0.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/liblcms-1.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/intl.dll" todir="${dist}"/>
+    <copy file="${devlibs}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>
+
+    <!-- MSGFMT files -->
+    <copy todir="${dist}">
+        <fileset dir="${build}/locale">
+          <exclude name=".*\.am"/>
+        </fileset>
+    </copy>
+
+    <!-- GTK -->
+    <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}/lib"> <fileset dir="${devlibs}/lib/locale"/> </copy>
+    <copy todir="${dist}">
+        <fileset dir="share">
+          <exclude name=".*\.am"/>
+        </fileset>
+    </copy>
+    <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/themes"/> </copy>
+    <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/poppler"/> </copy>
+    <mkdir dir="${dist}/data"/>
+    <mkdir dir="${dist}/locale"/>
+    <mkdir dir="${dist}/modules"/>
+    <mkdir dir="${dist}/plugins"/>
+    <copy file="${devlibs}/bin/gdb.exe" todir="${dist}"/>
+
+    <!-- Necessary to run extensions on windows if it is not in the path -->
+    <copy file="${devlibs}/bin/gspawn-win32-helper.exe" todir="${dist}"/>
+    <copy file="${devlibs}/bin/gspawn-win32-helper-console.exe" todir="${dist}"/>
+
+    <!-- PERL -->
+    <copy file="${devlibs}/perl/bin/perl58.dll" todir="${dist}"/>
+
+    <!-- PYTHON -->
+    <copy file="${devlibs}/python/python25.dll" todir="${dist}"/>
+    <copy file="${devlibs}/python/python.exe" todir="${dist}/python"/>
+    <copy file="${devlibs}/python/pythonw.exe" todir="${dist}/python"/>
+    <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
+
+    # enable/disable images in menus. most "stock" microsoft apps don't use these, except sparingly.
+    # the office apps use them heavily, though.
+    gtk-menu-images = 1
+
+    # use the win32 button ordering instead of the GNOME HIG one, where applicable
+    gtk-alternative-button-order = 1
+
+    style "msw-default"
+    {
+      GtkWidget::interior-focus = 1
+      GtkOptionMenu::indicator-size = { 9, 5 }
+      GtkOptionMenu::indicator-spacing = { 7, 5, 2, 2 }
+      GtkSpinButton::shadow-type = in
+
+      # Owen and I disagree that these should be themable
+      #GtkUIManager::add-tearoffs = 0
+      #GtkComboBox::add-tearoffs = 0
+
+      GtkComboBox::appears-as-list = 1
+      GtkComboBox::focus-on-click = 0
+
+      GOComboBox::add_tearoffs = 0
+
+      GtkTreeView::allow-rules = 0
+      GtkTreeView::expander-size = 12
+
+      GtkExpander::expander-size = 12
+
+      GtkScrolledWindow::scrollbar_spacing = 1
+
+      GtkSeparatorMenuItem::horizontal-padding = 2
+
+      engine "wimp"
+      {
+      }
+    }
+    class "*" style "msw-default"
+    </makefile>
+
+  </target>
+
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    JAVAC
+  ########################################################################
+  -->
+  <target name="javac" depends="init"
+      description="compile java binding classes">
+    <javac srcdir="${src}/bind/java" destdir="${build}/java/classes"/>
+  </target>
+
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    JAR
+  ########################################################################
+  -->
+  <target name="jar" depends="javac"
+      description="pack java classes and resources into a jar file">
+    <copy todir="${build}/java/classes"> <fileset dir="${devlibs}/bind/data"/> </copy>
+    <jar basedir="${build}/java/classes" destfile="${build}/java/lib/inkscape.jar"/>
+  </target>
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    BINDDIST
+  ########################################################################
+  -->
+  <target name="binddist" depends="jar"
+      description="pack java classes and resources into a jar file">
+    <copy todir="${dist}/share/bind"> <fileset dir="${devlibs}/bind/java"/> </copy>
+    <copy todir="${dist}/share/bind/java"> <fileset dir="${build}/java/lib"/> </copy>
+
+  </target>
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    BINDCLEAN
+  ########################################################################
+  -->
+  <target name="bindclean" depends=""
+      description="clean up java binding classes">
+        <delete dir="${build}/java"/>
+  </target>
+
+
+
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    D I S T - A L L
+  ########################################################################
+  -->
+  <target name="dist-all" depends="dist"
+        description="generate the distribution, along with inkview" >
+
+    <copy file="${build}/inkview.exe" todir="${dist}"/>
+    <copy file="${build}/inkview.dbg" todir="${dist}"/>
+  </target>
+
+
+
+
+
+  <!--
+  ########################################################################
+  ## T A R G E T    :    C L E A N
+  ########################################################################
+  -->
+  <target name="clean" depends="bindclean"
+        description="clean up.  deleting build and distro dirs" >
+
+    <delete dir="${build}"/>
+    <delete dir="${dist}"/>
+    <delete file="build.dep"/>
+    <delete file="config.h"/>
+
+  </target>
+
+
+
+</project>
+<!--
+########################################################################
+## E N D
+########################################################################
+-->
+
diff --git a/buildtool.cpp b/buildtool.cpp
index 53f3fc957..bc6da92d3 100644
--- a/buildtool.cpp
+++ b/buildtool.cpp
@@ -4130,7 +4130,7 @@ bool MakeBase::executeCommand(const String &command,
     bool outOpen = true;
     bool errOpen = true;
 
-    while (outOpen && errOpen)
+    while (outOpen || errOpen)
         {
         char ch;
         fd_set fdset;
@@ -4144,14 +4144,18 @@ bool MakeBase::executeCommand(const String &command,
             break;
         if (FD_ISSET(outRead, &fdset))
             {
-            if (read(outRead, &ch, 1) <= 0 || ch <= 0)
+            if (read(outRead, &ch, 1) <= 0)
+                outOpen = false;
+            else if (ch <= 0)
                 outOpen = false;
             else
                 outb.push_back(ch);
             }
         if (FD_ISSET(errRead, &fdset))
             {
-            if (read(errRead, &ch, 1) <= 0 || ch <= 0)
+            if (read(errRead, &ch, 1) <= 0)
+                errOpen = false;
+            else if (ch <= 0)
                 errOpen = false;
             else
                 errb.push_back(ch);