GNOME.org
 

glom r1764 - in branches/glom-1-8: . win32

Author: arminb
Date: Fri Nov 28 17:33:54 2008
New Revision: 1764
URL: http://svn.gnome.org/viewvc/glom?rev=1764&view=rev

Log:
2008-11-28  Armin Burgmeier  <armin openismus com>

	* win32/build-installer:
	* win32/glom.iss.in: Update for Glom 1.8.


Modified:
   branches/glom-1-8/   (props changed)
   branches/glom-1-8/ChangeLog
   branches/glom-1-8/win32/build-installer
   branches/glom-1-8/win32/glom.iss.in

Modified: branches/glom-1-8/win32/build-installer
==============================================================================
--- branches/glom-1-8/win32/build-installer	(original)
+++ branches/glom-1-8/win32/build-installer	Fri Nov 28 17:33:54 2008
@@ -30,41 +30,37 @@
 # 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 /bin/gspawn-win32-helper.exe installer/bin || exit
-cp /bin/gspawn-win32-helper-console.exe installer/bin || exit
-
-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/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/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 /bundle/bin/libglib-2.0-0.dll installer/bin || exit
+cp /bundle/bin/libgio-2.0-0.dll installer/bin || exit
+cp /bundle/bin/libgmodule-2.0-0.dll installer/bin || exit
+cp /bundle/bin/libgobject-2.0-0.dll installer/bin || exit
+cp /bundle/bin/libgthread-2.0-0.dll installer/bin || exit
+
+# TODO: We can probably omit these, as we do not use g_spawn on Windows anymore
+cp /bundle/bin/gspawn-win32-helper.exe installer/bin || exit
+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/libcairo-2.dll installer/bin || exit
+cp /bundle/bin/libpng12-0.dll installer/bin || exit
+cp /bundle/bin/jpeg62.dll installer/bin || exit
+cp /bundle/bin/libtiff3.dll installer/bin || exit
+
+cp /bundle/bin/libpango-1.0-0.dll installer/bin || exit
+cp /bundle/bin/libpangocairo-1.0-0.dll installer/bin || exit
+cp /bundle/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 /bundle/bin/libgdk-win32-2.0-0.dll installer/bin || exit
+cp /bundle/bin/libgdk_pixbuf-2.0-0.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 /bundle/bin/libgtk-win32-2.0-0.dll installer/bin || exit
+cp /gtksourceview/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 /bundle/bin/libglade-2.0-0.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
@@ -83,13 +79,12 @@
 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-2.dll installer/bin || exit
-cp /local/bin/libgoocanvasmm-0.1-2.dll installer/bin || exit
+cp /local/bin/libgoocanvasmm-0.1-3.dll installer/bin || exit
 cp /local/bin/libgconfmm-2.6-1.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/libbakery-2.6--5-1.dll installer/bin || exit
+cp /local/bin/libbakery-2.6--6-1.dll installer/bin || exit
 cp /local/bin/libglom-0.dll installer/bin || exit
 
 echo "Stripping DLL files..."
@@ -99,10 +94,10 @@
 # stripping libxml2.dll renders it unusable (although not changing it in size).
 # 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/bin || exit
-cp /bin/intl.dll installer/bin || exit
-cp /bin/iconv.dll installer/bin || exit
-cp /bin/zlib1.dll installer/bin || exit
+cp /bundle/bin/libxml2.dll installer/bin || exit
+cp /bundle/bin/intl.dll installer/bin || exit
+cp /bundle/bin/iconv.dll installer/bin || exit
+cp /bundle/bin/zlib1.dll installer/bin || exit
 
 echo "Copying Python..."
 
@@ -113,7 +108,6 @@
 mkdir -p installer/python || exit
 
 # TODO: Perhaps some scripts need more python modules.
