[glom] Make Glom on Windows find the correct python module

[Armin Burgmeier <arminb src gnome org>]

commit 3f20542c5a1b79696285fcd04d715b3c4d1f125a
Author: Armin Burgmeier <armin arbur net>
Date:   Thu Jan 7 19:38:02 2010 +0100

    Make Glom on Windows find the correct python module
    
    2010-01-07  Armin Burgmeier  <armin arbur net>
    
    	* win32/build-installer:
    	* win32/glom.iss.in: Install glom_1_12.pyd instead of glom.pyd. Bug
    	#605593.

 ChangeLog             |    6 ++++++
 win32/build-installer |   12 ++++++------
 win32/glom.iss.in     |    3 ++-
 3 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 80a58fd..9f8ab9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-07  Armin Burgmeier  <armin arbur net>
+
+	* win32/build-installer:
+	* win32/glom.iss.in: Install glom_1_12.pyd instead of glom.pyd. Bug
+	#605593.
+
 1.12.4:
 
 2009-12-30  Murray Cumming  <murrayc murrayc com>
diff --git a/win32/build-installer b/win32/build-installer
index a68892a..bbd6164 100755
--- a/win32/build-installer
+++ b/win32/build-installer
@@ -42,7 +42,7 @@ cp /bundle/bin/gspawn-win32-helper-console.exe installer/bin || exit
 
 cp /bundle/bin/libatk-1.0-0.dll installer/bin || exit
 cp /bundle/bin/libxml2-2.dll installer/bin || exit
-# TODO: Remove as soon as GtkSourceView is built against recent GTK+
+# TODO: Remove as soon as libgda is built against recent libxml2
 cp libxml2.dll installer/bin || exit
 cp /bundle/bin/libfontconfig-1.dll installer/bin || exit
 cp /bundle/bin/libexpat-1.dll installer/bin || exit
@@ -119,8 +119,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.pyd installer/python || exit
-strip installer/python/glom.pyd || 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/gtk-2.0/gda.pyd installer/python || exit
 strip installer/python/gda.pyd || exit
 
@@ -141,9 +141,9 @@ cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gtk/*.pyd installer/python/gtk || exit
 
 echo "Copying modules..."
 
-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
+#cp $PYTHONDIR/Lib/site-packages/glom_1_12.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 /lib/gtk-2.0/2.10.0/immodules/*.dll installer/lib/gtk-2.0/2.10.0/immodules || exit
diff --git a/win32/glom.iss.in b/win32/glom.iss.in
index c710eeb..7fb06dc 100644
--- a/win32/glom.iss.in
+++ b/win32/glom.iss.in
@@ -38,7 +38,7 @@ 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\libpng12-0.dll"; DestDir: "{app}\bin"; Components: gtk
-; TODO: Remove when gtksourceview uses the new libxml dll
+; TODO: Remove 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
@@ -187,6 +187,7 @@ Root: HKCR; Subkey: ".glom"; ValueType: string; ValueName: "Content Type"; Value
 [Run]
 Filename: "{app}\bin\querymodules.bat"; StatusMsg: "Querying modules..."; Flags: runhidden
 
+; TODO: Remove compiled python files (*.pyc) in glom dir
 [Code]
 { Remove generated files not generated by the installer }