gedit r6711 - branches/win32/win32

[icq svn gnome org]

Author: icq
Date: Wed Dec 24 11:50:51 2008
New Revision: 6711
URL: http://svn.gnome.org/viewvc/gedit?rev=6711&view=rev

Log:
Some fixes.


Modified:
   branches/win32/win32/build-installer
   branches/win32/win32/gedit.iss.in

Modified: branches/win32/win32/build-installer
==============================================================================
--- branches/win32/win32/build-installer	(original)
+++ branches/win32/win32/build-installer	Wed Dec 24 11:50:51 2008
@@ -189,7 +189,7 @@
 mkdir -p installer/etc/gconf/gconf.xml.defaults || exit
 cp -R /etc/gconf/gconf.xml.defaults/* installer/etc/gconf/gconf.xml.defaults || exit
 mkdir -p installer/etc/gconf/gconf.xml.mandatory || exit
-cp -R /etc/gconf/gconf.xml.mandatory/* installer/etc/gconf/gconf.xml.mandatory || exit
+cp -R /etc/gconf/gconf.xml.mandatory/ installer/etc/gconf/ || exit
 mkdir -p installer/lib/GConf/2 || exit
 cp /lib/GConf/2/* installer/lib/GConf/2 || exit
 strip installer/lib/GConf/2/*.dll || exit

Modified: branches/win32/win32/gedit.iss.in
==============================================================================
--- branches/win32/win32/gedit.iss.in	(original)
+++ branches/win32/win32/gedit.iss.in	Wed Dec 24 11:50:51 2008
@@ -6,7 +6,7 @@
 UninstallDisplayIcon={app}\gedit.exe
 Uninstallable=yes
 AppPublisher=GNOME
-AppPublisherURL=http://www.gedit.org/
+AppPublisherURL=http:\\www.gedit.org\
 AppVersion= VERSION@
 OutputBaseFilename=gedit-setup- VERSION@-INSTALLERREVISION
 
@@ -69,58 +69,55 @@
 
 ; Python modules
 ;Source: "bin\python25.dll"; DestDir: "{app}\bin"; Components: python
-; TODO: I would like to install these into python/ instead of /bin, but I
+; TODO: I would like to install these into python\ instead of \bin, but I
 ; could not get python to locate them there (setting PYTHONPATH with setenv()
 ; in Glom's main() does not work).
 ; TODO: Change component of gda.pyd and glom.pyd to main instead of python
 ; since we also need these when the user installed python and pygtk on its own.
-;Source: "python/*.py"; DestDir: "{app}\bin"; Components: python; Flags: recursesubdirs
-;Source: "python/*.pyd"; DestDir: "{app}\bin"; Components: python; Flags: recursesubdirs
+;Source: "python\*.py"; DestDir: "{app}\bin"; Components: python; Flags: recursesubdirs
+;Source: "python\*.pyd"; DestDir: "{app}\bin"; Components: python; Flags: recursesubdirs
 
 ; gedit executables
 Source: "bin\gedit.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: "bin/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\immodules\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\immodules"; Components: gtk
+Source: "bin\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\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: "bin/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\gtk-2.0\2.10.0\loaders\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\loaders"; Components: gtk
+Source: "bin\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: "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: "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;
 
 ; GtkSourceView
-Source: "share/gtksourceview-2.0/language-specs/*"; DestDir: "{app}/share/gtksourceview-2.0/language-specs"; Components: main
-Source: "share/gtksourceview-2.0/styles/*"; DestDir: "{app}/share/gtksourceview-2.0/styles"; Components: main
+Source: "share\gtksourceview-2.0\language-specs\*"; DestDir: "{app}\share\gtksourceview-2.0\language-specs"; Components: main
+Source: "share\gtksourceview-2.0\styles\*"; DestDir: "{app}\share\gtksourceview-2.0\styles"; Components: main
 
 ; Icons
-;Source: "share/icons/hicolor/48x48/apps/gedit.png"; DestDir: "{app}/share/icons/hicolor/48x48/apps"; Components: main
-;Source: "share/pixmaps/gedit.png"; DestDir: "{app}/share/pixmaps"; Components: main
+;Source: "share\icons\hicolor\48x48\apps\gedit.png"; DestDir: "{app}\share\icons\hicolor\48x48\apps"; Components: main
+;Source: "share\pixmaps\gedit.png"; DestDir: "{app}\share\pixmaps"; Components: main
 
 ; Other shared gedit files
-Source: "share/gedit-2/ui/*"; DestDir: "{app}/share/gedit-2/ui"; Components: main
-Source: "share/gedit-2/icons/gedit-plugin.png"; DestDir: "{app}/share/gedit-2/icons"; Components: main
-Source: "share/gedit-2/taglist/*"; DestDir: "{app}/share/gedit-2/taglist"; Components: main; Flags: recursesubdirs
-Source: "share/gedit-2/logo/gedit-logo.png"; Destdir: "{app}/share/gedit-2/logo/"; Components: main; Flags: recursesubdirs
+Source: "share\gedit-2\ui\*"; DestDir: "{app}\share\gedit-2\ui"; Components: main
+Source: "share\gedit-2\icons\gedit-plugin.png"; DestDir: "{app}\share\gedit-2\icons"; Components: main
+Source: "share\gedit-2\taglist\*"; DestDir: "{app}\share\gedit-2\taglist"; Components: main; Flags: recursesubdirs
+Source: "share\gedit-2\logo\gedit-logo.png"; Destdir: "{app}\share\gedit-2\logo\"; Components: main
 
 ; Plugins
-Source: "share/gedit-2/plugins/*"; DestDir: "{app}/share/gedit-2/plugins"; Components: main; Flags: recursesubdirs
-Source: "lib/gedit-2/plugins/*"; DestDir: "{app}/lib/gedit-2/plugins"; Components: main; Flags: recursesubdirs
+Source: "share\gedit-2\plugins\*"; DestDir: "{app}\share\gedit-2\plugins"; Components: main; Flags: recursesubdirs
+Source: "lib\gedit-2\plugins\*"; DestDir: "{app}\lib\gedit-2\plugins"; Components: main; Flags: recursesubdirs
 
 ; GConf
-Source: "etc/gconf/schemas/*"; DestDir: "{app}/etc/gconf/schemas"; Components: main; Flags: recursesubdirs
-Source: "etc/gconf/2/*"; DestDir: "{app}/etc/gconf/2"; Components: main; Flags: recursesubdirs
-Source: "etc/gconf/gconf.xml.defaults/*"; DestDir: "{app}/etc/gconf/gconf.xml.defaults"; Components: main; Flags: recursesubdirs
-Source: "etc/gconf/gconf.xml.mandatory/*"; DestDir: "{app}/etc/gconf/gconf.xml.mandatory"; Components: main; Flags: recursesubdirs
+Source: "etc\gconf\*"; DestDir: "{app}\etc\gconf"; Components: main; Flags: recursesubdirs
 Source: "libexec\gconfd-2.exe"; DestDir: "{app}\libexec"; Components: main
 
 ; Locales
@@ -131,7 +128,7 @@
 ; to register a type just for a single user?
 ;[Registry]
 ;Root: HKCR; Subkey: ".txt"; ValueType: string; ValueData: "geditfile"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; Tasks: common
-;Root: HKCR; Subkey: ".txt"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-glom"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; Tasks: common
+;Root: HKCR; Subkey: ".txt"; ValueType: string; ValueName: "Content Type"; ValueData: "application\x-glom"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; Tasks: common
 
 [Dirs]
 ;Name: "{app}\etc\pango";
@@ -143,26 +140,26 @@
 [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');
-//	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 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;
+
+\\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
+\\ Skip Components selection, all components are required anyway
 function ShouldSkipPage(CurPageID: Integer): Boolean;
 begin
 	if CurPageID = wpSelectComponents then