-# TODO: Let configure replace @pyexecdir@ to get the correct python path?
 cp $PYTHONDIR/Lib/*.py installer/python || exit
 
 mkdir -p installer/python/encodings || exit
@@ -145,28 +139,27 @@
 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
-strip installer/lib/gtk-2.0/2.10.0/immodules/*.dll || exit
-cp /bin/gtk-query-immodules-2.0.exe installer || 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
+#strip installer/lib/gtk-2.0/2.10.0/immodules/*.dll || exit
+#cp /bin/gtk-query-immodules-2.0.exe installer || exit
 
 mkdir -p 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
+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 /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 /bin/gdk-pixbuf-query-loaders.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/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 /bin/gdk-pixbuf-query-loaders.exe installer || exit
+
+# TODO: Can we omit this?
+mkdir -p installer/etc/gtk-2.0
+cp /bundle/etc/gtk-2.0/gtk.immodules installer/etc/gtk-2.0 || exit -1
+cp /bundle/etc/gtk-2.0/gdk-pixbuf.loaders installer/etc/gtk-2.0 || exit -1
 
 mkdir -p installer/share/themes || exit
-cp -R /share/themes/MS-Windows installer/share/themes || exit
+cp -R /bundle/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
 
@@ -185,9 +178,11 @@
 
 # We need to keep the locale files from share/locale in share/locale and those
 # from lib/locale in lib/locale:
+cp /bundle/share/locale installer/share -R || exit
 cp /share/locale installer/share -R || exit
-cp /lib/locale installer/lib -R || exit
+#cp /lib/locale installer/lib -R || exit
 cp /local/lib/locale installer/lib -R || exit
+cp /gtksourceview/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 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
@@ -241,8 +236,8 @@
 echo "Copying shared data (glade files, icons, etc.)..."
 
 mkdir -p 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
+cp -R /gtksourceview/share/gtksourceview-2.0/language-specs installer/share/gtksourceview-2.0 || exit
+cp -R /gtksourceview/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/
@@ -268,7 +263,7 @@
 echo "Creating installer..."
 
 perl -pe "s/INSTALLERREVISION/$revision/" glom.iss > installer/glom.iss || exit
-cp querymodules.bat installer || exit
+#cp installer || exit
 iscc installer/glom.iss || exit
 
 echo "Done"

Modified: branches/glom-1-8/win32/glom.iss.in
==============================================================================
--- branches/glom-1-8/win32/glom.iss.in	(original)
+++ branches/glom-1-8/win32/glom.iss.in	Fri Nov 28 17:33:54 2008
@@ -72,7 +72,7 @@
 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.6--5-1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libbakery-2.6--6-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-10.dll"; DestDir: "{app}\bin"; Components: main
@@ -80,7 +80,7 @@
 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\libgiomm-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
-Source: "bin\libgoocanvasmm-0.1-2.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libgoocanvasmm-0.1-3.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgtkmm-2.4-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
@@ -123,20 +123,22 @@
 Source: "bin\Glom.exe"; DestDir: "{app}\bin"; Components: main
 
 ; Modules
-Source: "lib/gtk-2.0/2.10.0/immodules/*"; DestDir: "{app}/lib/gtk-2.0/2.10.0/immodules"; Components: gtk
-Source: "gtk-query-immodules-2.0.exe"; DestDir: "{app}\bin"; Components: gtk; Flags: deleteafterinstall;
+;Source: "lib/gtk-2.0/2.10.0/immodules/*"; DestDir: "{app}/lib/gtk-2.0/2.10.0/immodules"; Components: gtk
+;Source: "gtk-query-immodules-2.0.exe"; DestDir: "{app}\bin"; Components: gtk; Flags: deleteafterinstall;
+Source: "etc/gtk-2.0/gdk-pixbuf.loaders"; DestDir: "{app}\etc\gtk-2.0"; Components: gtk;
 
 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: "gdk-pixbuf-query-loaders.exe"; DestDir: "{app}\bin"; Components: gtk; Flags: deleteafterinstall;
+;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: "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;
 ;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: "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;
@@ -174,7 +176,7 @@
 
 [Dirs]
 ;Name: "{app}\etc\pango";
-Name: "{app}\etc\gtk-2.0";
+;Name: "{app}\etc\gtk-2.0";
 
 [Run]
 Filename: "{app}\bin\querymodules.bat"; StatusMsg: "Querying modules..."; Flags: runhidden
@@ -182,24 +184,24 @@
 [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');
+//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');
-	end;
-end;
+//	end;
+//end;
 
-procedure DeinitializeUninstall();
-begin
-	{ Remove main dir and etc/ which are not removed automatically,
-          probably because of the querymodule files not installed by the
-          installer }
-	DelTree(ExpandConstant('{app}') + '\etc', TRUE, TRUE, TRUE);
-	DelTree(ExpandConstant('{app}'), TRUE, FALSE, FALSE);
-end;
+//procedure DeinitializeUninstall();
+//begin
+//	{ Remove main dir and etc/ which are not removed automatically,
+//          probably because of the querymodule files not installed by the
+//          installer }
+//	DelTree(ExpandConstant('{app}') + '\etc', TRUE, TRUE, TRUE);
+//	DelTree(ExpandConstant('{app}'), TRUE, FALSE, FALSE);
+//end;
 
 // Skip Components selection, all components are required anyway
 function ShouldSkipPage(CurPageID: Integer): Boolean;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]