glom r1653 - in trunk: . win32

From: arminb svn gnome org
To: svn-commits-list gnome org
Subject: glom r1653 - in trunk: . win32
Date: Tue, 5 Aug 2008 09:46:01 +0000 (UTC)
Author: arminb
Date: Tue Aug  5 09:46:01 2008
New Revision: 1653
URL: http://svn.gnome.org/viewvc/glom?rev=1653&view=rev

Log:
2008-08-05  Armin Burgmeier  <armin openismus com>

	* win32/build-installer:
	* win32/glom.iss.in:
	* win32/querymodules.bat: Updated to fit my new build setup. 


Modified:
   trunk/ChangeLog
   trunk/win32/build-installer
   trunk/win32/glom.iss.in
   trunk/win32/querymodules.bat

Modified: trunk/win32/build-installer
==============================================================================
--- trunk/win32/build-installer	(original)
+++ trunk/win32/build-installer	Tue Aug  5 09:46:01 2008
@@ -4,6 +4,10 @@
 echo "You need to have python, pygobject, pycairo and pygtk installed into C:\\Python25"
 echo "Make sure glom and all its dependencies have been installed correctly to /local"
 
+# TODO: Let configure replace @pyexecdir@ to get the correct python path?
+PYTHONDIR=/c/Python25
+POSTGRESDIR=/c/postgres
+
 echo "Cleanup..."
 if test -e installer; then
   rm installer -Rf || exit;
@@ -13,51 +17,51 @@
 
 echo "Copying DLL files..."
 
-# TODO: Built everything required myself, drop some redundant dependencies
-# such as intl.dll vs. libintl-8.dll
 mkdir -p installer/bin
 
-cp /local/bin/libintl-8.dll installer/bin || exit
-cp /local/bin/libgettextpo-0.dll installer/bin || exit
-
-cp /local/bin/libglib-2.0-0.dll installer/bin || exit
-cp /local/bin/libgio-2.0-0.dll installer/bin || exit
-cp /local/bin/libgmodule-2.0-0.dll installer/bin || exit
-cp /local/bin/libgobject-2.0-0.dll installer/bin || exit
-cp /local/bin/libgthread-2.0-0.dll installer/bin || exit
+#cp /local/bin/libintl-8.dll installer/bin || exit
+cp /bin/libgettextpo-0.dll installer/bin || exit
+# TODO: There are no usable libxslt Windows binaries, therefore I built this myself:
+cp /local/bin/libxslt-1.dll installer/bin || exit
+
+cp /bin/libglib-2.0-0.dll installer/bin || exit
+cp /bin/libgio-2.0-0.dll installer/bin || exit
+cp /bin/libgmodule-2.0-0.dll installer/bin || exit
+cp /bin/libgobject-2.0-0.dll installer/bin || exit
+cp /bin/libgthread-2.0-0.dll installer/bin || exit
 
-cp /local/bin/gspawn-win32-helper.exe installer/bin || exit
-cp /local/bin/gspawn-win32-helper-console.exe installer/bin || exit
+cp /bin/gspawn-win32-helper.exe installer/bin || exit
+cp /bin/gspawn-win32-helper-console.exe installer/bin || exit
 
-# TODO: Build myself
 cp /bin/libatk-1.0-0.dll installer/bin || exit
 cp /bin/libcairo-2.dll installer/bin || exit
-cp /bin/libgnome-2-0.dll installer/bin || exit
-cp /bin/libpng13.dll installer/bin || exit
+#cp /bin/libgnome-2-0.dll installer/bin || exit
+cp /bin/libpng12-0.dll installer/bin || exit
 cp /bin/jpeg62.dll installer/bin || exit
 cp /bin/libtiff3.dll installer/bin || exit
-cp /bin/libpopt-0.dll installer/bin || exit
+#cp /bin/libpopt-0.dll installer/bin || exit
+
+cp /bin/libpango-1.0-0.dll installer/bin || exit
+cp /bin/libpangocairo-1.0-0.dll installer/bin || exit
+cp /bin/libpangowin32-1.0-0.dll installer/bin || exit
+
+cp /bin/libgdk-win32-2.0-0.dll installer/bin || exit
+cp /bin/libgdk_pixbuf-2.0-0.dll installer/bin || exit
 
