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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-11-16 15:51:20 +0100 (Fri, 16 Nov 2007)
New Revision: 591

Modified:
   trunk/ChangeLog
   trunk/src/inst-kleopatra.nsi
   trunk/src/inst-qt.nsi
   trunk/src/make-msi.guids
   trunk/src/make-msi.pl
   trunk/src/uninst-regex.nsi
Log:
2007-11-15  Marcus Brinkmann  <marcus at g10code.de>

	* src/inst-kleopatra.nsi: Use SRCDIR to find kleopatra.bat.
	* src/inst-qt.nsi: Use SRCDIR to find qt.conf and BUILD_DIR to
	find mingwm10.dll.
	* src/make-msi.guids: Add these files.
	* src/make-msi.pl (dump_all): Do not try to start the service yet.
	(collect_all): Support SRCDIR in File.
	* src/uninst-regex.nsi: Uninstall regex.dll.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-11-15 20:42:35 UTC (rev 590)
+++ trunk/ChangeLog	2007-11-16 14:51:20 UTC (rev 591)
@@ -1,5 +1,13 @@
 2007-11-15  Marcus Brinkmann  <marcus at g10code.de>
 
+	* src/inst-kleopatra.nsi: Use SRCDIR to find kleopatra.bat.
+	* src/inst-qt.nsi: Use SRCDIR to find qt.conf and BUILD_DIR to
+	find mingwm10.dll.
+	* src/make-msi.guids: Add these files.
+	* src/make-msi.pl (dump_all): Do not try to start the service yet.
+	(collect_all): Support SRCDIR in File.
+	* src/uninst-regex.nsi: Uninstall regex.dll.
+
 	* src/inst-sections.nsi (CalcDepends): Add dependency for
 	libetpan.
 	* src/make-msi.guids: Add libetpan and claws.

Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi	2007-11-15 20:42:35 UTC (rev 590)
+++ trunk/src/inst-kleopatra.nsi	2007-11-16 14:51:20 UTC (rev 591)
@@ -33,7 +33,7 @@
   SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/kleopatra.exe
   SetOutPath "$INSTDIR"
-  File ${BUILD_DIR}/kleopatra.bat
+  File ${SRCDIR}/kleopatra.bat
 
   File ${prefix}/bin/libgpgme++-glib.dll
   File ${prefix}/bin/libgpgme++-qt.dll

Modified: trunk/src/inst-qt.nsi
===================================================================
--- trunk/src/inst-qt.nsi	2007-11-15 20:42:35 UTC (rev 590)
+++ trunk/src/inst-qt.nsi	2007-11-16 14:51:20 UTC (rev 591)
@@ -33,9 +33,9 @@
   File "${gpg4win_pkg_qt_src}"
 !else
   # Qt needs some help to find itself.
-  File qt.conf
+  File ${SRCDIR}/qt.conf
   # Qt uses -mthreads, so install the support library.
-  File mingwm10.dll
+  File ${BUILD_DIR}/mingwm10.dll
 
   File ${prefix}/bin/Qt3Support4.dll
   File ${prefix}/bin/QtAssistantClient4.dll

Modified: trunk/src/make-msi.guids
===================================================================
--- trunk/src/make-msi.guids	2007-11-15 20:42:35 UTC (rev 590)
+++ trunk/src/make-msi.guids	2007-11-16 14:51:20 UTC (rev 591)
@@ -151,6 +151,7 @@
 82b84c27-93d1-4c4e-b664-126dd0b83377 libxml2.dll
 f2ed9b47-3ab0-475f-a666-ba9b8948ad5c libxslt.dll
 a8bb3ee1-8ac8-43b1-9a13-49292d7bb90f mingw-pcrecpp.dll
+dc2a7ef6-c56c-44d3-91ff-89b57cf70050 mingwm10.dll
 4dbebcb2-45f4-45e7-8cd9-1bd97830dcbd ngettext.exe
 e7b9fa9e-febd-488c-96a3-b7fde58908e2 pango-querymodules.exe
 d74205aa-7b11-446d-8831-feebaf7131be pcre.dll
