2009-10-05 Marcus Brinkmann <marcus@g10code.com>
authorMarcus Brinkmann <mb@g10code.com>
Mon, 5 Oct 2009 15:34:11 +0000 (15:34 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Mon, 5 Oct 2009 15:34:11 +0000 (15:34 +0000)
* 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.

ChangeLog
src/inst-sections.nsi
src/make-msi.pl

index b3211ee..28a0710 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-05  Marcus Brinkmann  <marcus@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@g10code.com>
 
        Release 2.0.1.
index dd574e7..5c13f15 100644 (file)
@@ -731,10 +731,10 @@ Function CalcDepends
 
   # 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 @@ Function CalcDepends
 
   # 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
index 209d784..df5bbe0 100644 (file)
@@ -768,11 +768,19 @@ sub gpg4win_nsis_stubs
            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')
        {