-cp /local/bin/libpango-1.0-0.dll installer/bin || exit
-cp /local/bin/libpangocairo-1.0-0.dll installer/bin || exit
-cp /local/bin/libpangowin32-1.0-0.dll installer/bin || exit
-
-cp /local/bin/libgdk-win32-2.0-0.dll installer/bin || exit
-cp /local/bin/libgdk_pixbuf-2.0-0.dll installer/bin || exit
-
-cp /local/bin/libgtk-win32-2.0-0.dll installer/bin || exit
-cp /local/bin/libgtksourceview-2.0-0.dll installer/bin || exit
-
-cp /local/bin/libORBit-2-0.dll installer/bin || exit
-cp /local/bin/libORBitCosNaming-2-0.dll installer/bin || exit
-cp /local/bin/libORBit-imodule-2-0.dll installer/bin || exit
-cp /local/bin/libbonobo-2-0.dll installer/bin || exit
-cp /local/bin/libbonobo-activation-4.dll installer/bin || exit
+cp /bin/libgtk-win32-2.0-0.dll installer/bin || exit
+cp /bin/libgtksourceview-2.0-0.dll installer/bin || exit
 
+cp /bin/libORBit-2-0.dll installer/bin || exit
+cp /bin/libORBitCosNaming-2-0.dll installer/bin || exit
+cp /bin/libORBit-imodule-2-0.dll installer/bin || exit
+#cp /local/bin/libbonobo-2-0.dll installer/bin || exit
+#cp /local/bin/libbonobo-activation-4.dll installer/bin || exit
+
+# TODO: I compiled this myself since we needed the version from SVN:
 cp /local/bin/libglade-2.0-0.dll installer/bin || exit
-cp /local/bin/libgconf-2-4.dll installer/bin || exit
-cp /local/bin/libgnomevfs-2-0.dll installer/bin || exit
-cp /local/bin/libgoocanvas-3.dll installer/bin || exit
+cp /bin/libgconf-2-4.dll installer/bin || exit
+#cp /local/bin/libgnomevfs-2-0.dll installer/bin || exit
+cp /bin/libgoocanvas-3.dll installer/bin || exit
 
 cp /local/bin/libgda-3.0-2.dll installer/bin || exit
 cp /local/bin/libgdasql-3.0-2.dll installer/bin || exit
@@ -65,20 +69,21 @@
 
 cp /local/bin/libsigc-2.0-0.dll installer/bin || exit
 cp /local/bin/libglibmm-2.4-1.dll installer/bin || exit
+cp /local/bin/libgiomm-2.4-1.dll installer/bin || exit
 cp /local/bin/libatkmm-1.6-1.dll installer/bin || exit
 cp /local/bin/libcairomm-1.0-1.dll installer/bin || exit
 cp /local/bin/libpangomm-1.4-1.dll installer/bin || exit
 cp /local/bin/libgdkmm-2.4-1.dll installer/bin || exit
 cp /local/bin/libxml++-2.6-2.dll installer/bin || exit
 cp /local/bin/libgtkmm-2.4-1.dll installer/bin || exit
-
-cp /local/bin/libgtksourceviewmm-2.0-1.dll installer/bin || exit
+cp /local/bin/libgtksourceviewmm-2.0-2.dll installer/bin || exit
+cp /local/bin/libgoocanvasmm-0.1-2.dll installer/bin || exit
 cp /local/bin/libgconfmm-2.6-1.dll installer/bin || exit
-cp /local/bin/libgdamm-3.0-8.dll installer/bin || exit
+cp /local/bin/libgdamm-3.0-10.dll installer/bin || exit
 cp /local/bin/libglademm-2.4-1.dll installer/bin || exit
-cp /local/bin/libgnomevfsmm-2.6-1.dll installer/bin || exit
+#cp /local/bin/libgnomevfsmm-2.6-1.dll installer/bin || exit
 
-cp /local/bin/libbakery-2.4-2-4-1.dll installer/bin || exit
+cp /local/bin/libbakery-2.6--5-1.dll installer/bin || exit
 cp /local/bin/libglom-0.dll installer/bin || exit
 
 echo "Stripping DLL files..."
@@ -103,59 +108,59 @@
 
 # TODO: Perhaps some scripts need more python modules.
 # TODO: Let configure replace @pyexecdir@ to get the correct python path?
