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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-01-29 13:34:27 +0100 (Tue, 29 Jan 2008)
New Revision: 694

Modified:
   trunk/ChangeLog
   trunk/src/make-msi.pl
Log:
2008-01-29  Marcus Brinkmann  <marcus at g10code.de>

	* src/make-msi.pl (nsis_parse_line): Skip including the file
	Memento.nsh.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-01-28 21:32:14 UTC (rev 693)
+++ trunk/ChangeLog	2008-01-29 12:34:27 UTC (rev 694)
@@ -1,3 +1,8 @@
+2008-01-29  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/make-msi.pl (nsis_parse_line): Skip including the file
+	Memento.nsh.
+
 2008-01-28  Marcus Brinkmann  <marcus at g10code.de>
 
 	* packages/packages.current: Update gpgme and kleopatra.

Modified: trunk/src/make-msi.pl
===================================================================
--- trunk/src/make-msi.pl	2008-01-28 21:32:14 UTC (rev 693)
+++ trunk/src/make-msi.pl	2008-01-29 12:34:27 UTC (rev 694)
@@ -503,13 +503,20 @@
 	{
 	    fail "$file:$.: syntax error" if $#tokens != 1;
 
-	    print STDERR "Including $tokens[1]\n"
-		if $::nsis_parser_debug;
-
-	    my $filename = nsis_eval ($parser, $file, $tokens[1]);
-
-	    # Recursion.
-	    nsis_parse_file ($parser, $filename);
+	    if ($tokens[1] eq 'Memento.nsh')
+	    {
+		print STDERR "Skipping $tokens[1]\n"
+		    if $::nsis_parser_debug;
+	    }
+	    else
+	    {	    print STDERR "Including $tokens[1]\n"
+			if $::nsis_parser_debug;
+		    
+		    my $filename = nsis_eval ($parser, $file, $tokens[1]);
+		    
+		    # Recursion.
+		    nsis_parse_file ($parser, $filename);
+	    }
 	}
 	elsif ($tokens[0] eq '!macro')
 	{