[Gpg4win-commits] r1088 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2009-01-29 16:35:26 +0100 (Thu, 29 Jan 2009)
New Revision: 1088

Modified:
   trunk/ChangeLog
   trunk/src/inst-kdesupport.nsi
   trunk/src/uninst-kdesupport.nsi
Log:
2009-01-29  Marcus Brinkmann  <marcus at g10code.de>

	* src/inst-kdesupport.nsi, src/uninst-kdesupport.nsi: Be relaxed
	about dbus-daemon and dependencies.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-01-28 09:41:23 UTC (rev 1087)
+++ trunk/ChangeLog	2009-01-29 15:35:26 UTC (rev 1088)
@@ -1,3 +1,8 @@
+2009-01-29  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/inst-kdesupport.nsi, src/uninst-kdesupport.nsi: Be relaxed
+	about dbus-daemon and dependencies.
+
 2009-01-28  Werner Koch  <wk at g10code.com>
 
 	* packages/packages.current: Update gpgol and gpgex.

Modified: trunk/src/inst-kdesupport.nsi
===================================================================
--- trunk/src/inst-kdesupport.nsi	2009-01-28 09:41:23 UTC (rev 1087)
+++ trunk/src/inst-kdesupport.nsi	2009-01-29 15:35:26 UTC (rev 1088)
@@ -34,7 +34,13 @@
 !else
   # FIXME: Figure out how to relocate dbus-daemon (and kleopatra).
   SetOutPath "$INSTDIR\bin"
+  ClearErrors
+  SetOverwrite try
   File ${prefix}/bin/dbus-daemon.exe
+  SetOverwrite lastused
+  IfErrors 0 +3
+      File /oname=dbus-daemon.exe.tmp ${prefix}/bin/dbus-daemon.exe
+      Rename /REBOOTOK dbus-daemon.exe.tmp dbus-daemon.exe
   SetOutPath "$INSTDIR"
 
   File ${prefix}/bin/dbus-launch.exe
@@ -53,8 +59,23 @@
 
   SetOutPath "$INSTDIR"
   File ${prefix}/bin/giflib4.dll
+
+  ClearErrors
+  SetOverwrite try
   File ${prefix}/bin/libdbus-1.dll
+  SetOverwrite lastused
+  IfErrors 0 +3
+      File /oname=libdbus-1.dll.tmp ${prefix}/bin/libdbus-1.dll
+      Rename /REBOOTOK libdbus-1.dll.tmp libdbus-1.dll
+
+  ClearErrors
+  SetOverwrite try
   File ${prefix}/bin/libexpat.dll
+  SetOverwrite lastused
+  IfErrors 0 +3
+      File /oname=libexpat.dll.tmp ${prefix}/bin/libexpat.dll
+      Rename /REBOOTOK libexpat.dll.tmp libexpat.dll
+
   File ${prefix}/bin/libexpatw.dll
   File ${prefix}/bin/libexslt.dll
   File ${prefix}/bin/libkdewin32.dll

Modified: trunk/src/uninst-kdesupport.nsi
===================================================================
--- trunk/src/uninst-kdesupport.nsi	2009-01-28 09:41:23 UTC (rev 1087)
+++ trunk/src/uninst-kdesupport.nsi	2009-01-29 15:35:26 UTC (rev 1088)
@@ -31,7 +31,7 @@
   Call un.SourceDelete
 !else
   # FIXME: See inst-kdesupport.nsi.
-  Delete "$INSTDIR\bin\dbus-daemon.exe"
+  Delete /REBOOTOK "$INSTDIR\bin\dbus-daemon.exe"
   RMDir "$INSTDIR\bin"
 
   Delete "$INSTDIR\dbus-env.bat"
@@ -45,8 +45,10 @@
   Delete "$INSTDIR\xsltproc.exe"
 
   Delete "$INSTDIR\giflib4.dll"
-  Delete "$INSTDIR\libdbus-1.dll"
-  Delete "$INSTDIR\libexpat.dll"
+  # We can not force down dbus-daemon, because it may be in use by
+  # non-gpg4win components (like KoWi).
+  Delete /REBOOTOK "$INSTDIR\libdbus-1.dll"
+  Delete /REBOOTOK "$INSTDIR\libexpat.dll"
   Delete "$INSTDIR\libexpatw.dll"
   Delete "$INSTDIR\libexslt.dll"
   Delete "$INSTDIR\libkdewin32.dll"