glom r1413 - in trunk: . win32

[arminb svn gnome org]

Author: arminb
Date: Sat Feb  9 13:44:08 2008
New Revision: 1413
URL: http://svn.gnome.org/viewvc/glom?rev=1413&view=rev

Log:
2008-02-09  Armin Burgmeier  <armin openismus com>

	* win32/build-installer:
	* win32/glom.iss.in: Added some missing DLLs and gda and glom python
	modules.


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

Modified: trunk/win32/build-installer
==============================================================================
--- trunk/win32/build-installer	(original)
+++ trunk/win32/build-installer	Sat Feb  9 13:44:08 2008
@@ -32,6 +32,8 @@
 cp /bin/libcairo-2.dll installer || exit
 cp /bin/libgnome-2-0.dll installer || exit
 cp /bin/libpng13.dll installer || exit
+cp /bin/jpeg62.dll installer || exit
+cp /bin/libtiff3.dll installer || exit
 cp /bin/libpopt-0.dll installer || exit
 
 cp /local/bin/libpango-1.0-0.dll installer || exit
@@ -82,14 +84,23 @@
 strip installer/*.exe || exit
 
 # stripping libxml2.dll renders it unusable (although not changing it in size).
-# We therefore copy it after having stripped the rest
+# We therefore copy it after having stripped the rest. Same with the other DLLs
+# here. Perhaps those were built with MSVC.
 cp /bin/libxml2.dll installer || exit
 cp /bin/intl.dll installer || exit
 cp /bin/iconv.dll installer || exit
 cp /bin/zlib1.dll installer || exit
 
+# TODO: Find out Windows directory somehow, perhaps by looking at PATH?
+cp /c/WINDOWS/system32/python25.dll installer || exit
+
 echo "Copying modules..."
 
+# TODO: Let configure replace @pyexecdir@ to get the correct python path
+cp /c/Python25/Lib/site-packages/glom.pyd installer || exit
+cp /c/Python25/Lib/site-packages/gtk-2.0/gda.pyd installer || exit
+strip installer/*.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
 strip installer/lib/gtk-2.0/2.10.0/immodules/*.dll || exit

Modified: trunk/win32/glom.iss.in
==============================================================================
--- trunk/win32/glom.iss.in	(original)
+++ trunk/win32/glom.iss.in	Sat Feb  9 13:44:08 2008
@@ -39,6 +39,8 @@
 Source: "libintl-8.dll"; DestDir: "{app}"; Components: gtk
 Source: "libpopt-0.dll"; DestDir: "{app}"; Components: gtk
 Source: "libpng13.dll"; DestDir: "{app}"; Components: gtk
+Source: "jpeg62.dll"; DestDir: "{app}"; Components: gtk
+Source: "libtiff3.dll"; DestDir: "{app}"; Components: gtk
 Source: "libxml2.dll"; DestDir: "{app}"; Components: gtk
 Source: "libglib-2.0-0.dll"; DestDir: "{app}"; Components: gtk
 Source: "libgobject-2.0-0.dll"; DestDir: "{app}"; Components: gtk
@@ -100,6 +102,11 @@
 ; TODO: Again, same with lib
 Source: "lib/postgresql/*.dll"; DestDir: "{app}/lib"; Components: main;
 
+; Python modules
+Source: "python25.dll"; DestDir: "{app}"; Components: main
+Source: "glom.pyd"; DestDir: "{app}"; Components: main
+Source: "gda.pyd"; DestDir: "{app}"; Components: main
+
 ; Glom executables
 Source: "libglom-0.dll"; DestDir: "{app}"; Components: main
 Source: "Glom.exe"; DestDir: "{app}"; Components: main