Sfoglia il codice sorgente

Update doc/whatsnew/example.

Martijn Laan 4 mesi fa
parent
commit
e2d0df6a52
3 ha cambiato i file con 9 aggiunte e 4 eliminazioni
  1. 1 1
      Examples/CodeDownloadFiles.iss
  2. 1 1
      ISHelp/isetup.xml
  3. 7 2
      whatsnew.htm

+ 1 - 1
Examples/CodeDownloadFiles.iss

@@ -35,7 +35,7 @@ Source: "Readme.txt"; DestDir: "{app}"; Flags: isreadme;
 ; These files will be downloaded
 Source: "{tmp}\innosetup-latest.exe"; DestDir: "{app}"; Flags: external ignoreversion issigverify
 Source: "{tmp}\ISCrypt.dll"; DestDir: "{app}"; Flags: external ignoreversion
-Source: "{tmp}\MyProg-ExtraReadmes\*.txt"; DestDir: "{app}"; Flags: external recursesubdirs ignoreversion issigverify  
+Source: "{tmp}\MyProg-ExtraReadmes\*"; Excludes: "*.issig"; DestDir: "{app}"; Flags: external recursesubdirs ignoreversion issigverify  
 
 [Icons]
 Name: "{group}\My Program"; Filename: "{app}\MyProg.exe"

+ 1 - 1
ISHelp/isetup.xml

@@ -1580,7 +1580,7 @@ DestDir: "{app}\subdir"
 </param>
 
 <param name="Excludes">
-<p>Specifies a list of patterns to exclude, separated by commas. This parameter cannot be combined with the <tt>external</tt> flag.</p>
+<p>Specifies a list of patterns to exclude, separated by commas.</p>
 <p>Patterns may include wildcard characters ("*" and "?"). Note that unlike the <tt>Source</tt> parameter, a simple Unix-style pattern matching routine is used for <tt>Excludes</tt>. Dots in the pattern are always significant, thus "*.*" will not exclude a file with no extension (instead, use just "*"). Also, question marks always match exactly one character, thus "?????" will not exclude files with names less than five characters long.</p>
 <p>If a pattern starts with a backslash ("\") it is matched against the start of a path name, otherwise it is matched against the end of a path name. Thus "\foo" will only exclude a file named "foo" at the base of the tree. On the other hand, "foo" will exclude any file named "foo" anywhere in the tree.</p>
 <p>The patterns may include backslashes. "foo\bar" will exclude both "foo\bar" and "subdir\foo\bar". "\foo\bar" will only exclude "foo\bar".</p>

+ 7 - 2
whatsnew.htm

@@ -64,8 +64,12 @@ Name: bosskey; KeyFile: "boss.ispubkey"</pre>
     <li>Note: The <tt>issigverify</tt> flag cannot be combined with the <tt>sign</tt> or <tt>signonce</tt> flags. Use <tt>signcheck</tt> instead.</li>
     <li>Example section:
       <pre>[Files]
-Source: "MyProg.exe"; DestDir: "{app}"; Flags: issigverify; ISSigAllowedKeys: exesigner bosskey
-Source: "MyProg.chm"; DestDir: "{app}"; Flags: issigverify; ISSigAllowedKeys: docsigner bosskey</pre>
+Source: "MyProg.exe"; DestDir: "{app}"; Flags: issigverify; \
+  ISSigAllowedKeys: exesigner bosskey
+Source: "MyProg.chm"; DestDir: "{app}"; Flags: issigverify; \
+  ISSigAllowedKeys: docsigner bosskey
+Source: "{src}\Extra\*.chm"; DestDir: "{app}"; Flags: issigverify external; \
+  ISSigAllowedKeys: docsigner bosskey; Excludes: "*.issig"</pre>
     </li>
   </ul>
   </li>
@@ -94,6 +98,7 @@ issigtool --key-file="MyKey.ispublickey" verify "MyProg.dll"</pre>
 <span class="head2">Other changes</span>
 <ul>
   <li>Compiler IDE: the <i>Find in Files</i> result list will now update its line numbers when you add or delete lines.</li>
+  <li><tt>[Files]</tt> section parameter <tt>Excludes</tt> can now be combined with the <tt>external</tt> flag.</li>
   <li>Example script <i>CodeDownloadFiles.iss</i> now also demonstrates how to use the <tt>CreateExtractionPage</tt> support function to extract a 7-Zip archive. See the <a href="https://jrsoftware.org/ishelp/index.php?topic=isxfunc_extract7ziparchive">Extract7ZipArchive help topic</a> for information about this function's limitations.</li>
 </ul>