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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2009-10-05 17:34:11 +0200 (Mon, 05 Oct 2009)
New Revision: 1302

Modified:
   trunk/ChangeLog
   trunk/src/inst-sections.nsi
   trunk/src/make-msi.pl
Log:
2009-10-05  Marcus Brinkmann  <marcus at g10code.com>

	* src/inst-sections.nsi (calc_defaults_man_advanced_en_done):
	Demagicize a couple of skip_* goto targets for MSI parsing.
	* src/make-msi.pl: Support APPDATA.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-09-29 09:45:42 UTC (rev 1301)
+++ trunk/ChangeLog	2009-10-05 15:34:11 UTC (rev 1302)
@@ -1,3 +1,9 @@
+2009-10-05  Marcus Brinkmann  <marcus at g10code.com>
+
+	* src/inst-sections.nsi (calc_defaults_man_advanced_en_done):
+	Demagicize a couple of skip_* goto targets for MSI parsing.
+	* src/make-msi.pl: Support APPDATA.
+
 2009-09-28  Werner Koch  <wk at g10code.com>
 
 	Release 2.0.1.

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2009-09-29 09:45:42 UTC (rev 1301)
+++ trunk/src/inst-sections.nsi	2009-10-05 15:34:11 UTC (rev 1302)
@@ -731,10 +731,10 @@
 
   # This is not a build dependency, but it is a run-time dependency.
   !insertmacro SectionFlagIsSet ${SEC_gpa} \
-		${SF_SELECTED} skip_gpgex_dep_kleopatra need_gpgex_dep_kleopatra
+		${SF_SELECTED} skipa_gpgex_dep_kleopatra need_gpgex_dep_kleopatra
   need_gpgex_dep_kleopatra:
   !insertmacro SelectSection ${SEC_kleopatra}
-  skip_gpgex_dep_kleopatra:
+  skipa_gpgex_dep_kleopatra:
 
   # Other dependencies are linked in statically.
   skip_gpgex:
@@ -748,10 +748,10 @@
 
   # This is not a build dependency, but it is a run-time dependency.
   !insertmacro SectionFlagIsSet ${SEC_gpa} \
-		${SF_SELECTED} skip_gpgol_dep_kleopatra need_gpgol_dep_kleopatra
+		${SF_SELECTED} skipa_gpgol_dep_kleopatra need_gpgol_dep_kleopatra
   need_gpgol_dep_kleopatra:
   !insertmacro SelectSection ${SEC_kleopatra}
-  skip_gpgol_dep_kleopatra:
+  skipa_gpgol_dep_kleopatra:
 
   skip_gpgol:
 !endif

Modified: trunk/src/make-msi.pl
===================================================================
--- trunk/src/make-msi.pl	2009-09-29 09:45:42 UTC (rev 1301)
+++ trunk/src/make-msi.pl	2009-10-05 15:34:11 UTC (rev 1302)
@@ -768,11 +768,19 @@
 	    fail "$file:$.: syntax error" if ($#args != 0);
 
 	    my $outpath = $args[0];
-	    if (not $outpath =~ s/^"\$INSTDIR\\?(.*)"$/$1/)
+#	    if (not $outpath =~ s/^"\$INSTDIR\\?(.*)"$/$1/)
+	    if ($outpath =~ m/^"\$INSTDIR\\?(.*)"$/)
 	    {
+	        $parser->{outpath} = $1;
+	    }
+	    elsif ($outpath =~ m/^"\$APPDATA\\?(.*)"$/)
+	    {
+	        $parser->{outpath} = "%CommonAppDataFolder%\\" . $1;
+	    }
+	    else
+	    {
 		fail "$file:$.: unsupported out path: $args[0]";
 	    }
-	    $parser->{outpath} = $outpath;
 	}
 	elsif ($command eq 'File')
 	{