[glom] Update Windows installer for Glom 1.14

[Armin Burgmeier <arminb src gnome org>]

commit 2396137418ebd6703af226fda22530483c9424e3
Author: Armin Burgmeier <armin arbur net>
Date:   Fri Apr 9 17:13:24 2010 +0200

    Update Windows installer for Glom 1.14
    
    2010-04-09  Armin Burgmeier  <armin arbur net>
    
    	* win32/build-installer:
    	* win32/glom.iss.in: Update for Glom 1.14.

 ChangeLog             |    5 +++++
 win32/build-installer |   24 ++++++++++++++----------
 win32/glom.iss.in     |   15 +++++++++------
 3 files changed, 28 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3b43f07..315e1c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-04-09  Armin Burgmeier  <armin arbur net>
 
+	* win32/build-installer:
+	* win32/glom.iss.in: Update for Glom 1.14.
+
+2010-04-09  Armin Burgmeier  <armin arbur net>
+
 	* Makefile.am: Do not install .desktop file on Windows.
 
 2010-04-08  Daniel Borgmann  <danielb openismus com>
diff --git a/win32/build-installer b/win32/build-installer
index bbd6164..292a690 100755
--- a/win32/build-installer
+++ b/win32/build-installer
@@ -48,9 +48,9 @@ cp /bundle/bin/libfontconfig-1.dll installer/bin || exit
 cp /bundle/bin/libexpat-1.dll installer/bin || exit
 cp /bundle/bin/freetype6.dll installer/bin || exit
 cp /bundle/bin/libcairo-2.dll installer/bin || exit
-cp /bundle/bin/libpng12-0.dll installer/bin || exit
-cp /bundle/bin/libjpeg-7.dll installer/bin || exit
-cp /bundle/bin/libtiff-3.dll installer/bin || exit
+cp /bundle/bin/libpng14-14.dll installer/bin || exit
+#cp /bundle/bin/libjpeg-7.dll installer/bin || exit
+#cp /bundle/bin/libtiff-3.dll installer/bin || exit
 
 cp /bundle/bin/libpango-1.0-0.dll installer/bin || exit
 cp /bundle/bin/libpangoft2-1.0-0.dll installer/bin || exit
@@ -91,7 +91,10 @@ cp /local/bin/libgdamm-4.0-12.dll installer/bin || exit
 #cp /gtkmm_release/bin/libglademm-2.4-1.dll installer/bin || exit
 
 # cp /local/bin/libbakery-2.6--6-1.dll installer/bin || exit
