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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-11-26 02:58:09 +0100 (Mon, 26 Nov 2007)
New Revision: 599

Modified:
   trunk/ChangeLog
   trunk/src/README-msi.txt
   trunk/src/make-msi.pl
Log:
2007-11-26  Marcus Brinkmann  <marcus at g10code.de>

	* src/make-msi.pl (dump_all): Start dirmngr service.
	* src/README-msi.txt: Add todo items.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-11-26 01:50:25 UTC (rev 598)
+++ trunk/ChangeLog	2007-11-26 01:58:09 UTC (rev 599)
@@ -1,5 +1,8 @@
 2007-11-26  Marcus Brinkmann  <marcus at g10code.de>
 
+	* src/make-msi.pl (dump_all): Start dirmngr service.
+	* src/README-msi.txt: Add todo items.
+
 	* src/Makefile.am (msi, gpg4win-$(VERSION).wix,
 	(gpg4win-light-$(VERSION).wix): New targets.
 	* src/make-msi.pl: Rewritten.

Modified: trunk/src/README-msi.txt
===================================================================
--- trunk/src/README-msi.txt	2007-11-26 01:50:25 UTC (rev 598)
+++ trunk/src/README-msi.txt	2007-11-26 01:58:09 UTC (rev 599)
@@ -90,3 +90,29 @@
 Beside the files in gpg4win-msi.tar.bz, you also need src/gpg4win-VERSION.wix
 and src/make-msi.bat on the Windows computer, which should be put into
 the src/ subdirectory of the archive.
+
+
+TODO
+====
+
+1. The UI extension in WiX 3.0 only supports en-us.
+Translation to german is desired.
+
+2. Edit license dialog to not require acceptance (see tutorial, lesson 2).
+
+3. Support (optional) shortcuts on desktop and quicklaunch.  Make
+customizable via ini file.  No idea how to do this, actually.
+
+4. Add README dialog and launch README file:
+<Property Id='NOTEPAD'>Notepad.exe</Property>
+<CustomAction Id='LaunchFile' Property='NOTEPAD' ExeCommand='[SourceDir]Readme.txt' Return='asyncNoWait'/>
+
+Problems: Dialog needs to be added.  How to select language to display?
+
+5. Various warnings/blockers for NT5 and admin privileges checks.  We
+need to figure out which ones should be warnings and which should be
+critical, and how to implement warning dialogs (critical is easy).
+
+6. Dependencies could be done better by not repeating (hidden)
+features and using custom actions instead.
+

Modified: trunk/src/make-msi.pl
===================================================================
--- trunk/src/make-msi.pl	2007-11-26 01:50:25 UTC (rev 598)
+++ trunk/src/make-msi.pl	2007-11-26 01:58:09 UTC (rev 599)
@@ -18,21 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-# TODO
-# ====
-#
-# 1. The UI extension in WiX 3.0 only supports en-us.
-# Translation to german is desired.
-#
-# 1. Edit license dialog to not require acceptance (see tutorial, lesson 2).
-#
-# 2. Support .ini file for customization.
-#
-# 3. Add README dialog and launch README file:
-# <Property Id='NOTEPAD'>Notepad.exe</Property>
-# <CustomAction Id='LaunchFile' Property='NOTEPAD' ExeCommand='[SourceDir]Readme.txt' Return='asyncNoWait'/>
-# Problems: Dialog is missing.  How to select language to display?
-
 use strict;
 use warnings;
 use diagnostics;
@@ -1175,11 +1160,10 @@
 		    . "Name='DirMngr' ErrorControl='normal' Start='auto' "
 		    . "Arguments='--service' "
 		    . "Type='ownProcess' Vital='yes'/>\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
+		    . "  <ServiceControl Id='s_dirmngr_ctrl' "
+		    . "Name='DirMngr' Start='install' Stop='uninstall' "
+		    . "Remove='uninstall'/>\n";
 	    }
 
 	    print ' ' x $::level