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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-11-16 17:43:15 +0100 (Fri, 16 Nov 2007)
New Revision: 592

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

	* src/make-msi.guids: Include manual files.
	* src/make-msi.pl: Support manuals, and prefix output file names
	by src, because manuals are within gpg4win.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-11-16 14:51:20 UTC (rev 591)
+++ trunk/ChangeLog	2007-11-16 16:43:15 UTC (rev 592)
@@ -1,3 +1,9 @@
+2007-11-16  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/make-msi.guids: Include manual files.
+	* src/make-msi.pl: Support manuals, and prefix output file names
+	by src, because manuals are within gpg4win.
+
 2007-11-15  Marcus Brinkmann  <marcus at g10code.de>
 
 	* src/inst-kleopatra.nsi: Use SRCDIR to find kleopatra.bat.

Modified: trunk/src/make-msi.guids
===================================================================
--- trunk/src/make-msi.guids	2007-11-16 14:51:20 UTC (rev 591)
+++ trunk/src/make-msi.guids	2007-11-16 16:43:15 UTC (rev 592)
@@ -253,6 +253,9 @@
 01020ce6-6c8c-460f-8f66-a8f734fa3fec share\gpa\gpa_logo.ppm
 fa992dcc-ff89-4a32-9723-0b76bbc1dae4 share\gpa\gpa_tips.de
 1e855765-7624-42bb-b06b-28a0bcfce29b share\gpa\gpa_tips.en
+592ab2a3-a681-4baf-80ff-9d8d9ea3ce95 share\gpg4win\durchblicker.pdf
+b1b23af2-9aa8-4055-9ff8-6e0d26c8dd0e share\gpg4win\einsteiger.pdf
+806964aa-cb2a-4d5e-b53c-9525736563f2 share\gpg4win\novices.pdf
 4ca6e2ae-6987-4a21-9268-dc652b709fe2 share\icons\oxygen\16x16\actions\1day.png
 f244617c-8b96-4f99-aa69-d73a41c287fd share\icons\oxygen\16x16\actions\5days.png
 d38f25e8-1245-4687-bf17-4e5be87a548a share\icons\oxygen\16x16\actions\7days.png

Modified: trunk/src/make-msi.pl
===================================================================
--- trunk/src/make-msi.pl	2007-11-16 14:51:20 UTC (rev 591)
+++ trunk/src/make-msi.pl	2007-11-16 16:43:15 UTC (rev 592)
@@ -64,7 +64,14 @@
 # Simple indentation tracking, for pretty printing.
 $::level = 0;
 
+
+# FIXME: Some work arounds for the manual.
 
+my $DESC_Name_man_advanced_de = "Advanced Manual (German)";
+my $DESC_Name_man_advanced_en = "Advanced Manual";
+my $DESC_Name_man_novice_de = "Novice Manual (German)";
+my $DESC_Name_man_novice_en = "Novice Manual";
+
 
 # We use a new product and package code for every build (using pseudo
 # components), but a single constant upgrade code for all versions.
@@ -143,7 +150,8 @@
     foreach my $pkg (@::components)
     {
 	next if ($#{$pkg->{files}} == -1);
-	print FILE (join ("\n", map { $_->{source} } @{$pkg->{files}})). "\n";
+	print FILE (join ("\n", map { "src/" . ($_->{source}) }
+			  @{$pkg->{files}})). "\n";
     }
     close FILE;
 }
@@ -263,9 +271,11 @@
       # is not a full-featured NSIS to MSI converter, but it does the
       # job for us.
 
-      # FIXME: Manuals!
-      next if not defined $pkg{version};
-      my $prefix = "playground/install/pkgs/$pkg{name}-$pkg{version}";
+      my $prefix;
+      if (defined $pkg{version})
+      {
+	  $prefix = "playground/install/pkgs/$pkg{name}-$pkg{version}";
+      }
 
       # The list of all files encountered and included in the package.
       my @files;
@@ -301,13 +311,19 @@
 	  }
 	  elsif (m,^\s*Section\s+"([^"]+)",)
 	  {
-	      $pkg{title} = $1;
+	      # FIXME: Work around for manuals, which have variables
+	      # in this place.
+	      my $title = $1;
+	      $title =~ s/^\$\((.*)\)$/\$$1/;
+	      eval '$pkg{title} = "' . $title . '"';
 	      $pkg{level} = 1;
 	  }
 	  elsif (m,^\s*Section\s+/o\s+"([^"]+)",)
 	  {
+	      # FIXME: Work around for manuals, which have variables
+	      # in this place.
+	      $pkg{title} = $1;
 	      # Default install level is 3.
-	      $pkg{title} = $1;
 	      $pkg{level} = 1000;
 	  }
 	  elsif (m,^\s*LangString\s+DESC_SEC_\S+\s+\$\{LANG_ENGLISH\}\s+\"([^"]+)\"\s*\r?\n,)
@@ -611,7 +627,6 @@
     {
 	my $features;
 
-	next if not defined $pkg->{version};
 	next if $pkg->{hidden};
 
 	$features = $pkg->{features};