-cp /local/bin/libglom-1.12-0.dll installer/bin || exit
+# TODO: Can we build boost so that mingwm10.dll is not required? Maybe try static C runtime linkage
+cp /mingw/bin/mingwm10.dll installer/bin || exit
+cp /boost/lib/boost_python-mgw34-mt-1_42.dll installer/bin || exit
+cp /local/bin/libglom-1.14-0.dll installer/bin || exit
 
 echo "Stripping DLL files..."
 strip installer/bin/*.dll || exit
@@ -101,7 +104,8 @@ strip installer/bin/*.exe || exit
 # We therefore copy them after having stripped the rest. Same with the other
 # Perhaps those were built with MSVC.
 cp /bundle/bin/intl.dll installer/bin || exit
-cp /bundle/bin/iconv.dll installer/bin || exit
+# TODO: iconv no longer required with new libxml2-2.dll
+cp iconv.dll installer/bin || exit
 cp /bundle/bin/zlib1.dll installer/bin || exit
 
 echo "Copying Python..."
@@ -119,8 +123,8 @@ cp $PYTHONDIR/Lib/*.py installer/python || exit
 mkdir -p installer/python/encodings || exit
 cp $PYTHONDIR/Lib/encodings/*.py installer/python/encodings || exit
 
-cp $PYTHONDIR/Lib/site-packages/glom_1_12.pyd installer/python || exit
-strip installer/python/glom_1_12.pyd || exit
+cp $PYTHONDIR/Lib/site-packages/glom_1_14.pyd installer/python || exit
+strip installer/python/glom_1_14.pyd || exit
 cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gda.pyd installer/python || exit
 strip installer/python/gda.pyd || exit
 
@@ -153,9 +157,9 @@ mkdir -p installer/lib/gtk-2.0/2.10.0/engines || exit
 cp /bundle/lib/gtk-2.0/2.10.0/engines/libwimp.dll installer/lib/gtk-2.0/2.10.0/engines || exit
 strip installer/lib/gtk-2.0/2.10.0/engines/libwimp.dll || exit
 
-mkdir -p installer/lib/gtk-2.0/2.10.0/loaders || exit
-cp /bundle/lib/gtk-2.0/2.10.0/loaders/*.dll installer/lib/gtk-2.0/2.10.0/loaders || exit
-strip installer/lib/gtk-2.0/2.10.0/loaders/*.dll || exit
+#mkdir -p installer/lib/gtk-2.0/2.10.0/loaders || exit
+#cp /bundle/lib/gtk-2.0/2.10.0/loaders/*.dll installer/lib/gtk-2.0/2.10.0/loaders || exit
+#strip installer/lib/gtk-2.0/2.10.0/loaders/*.dll || exit
 
 mkdir -p installer/etc/gtk-2.0
 cp /bundle/etc/gtk-2.0/gtk.immodules installer/etc/gtk-2.0 || exit -1
diff --git a/win32/glom.iss.in b/win32/glom.iss.in
index 7fb06dc..784c4e5 100644
--- a/win32/glom.iss.in
+++ b/win32/glom.iss.in
@@ -35,13 +35,14 @@ Name: "{userprograms}\{groupname}\Uninstall Glom"; Filename: "{uninstallexe}"; T
 
 ; GTK+
 Source: "bin\intl.dll"; DestDir: "{app}\bin"; Components: gtk
+; TODO: Remove iconv.dll when libgda uses the new libxml dll
 Source: "bin\iconv.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\zlib1.dll"; DestDir: "{app}\bin"; Components: gtk
-Source: "bin\libpng12-0.dll"; DestDir: "{app}\bin"; Components: gtk
-; TODO: Remove when libgda uses the new libxml dll
+Source: "bin\libpng14-14.dll"; DestDir: "{app}\bin"; Components: gtk
+; TODO: Remove libxml2.dll when libgda uses the new libxml dll
 Source: "bin\libxml2.dll"; DestDir: "{app}\bin"; Components: gtk
-Source: "bin\libjpeg-7.dll"; DestDir: "{app}\bin"; Components: gtk
-Source: "bin\libtiff-3.dll"; DestDir: "{app}\bin"; Components: gtk
+;Source: "bin\libjpeg-7.dll"; DestDir: "{app}\bin"; Components: gtk
+;Source: "bin\libtiff-3.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\libxml2-2.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\libxslt-1.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\libfontconfig-1.dll"; DestDir: "{app}\bin"; Components: gtk
@@ -92,6 +93,8 @@ Source: "bin\libgtksourceviewmm-2.0-2.dll"; DestDir: "{app}\bin"; Components: ma
 Source: "bin\libpangomm-1.4-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libsigc-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libxml++-2.6-2.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\mingwm10.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\boost_python-mgw34-mt-1_42.dll"; DestDir: "{app}\bin"; Components: main
 
 ; Postgres
 Source: "bin/postgres.exe"; DestDir: "{app}/bin"; Components: main
@@ -125,7 +128,7 @@ Source: "python/*.py"; DestDir: "{app}\bin"; Components: python; Flags: recurses
 Source: "python/*.pyd"; DestDir: "{app}\bin"; Components: python; Flags: recursesubdirs
 
 ; Glom executables
-Source: "bin\libglom-1.12-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libglom-1.14-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\Glom.exe"; DestDir: "{app}\bin"; Components: main
 
 ; Modules
@@ -134,7 +137,7 @@ Source: "bin\Glom.exe"; DestDir: "{app}\bin"; Components: main
 
 Source: "lib/gtk-2.0/2.10.0/engines/*"; DestDir: "{app}/lib/gtk-2.0/2.10.0/engines"; Components: gtk
 
-Source: "lib/gtk-2.0/2.10.0/loaders/*"; DestDir: "{app}/lib/gtk-2.0/2.10.0/loaders"; Components: gtk
+;Source: "lib/gtk-2.0/2.10.0/loaders/*"; DestDir: "{app}/lib/gtk-2.0/2.10.0/loaders"; Components: gtk
 Source: "etc/gtk-2.0/gdk-pixbuf.loaders"; DestDir: "{app}\etc\gtk-2.0"; Components: gtk;
 
 ;Source: "lib/pango/1.6.0/modules/*"; DestDir: "{app}/lib/pango/1.6.0/modules"; Components: gtk;