-cp /c/Python25/Lib/*.py installer/python || exit
+cp $PYTHONDIR/Lib/*.py installer/python || exit
 
 mkdir -p installer/python/encodings || exit
-cp /c/Python25/Lib/encodings/*.py installer/python/encodings || exit
+cp $PYTHONDIR/Lib/encodings/*.py installer/python/encodings || exit
 
-cp /c/Python25/Lib/site-packages/glom.pyd installer/python || exit
+cp $PYTHONDIR/Lib/site-packages/glom.pyd installer/python || exit
 strip installer/python/glom.pyd || exit
-cp /c/Python25/Lib/site-packages/gtk-2.0/gda.pyd installer/python || exit
+cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gda.pyd installer/python || exit
 strip installer/python/gda.pyd || exit
 
-cp /c/Python25/Lib/site-packages/pygtk.py installer/python || exit
-cp /c/Python25/Lib/site-packages/gtk-2.0/*.pyd installer/python || exit
+cp $PYTHONDIR/Lib/site-packages/pygtk.py installer/python || exit
+cp $PYTHONDIR/Lib/site-packages/gtk-2.0/*.pyd installer/python || exit
 
 mkdir -p installer/python/gobject || exit
-cp /c/Python25/Lib/site-packages/gtk-2.0/gobject/*.py installer/python/gobject || exit
-cp /c/Python25/Lib/site-packages/gtk-2.0/gobject/*.pyd installer/python/gobject || exit
+cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gobject/*.py installer/python/gobject || exit
+cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gobject/*.pyd installer/python/gobject || exit
 
 mkdir -p installer/python/cairo || exit
-cp /c/Python25/Lib/site-packages/cairo/*.py installer/python/cairo || exit
-cp /c/Python25/Lib/site-packages/cairo/*.pyd installer/python/cairo || exit
+cp $PYTHONDIR/Lib/site-packages/cairo/*.py installer/python/cairo || exit
+cp $PYTHONDIR/Lib/site-packages/cairo/*.pyd installer/python/cairo || exit
 
 mkdir -p installer/python/gtk || exit
-cp /c/Python25/Lib/site-packages/gtk-2.0/gtk/*.py installer/python/gtk || exit
-cp /c/Python25/Lib/site-packages/gtk-2.0/gtk/*.pyd installer/python/gtk || exit
+cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gtk/*.py installer/python/gtk || exit
+cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gtk/*.pyd installer/python/gtk || exit
 
 echo "Copying modules..."
 
-# TODO: Let configure replace @pyexecdir@ to get the correct python path
-cp /c/Python25/Lib/site-packages/glom.pyd installer/bin || exit
-cp /c/Python25/Lib/site-packages/gtk-2.0/gda.pyd installer/bin || exit
+cp $PYTHONDIR/Lib/site-packages/glom.pyd installer/bin || exit
+cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gda.pyd installer/bin || exit
 strip installer/bin/*.pyd || exit
 
 mkdir -p installer/lib/gtk-2.0/2.10.0/immodules || exit
-cp /local/lib/gtk-2.0/2.10.0/immodules/*.dll installer/lib/gtk-2.0/2.10.0/immodules || exit
+cp /lib/gtk-2.0/2.10.0/immodules/*.dll installer/lib/gtk-2.0/2.10.0/immodules || exit
 strip installer/lib/gtk-2.0/2.10.0/immodules/*.dll || exit
-cp /local/bin/gtk-query-immodules-2.0.exe installer || exit
+cp /bin/gtk-query-immodules-2.0.exe installer || exit
 
 mkdir -p installer/lib/gtk-2.0/2.10.0/engines || exit
-cp /local/lib/gtk-2.0/2.10.0/engines/libwimp.dll installer/lib/gtk-2.0/2.10.0/engines || exit
+cp /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 /local/lib/gtk-2.0/2.10.0/loaders/*.dll installer/lib/gtk-2.0/2.10.0/loaders || exit
+cp /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
-cp /local/bin/gdk-pixbuf-query-loaders.exe installer || exit
+cp /bin/gdk-pixbuf-query-loaders.exe installer || exit
 
-mkdir -p installer/lib/pango/1.6.0/modules || exit
-cp /local/lib/pango/1.6.0/modules/*.dll installer/lib/pango/1.6.0/modules || exit
-strip installer/lib/pango/1.6.0/modules/*.dll || exit
-cp /local/bin/pango-querymodules.exe installer || exit
+# TODO: Test whether we can omit this:
+#mkdir -p installer/lib/pango/1.6.0/modules || exit
+#cp /lib/pango/1.6.0/modules/*.dll installer/lib/pango/1.6.0/modules || exit
+#strip installer/lib/pango/1.6.0/modules/*.dll || exit
+#cp /bin/pango-querymodules.exe installer || exit
 
 mkdir -p installer/share/themes || exit
-cp -R /local/share/themes/MS-Windows installer/share/themes || exit
+cp -R /share/themes/MS-Windows installer/share/themes || exit
 mkdir -p installer/etc/gtk-2.0 || exit
 echo "gtk-theme-name = \"MS-Windows\"" > installer/etc/gtk-2.0/gtkrc || exit
 
@@ -163,60 +168,71 @@
 cp /local/lib/libgda-3.0/providers/*.dll installer/lib/libgda-3.0/providers || exit
 strip installer/lib/libgda-3.0/providers/*.dll || exit
 
-mkdir -p installer/lib/gnome-vfs-2.0/modules || exit
-cp /local/lib/gnome-vfs-2.0/modules/*.dll installer/lib/gnome-vfs-2.0/modules || exit
-strip installer/lib/gnome-vfs-2.0/modules/*.dll || exit
+#mkdir -p installer/lib/gnome-vfs-2.0/modules || exit
+#cp /lib/gnome-vfs-2.0/modules/*.dll installer/lib/gnome-vfs-2.0/modules || exit
+#strip installer/lib/gnome-vfs-2.0/modules/*.dll || exit
 
-mkdir -p installer/etc/gnome-vfs-2.0/modules || exit
-cp /local/etc/gnome-vfs-2.0/modules/default-modules.conf installer/etc/gnome-vfs-2.0/modules || exit
+#mkdir -p installer/etc/gnome-vfs-2.0/modules || exit
+#cp /local/etc/gnome-vfs-2.0/modules/default-modules.conf installer/etc/gnome-vfs-2.0/modules || exit
 
 echo "Copying locales..."
 
+# We need to keep the locale files from share/locale in share/locale and those
+# from lib/locale in lib/locale:
+cp /share/locale installer/share -R || exit
 cp /lib/locale installer/lib -R || exit
 cp /local/lib/locale installer/lib -R || exit
 
-find installer/lib/locale/ -type f | grep -v atk10.mo | grep -v gtk20.mo | grep -v bakery.mo | grep -v GConf2.mo | grep -v glib20.mo | grep -v glom.mo | grep -v gnome-vfs-2.0.mo | grep -v gtk20.mo | grep -v gtk20-properties.mo | grep -v gtksourceview-2.0.mo | grep -v libbonobo-2.0.mo | grep -v libgda-3.0.mo | xargs rm
+find installer/lib/locale/ -type f | grep -v atk10.mo | grep -v gtk20.mo | grep -v bakery.mo | grep -v GConf2.mo | grep -v glib20.mo | grep -v glom.mo | grep -v gtk20.mo | grep -v gtk20-properties.mo | grep -v gtksourceview-2.0.mo |  grep -v libgda-3.0.mo | xargs rm
 find installer/lib/locale -type d | xargs rmdir -p --ignore-fail-on-non-empty
 
+find installer/share/locale/ -type f | grep -v atk10.mo | grep -v gtk20.mo | grep -v bakery.mo | grep -v GConf2.mo | grep -v glib20.mo | grep -v glom.mo | grep -v gtk20.mo | grep -v gtk20-properties.mo | grep -v gtksourceview-2.0.mo |  grep -v libgda-3.0.mo | xargs rm
+find installer/share/locale -type d | xargs rmdir -p --ignore-fail-on-non-empty
+
 echo "Copying executable..."
 cp /local/bin/glom.exe installer/bin || exit
 strip installer/bin/glom.exe || exit
 
 echo "Copying postgres..."
 mkdir -p installer/bin || exit
-cp /local/pgsql/bin/postgres.exe installer/bin || exit
-cp /local/pgsql/bin/initdb.exe installer/bin || exit
-cp /local/pgsql/bin/pg_ctl.exe installer/bin || exit
-strip installer/bin/postgres.exe installer/bin/initdb.exe installer/bin/pg_ctl.exe || exit
-
-cp /local/pgsql/lib/libpq.dll installer/bin || exit
-strip installer/bin/libpq.dll || exit
+cp $POSTGRESDIR/bin/postgres.exe installer/bin || exit
+cp $POSTGRESDIR/bin/initdb.exe installer/bin || exit
+cp $POSTGRESDIR/bin/pg_ctl.exe installer/bin || exit
+
+cp $POSTGRESDIR/bin/libpq.dll installer/bin || exit
+# This is required by libpq.dll:
+cp $POSTGRESDIR/bin/libintl3.dll installer/bin || exit
+cp $POSTGRESDIR/bin/libiconv2.dll installer/bin || exit
+cp $POSTGRESDIR/bin/krb5_32.dll installer/bin || exit
+cp $POSTGRESDIR/bin/k5sprt32.dll installer/bin || exit
+cp $POSTGRESDIR/bin/gssapi32.dll installer/bin || exit
+cp $POSTGRESDIR/bin/comerr32.dll installer/bin || exit
 
 mkdir -p installer/share/postgresql || exit
-cp /local/pgsql/share/postgres.bki installer/share/postgresql || exit
-cp /local/pgsql/share/postgres.description installer/share/postgresql || exit
-cp /local/pgsql/share/postgres.shdescription installer/share/postgresql || exit
-cp /local/pgsql/share/conversion_create.sql installer/share/postgresql || exit
-cp /local/pgsql/share/information_schema.sql installer/share/postgresql || exit
-cp /local/pgsql/share/pg_hba.conf.sample installer/share/postgresql || exit
-cp /local/pgsql/share/pg_ident.conf.sample installer/share/postgresql || exit
-cp /local/pgsql/share/postgresql.conf.sample installer/share/postgresql || exit
-cp /local/pgsql/share/sql_features.txt installer/share/postgresql || exit
-cp /local/pgsql/share/system_views.sql installer/share/postgresql || exit
-cp -R /local/pgsql/share/timezone installer/share/postgresql || exit
-cp -R /local/pgsql/share/timezonesets installer/share/postgresql || exit
+cp $POSTGRESDIR/share/postgres.bki installer/share/postgresql || exit
+cp $POSTGRESDIR/share/postgres.description installer/share/postgresql || exit
+cp $POSTGRESDIR/share/postgres.shdescription installer/share/postgresql || exit
+cp $POSTGRESDIR/share/conversion_create.sql installer/share/postgresql || exit
+cp $POSTGRESDIR/share/information_schema.sql installer/share/postgresql || exit
+cp $POSTGRESDIR/share/snowball_create.sql installer/share/postgresql || exit
+cp $POSTGRESDIR/share/system_views.sql installer/share/postgresql || exit
+cp $POSTGRESDIR/share/pg_hba.conf.sample installer/share/postgresql || exit
+cp $POSTGRESDIR/share/pg_ident.conf.sample installer/share/postgresql || exit
+cp $POSTGRESDIR/share/postgresql.conf.sample installer/share/postgresql || exit
+cp $POSTGRESDIR/share/sql_features.txt installer/share/postgresql || exit
+cp -R $POSTGRESDIR/share/timezone installer/share/postgresql || exit
+cp -R $POSTGRESDIR/share/timezonesets installer/share/postgresql || exit
 
 mkdir -p installer/lib/postgresql || exit
-cp /local/pgsql/lib/*.dll installer/lib/postgresql || exit
-strip installer/lib/postgresql/*.dll || exit
+cp $POSTGRESDIR/lib/*.dll installer/lib/postgresql || exit
 # These are not conversion modules
-rm installer/lib/postgresql/libecpg.dll installer/lib/postgresql/libecpg_compat.dll installer/lib/postgresql/libpgtypes.dll installer/lib/postgresql/libpq.dll installer/lib/postgresql/pgevent.dll installer/lib/postgresql/plpgsql.dll || exit
+rm installer/lib/postgresql/libecpg.dll installer/lib/postgresql/libecpg_compat.dll installer/lib/postgresql/libpgtypes.dll installer/lib/postgresql/pgevent.dll installer/lib/postgresql/plpgsql.dll || exit
 
 echo "Copying shared data (glade files, icons, etc.)..."
 
 mkdir -p installer/share/gtksourceview-2.0 || exit
-cp -R /local/share/gtksourceview-2.0/language-specs installer/share/gtksourceview-2.0 || exit
-cp -R /local/share/gtksourceview-2.0/styles installer/share/gtksourceview-2.0 || exit
+cp -R /share/gtksourceview-2.0/language-specs installer/share/gtksourceview-2.0 || exit
+cp -R /share/gtksourceview-2.0/styles installer/share/gtksourceview-2.0 || exit
 
 mkdir -p installer/share/libgda-3.0/dtd
 cp /local/share/libgda-3.0/*.xml installer/share/libgda-3.0/
@@ -225,6 +241,7 @@
 mkdir -p installer/share/glom/glade || exit
 cp /local/share/glom/glade/glom.glade installer/share/glom/glade || exit
 cp /local/share/glom/glade/glom_developer.glade installer/share/glom/glade || exit
+cp -R /local/share/glom/doc installer/share/glom/ || exit
 
 # TODO: /local/share/glom/doc/examples
 # TODO: /local/share/glom/pixmaps (requires correct lookup in glom)
@@ -233,6 +250,12 @@
 mkdir -p installer/share/icons/hicolor/48x48/apps || exit
 cp /local/share/icons/hicolor/48x48/apps/glom.png installer/share/icons/hicolor/48x48/apps || exit
 
+# This is used for the glom icon in the initial dialog. I'm not sure why GTK
+# does not already get it from the icons/ directory, but it took me already
+# long enough to figure out that this works:
+mkdir -p installer/share/pixmaps
+cp /local/share/icons/hicolor/16x16/apps/glom.png installer/share/pixmaps || exit
+
 echo "Creating installer..."
 
 cp glom.iss installer || exit

Modified: trunk/win32/glom.iss.in
==============================================================================
--- trunk/win32/glom.iss.in	(original)
+++ trunk/win32/glom.iss.in	Tue Aug  5 09:46:01 2008
@@ -37,12 +37,11 @@
 Source: "bin\intl.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\iconv.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\zlib1.dll"; DestDir: "{app}\bin"; Components: gtk
-Source: "bin\libintl-8.dll"; DestDir: "{app}\bin"; Components: gtk
-Source: "bin\libpopt-0.dll"; DestDir: "{app}\bin"; Components: gtk
-Source: "bin\libpng13.dll"; DestDir: "{app}\bin"; Components: gtk
+Source: "bin\libpng12-0.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\jpeg62.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\libtiff3.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\libxml2.dll"; DestDir: "{app}\bin"; Components: gtk
+Source: "bin\libxslt-1.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\libglib-2.0-0.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\libgobject-2.0-0.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\libgio-2.0-0.dll"; DestDir: "{app}\bin"; Components: gtk
@@ -63,30 +62,27 @@
 Source: "bin\libORBit-2-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libORBit-imodule-2-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libORBitCosNaming-2-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "bin\libbonobo-2-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "bin\libbonobo-activation-4.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgconf-2-4.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgda-3.0-2.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgda-report-3.0-2.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgdasql-3.0-2.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgettextpo-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libglade-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "bin\libgnome-2-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "bin\libgnomevfs-2-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgoocanvas-3.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgtksourceview-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
 
 Source: "bin\libatkmm-1.6-1.dll"; DestDir: "{app}\bin"; Components: main
-Source: "bin\libbakery-2.4-2-4-1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libbakery-2.6--5-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libcairomm-1.0-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgconfmm-2.6-1.dll"; DestDir: "{app}\bin"; Components: main
-Source: "bin\libgdamm-3.0-8.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libgdamm-3.0-10.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgdkmm-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libglademm-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libglibmm-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
-Source: "bin\libgnomevfsmm-2.6-1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libgiomm-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libgoocanvasmm-0.1-2.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgtkmm-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
-Source: "bin\libgtksourceviewmm-2.0-1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libgtksourceviewmm-2.0-2.dll"; DestDir: "{app}\bin"; Components: main
 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
@@ -96,9 +92,16 @@
 Source: "bin/initdb.exe"; DestDir: "{app}/bin"; Components: main
 Source: "bin/pg_ctl.exe"; DestDir: "{app}/bin"; Components: main
 Source: "bin/libpq.dll"; DestDir: "{app}/bin"; Components: main
+Source: "bin/libintl3.dll"; DestDir: "{app}/bin"; Components: main
+Source: "bin/libiconv2.dll"; DestDir: "{app}/bin"; Components: main
+Source: "bin/krb5_32.dll"; DestDir: "{app}/bin"; Components: main
+Source: "bin/k5sprt32.dll"; DestDir: "{app}/bin"; Components: main
+Source: "bin/gssapi32.dll"; DestDir: "{app}/bin"; Components: main
+Source: "bin/comerr32.dll"; DestDir: "{app}/bin"; Components: main
 
 ; TODO: I would like to install these into {app}/share/postgresql, but postgres
-; does not find them then.
+; does not find them then. Perhaps we should install all of postgres elsewhere,
+; and make glom find it.
 Source: "share/postgresql/*"; DestDir: "{app}/share"; Components: main; Flags: recursesubdirs
 ; TODO: Again, same with lib
 Source: "lib/postgresql/*.dll"; DestDir: "{app}/lib"; Components: main;
@@ -126,15 +129,15 @@
 Source: "lib/gtk-2.0/2.10.0/loaders/*"; DestDir: "{app}/lib/gtk-2.0/2.10.0/loaders"; Components: gtk
 Source: "gdk-pixbuf-query-loaders.exe"; DestDir: "{app}\bin"; Components: gtk; Flags: deleteafterinstall;
 
-Source: "lib/pango/1.6.0/modules/*"; DestDir: "{app}/lib/pango/1.6.0/modules"; Components: gtk;
-Source: "pango-querymodules.exe"; DestDir: "{app}\bin"; Components: gtk; Flags: deleteafterinstall;
+;Source: "lib/pango/1.6.0/modules/*"; DestDir: "{app}/lib/pango/1.6.0/modules"; Components: gtk;
+;Source: "pango-querymodules.exe"; DestDir: "{app}\bin"; Components: gtk; Flags: deleteafterinstall;
 
 Source: "share/themes/MS-Windows/*"; DestDir: "{app}/share/themes/MS-Windows"; Flags: recursesubdirs; Components: gtk
 Source: "etc/gtk-2.0/gtkrc"; DestDir: "{app}/etc/gtk-2.0"; Components: gtk
 Source: "querymodules.bat"; DestDir: "{app}\bin"; Components: gtk; Flags: deleteafterinstall;
 
-Source: "lib/gnome-vfs-2.0/modules/*.dll"; DestDir: "{app}/lib/gnome-vfs-2.0/modules"; Components: main;
-Source: "etc/gnome-vfs-2.0/modules/default-modules.conf"; DestDir: "{app}/etc/gnome-vfs-2.0/modules"; Components: main;
+;Source: "lib/gnome-vfs-2.0/modules/*.dll"; DestDir: "{app}/lib/gnome-vfs-2.0/modules"; Components: main;
+;Source: "etc/gnome-vfs-2.0/modules/default-modules.conf"; DestDir: "{app}/etc/gnome-vfs-2.0/modules"; Components: main;
 
 ; GtkSourceView
 Source: "share/gtksourceview-2.0/language-specs/*"; DestDir: "{app}/share/gtksourceview-2.0/language-specs"; Components: main
@@ -147,112 +150,18 @@
 
 ; Icons
 Source: "share/icons/hicolor/48x48/apps/glom.png"; DestDir: "{app}/share/icons/hicolor/48x48/apps"; Components: main
+Source: "share/pixmaps/glom.png"; DestDir: "{app}/share/pixmaps"; Components: main
 
-; Glade files
+; Other shared glom files
 Source: "share/glom/glade/glom.glade"; DestDir: "{app}/share/glom/glade"; Components: main
 Source: "share/glom/glade/glom_developer.glade"; DestDir: "{app}/share/glom/glade"; Components: main
+Source: "share/glom/doc/*"; Destdir: "{app}/share/glom/doc/"; Components: main; Flags: recursesubdirs;
+
+;Source: "share/themes/MS-Windows/*"; DestDir: "{app}/share/themes/MS-Windows"; Flags: recursesubdirs; Components: gtk
 
 ; Locales
-Source: "lib\locale\af\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\af\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\am\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\am\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ang\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ang\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ar\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ar\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\as\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\as\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\az\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\az\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\az_IR\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\az_IR\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\be\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\be\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\be latin\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\be latin\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\bg\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\bg\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\bn\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\bn\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\bn_IN\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\bn_IN\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\br\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\br\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\bs\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\bs\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ca\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ca\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\cs\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\cs\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\cy\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\cy\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\da\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\da\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\de\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\de\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\dz\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\dz\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\el\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\el\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\en_CA\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\en_CA\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\en_GB\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\en_GB\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\eo\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\eo\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\es\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\es\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\et\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\et\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\eu\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\eu\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\fa\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\fa\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\fi\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\fi\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\fr\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\fr\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ga\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ga\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\gl\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\gl\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\gu\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\gu\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\he\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\he\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\hi\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\hi\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\hr\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\hr\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\hu\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\hu\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\hy\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\hy\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ia\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ia\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\id\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\id\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\io\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\io\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\is\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\is\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\it\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\it\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ja\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ja\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ka\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ka\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\kn\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\kn\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ko\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ko\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ku\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ku\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\li\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\li\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\lt\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\lt\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\lv\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\lv\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\mg\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\mg\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\mi\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\mi\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\mk\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\mk\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ml\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ml\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\mn\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\mn\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\mr\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\mr\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ms\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ms\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\nb\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\nb\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ne\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ne\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\nl\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\nl\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\nn\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\nn\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\nso\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\nso\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\oc\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\oc\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\or\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\or\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\pa\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\pa\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\pl\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\pl\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\pt\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\pt\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\pt_BR\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\pt_BR\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ro\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ro\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ru\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ru\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\rw\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\rw\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\si\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\si\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\sk\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\sk\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\sl\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\sl\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\sq\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\sq\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\sr\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\sr\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\sr Latn\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\sr Latn\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\sr ije\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\sr ije\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\sv\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\sv\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ta\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ta\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\te\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\te\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\th\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\th\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\tk\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\tk\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\tl\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\tl\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\tr\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\tr\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\tt\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\tt\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ug\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ug\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\uk\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\uk\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\ur\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\ur\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\uz\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\uz\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\uz cyrillic\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\uz cyrillic\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\vi\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\vi\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\wa\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\wa\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\xh\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\xh\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\yi\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\yi\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\zh_CN\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\zh_CN\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\zh_HK\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\zh_HK\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\zh_TW\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\zh_TW\LC_MESSAGES"; Components: main and locale
-Source: "lib\locale\zu\LC_MESSAGES\*"; DestDir: "{app}\lib\locale\zu\LC_MESSAGES"; Components: main and locale
+Source: "lib\locale\*"; DestDir: "{app}\lib\locale\"; Flags: recursesubdirs; Components: main and locale
+Source: "share\locale\*"; DestDir: "{app}\share\locale\"; Flags: recursesubdirs; Components: main and locale
 
 ; Register .glom file type if we install for all users. Is there a possibility
 ; to register a type just for a single user?
@@ -261,7 +170,7 @@
 Root: HKCR; Subkey: ".glom"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-glom"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; Tasks: common
 
 [Dirs]
-Name: "{app}\etc\pango";
+;Name: "{app}\etc\pango";
 Name: "{app}\etc\gtk-2.0";
 
 [Run]
@@ -269,13 +178,14 @@
 
 [Code]
 { Remove generated files not generated by the installer }
+
 procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
 begin
 	if CurUninstallStep = usUninstall then
 	begin
 		DeleteFile(ExpandConstant('{app}') + '\etc\gtk-2.0\gtk.immodules');
 		DeleteFile(ExpandConstant('{app}') + '\etc\gtk-2.0\gdk-pixbuf.loaders');
-		DeleteFile(ExpandConstant('{app}') + '\etc\pango\pango.modules');
+;		DeleteFile(ExpandConstant('{app}') + '\etc\pango\pango.modules');
 	end;
 end;
 

Modified: trunk/win32/querymodules.bat
==============================================================================
--- trunk/win32/querymodules.bat	(original)
+++ trunk/win32/querymodules.bat	Tue Aug  5 09:46:01 2008
@@ -1,3 +1,3 @@
-pango-querymodules.exe > ../etc/pango/pango.modules
+rem pango-querymodules.exe > ../etc/pango/pango.modules
 gdk-pixbuf-query-loaders.exe > ../etc/gtk-2.0/gdk-pixbuf.loaders
 gtk-query-immodules-2.0.exe > ../etc/gtk-2.0/gtk.immodules
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]