@@ -190,6 +191,7 @@
 f24f9221-f347-4435-b818-4c3473d8f4ed pub\gpgsm.exe
 0762e4a3-a292-4d69-a0c9-34fc9747adef pub\gpgsplit.exe
 826eb8d2-14f1-44ff-8fd0-29f891fafa0c pub\gpgv.exe
+1820fef1-f47f-413d-bbb2-ec86cb0141a0 qt.conf
 b5303e90-698c-4823-b982-32bfd2b761b4 rdjpgcom.exe
 e4ee6e26-6fad-4e1e-8c8a-3dd75085c32a regex.dll
 22c41f80-e04d-4ad9-a18f-65a74df05b89 rpng-win.exe

Modified: trunk/src/make-msi.pl
===================================================================
--- trunk/src/make-msi.pl	2007-11-15 20:42:35 UTC (rev 590)
+++ trunk/src/make-msi.pl	2007-11-16 14:51:20 UTC (rev 591)
@@ -324,23 +324,17 @@
 	  {
 	      $dir = $1;
 	  }
-	  elsif (m,^\s*File\s+"?\$\{(prefix|BUILD_DIR)\}(?:/(\S*))?/([^/"\s]+)"?\s*\r?\n$,)
+	  elsif (m,^\s*File\s+"?\$\{(prefix|BUILD_DIR|SRCDIR)\}(?:/(\S*))?/([^/"\s]+)"?\s*\r?\n$,)
 	  {
 	      my $source = $3;
 
 	      $source = "$2/$source" if defined $2;
 	      $source = "${prefix}/$source" if $1 eq 'prefix';
+	      # FIXME: We assume that srcdir == build_dir here.
 
 	      push @files, { source => $source, dir => $dir, target => $3 };
 	      push @::sources, $source;
 	  }
-	  elsif (m,^\s*File\s+"?\$\{BUILD_DIR\}(\S+)/([^/"\s]+)"?\s*\r?\n$,)
-	  {
-	      my $source = $2;
-	      $source = "$1/$source" if ($1 ne '');
-	      push @files, { source => $source, dir => $dir, target => $2 };
-	      push @::sources, $source;
-	  }
 	  elsif (m,^\s*File\s+/oname=(\S+)\s+"?\$\{(prefix|BUILD_DIR)\}/([^"\s]+)"?\s*\r?\n$,)
 	  {
 	      my $target = $1;
@@ -548,12 +542,13 @@
 		    . "  <ServiceInstall Id='s_dirmngr' "
 		    . "DisplayName='Directory Manager' "
 		    . "Name='DirMngr' ErrorControl='normal' Start='auto' "
+		    . "Arguments='--service' "
 		    . "Type='ownProcess' Vital='yes'/>\n";
-
-		print ' ' x $::level
-		    . "  <ServiceControl Id='s_dirmngr_ctrl' "
-		    . "Name='DirMngr' Start='install' Stop='uninstall' "
-		    . "Remove='uninstall'/>\n";
+# FIXME: Start service (currently broken).
+#		print ' ' x $::level
+#		    . "  <ServiceControl Id='s_dirmngr_ctrl' "
+#		    . "Name='DirMngr' Start='install' Stop='uninstall' "
+#		    . "Remove='uninstall'/>\n";
 	    }
 
 	    print ' ' x $::level

Modified: trunk/src/uninst-regex.nsi
===================================================================
--- trunk/src/uninst-regex.nsi	2007-11-15 20:42:35 UTC (rev 590)
+++ trunk/src/uninst-regex.nsi	2007-11-16 14:51:20 UTC (rev 591)
@@ -30,6 +30,8 @@
   Push "${gpg4win_pkg_regex_src}"
   Call un.SourceDelete
 !else
-  # Nothing to uninstall
+  Delete "$INSTDIR\regex.dll"
+
+  RMDir "$INSTDIR"
 !endif
 SectionEnd