Forráskód Böngészése

Improve [Code] dontcopy examples & doc: should use noencryption as well, like isdonateandmail.iss already did.

Martijn Laan 1 hete
szülő
commit
2f89b6249c

+ 1 - 1
Examples/CodeClasses.iss

@@ -24,7 +24,7 @@ WizardBackColorDynamicDark=#202020
 ;DialogFontSize=12
 
 [Files]
-Source: compiler:WizClassicSmallImage.bmp; Flags: dontcopy
+Source: compiler:WizClassicSmallImage.bmp; Flags: dontcopy noencryption
 
 [Code]
 procedure ButtonOnClick(Sender: TObject);

+ 4 - 3
Examples/CodeDll.iss

@@ -15,12 +15,13 @@ UninstallDisplayIcon={app}\MyProg.exe
 OutputDir=userdocs:Inno Setup Examples Output
 
 [Files]
+; Install our DLL to {app} so we can access it at uninstall time.
+; Use "Flags: dontcopy noencryption" if you don't need uninstall time access.
+Source: "MyDll.dll"; DestDir: "{app}"
+; Place any regular files here, so *after* all your dontcopy DLL files.
 Source: "MyProg.exe"; DestDir: "{app}"
 Source: "MyProg.chm"; DestDir: "{app}"
 Source: "Readme.txt"; DestDir: "{app}"; Flags: isreadme
-; Install our DLL to {app} so we can access it at uninstall time.
-; Use "Flags: dontcopy" if you don't need uninstall time access.
-Source: "MyDll.dll"; DestDir: "{app}"
 
 [Code]
 const

+ 2 - 2
Examples/CodePrepareToInstall.iss

@@ -15,8 +15,8 @@ OutputDir=userdocs:Inno Setup Examples Output
 
 [Files]
 ; Place any prerequisite files here, for example:
-; Source: "MyProg-Prerequisite-setup.exe"; Flags: dontcopy
-; Place any regular files here, so *after* all your prerequisites.
+; Source: "MyProg-Prerequisite-setup.exe"; Flags: dontcopy noencryption
+; Place any regular files here, so *after* all your prerequisite files.
 Source: "MyProg.exe"; DestDir: "{app}"
 Source: "MyProg.chm"; DestDir: "{app}"
 Source: "Readme.txt"; DestDir: "{app}"; Flags: isreadme;

+ 1 - 1
ISHelp/isetup.xml

@@ -1739,7 +1739,7 @@ Instructs Setup to proceed to comparing time stamps (last write/modified time) i
 <p>This flag cannot be combined with the <tt>isreadme</tt>, <tt>regserver</tt>, <tt>regtypelib</tt>, <tt>restartreplace</tt>, <tt>sharedfile</tt>, or <tt>uninsneveruninstall</tt> flags.</p>
 </flag>
 <flag name="dontcopy">
-<p>Don't copy the file to the user's system during the normal file copying stage but do statically compile the file into the installation. This flag is useful if the file is handled by the [Code] section exclusively and extracted using <link topic="isxfunc_ExtractTemporaryFile">ExtractTemporaryFile</link>.</p>
+<p>Don't copy the file to the user's system during the normal file copying stage but do statically compile the file into the installation. This flag is useful if the file is handled by the [Code] section exclusively and extracted using <link topic="isxfunc_ExtractTemporaryFile">ExtractTemporaryFile</link>, and in that case should be combined with <tt>noencryption</tt>.</p>
 </flag>
 <flag name="dontverifychecksum">
 <p>Prevents Setup from verifying the file checksum after extraction. Use this flag on files you wish to modify while already compiled into Setup.</p>

+ 3 - 3
ISHelp/isx.xml

@@ -637,9 +637,9 @@ external '[email protected] stdcall';
 
 <precode>
 [Files]
-Source: "MyDll.dll"; Flags: dontcopy
-Source: "A.dll"; Flags: dontcopy
-Source: "B.dll"; Flags: dontcopy
+Source: "MyDll.dll"; Flags: dontcopy noencryption
+Source: "A.dll"; Flags: dontcopy noencryption
+Source: "B.dll"; Flags: dontcopy noencryption
 
 [Code]
 procedure MyDllFunc(hWnd: Integer; lpText, lpCaption: AnsiString; uType: Cardinal);

+ 5 - 5
ISHelp/isxfunc.xml

@@ -288,8 +288,8 @@ WizardBackColor=#f3f3f3
 WizardBackColorDynamicDark=#202020
 
 [Files]
-Source: MyImageNormal.png; Flags: dontcopy
-Source: MyImageLarge.png; Flags: dontcopy
+Source: MyImageNormal.png; Flags: dontcopy noencryption
+Source: MyImageLarge.png; Flags: dontcopy noencryption
 
 [Code]
 &lt;event('CurStepChanged')&gt;
@@ -1837,7 +1837,7 @@ end;</pre></example>
         <description><p>Extracts the specified file from the [Files] section to a temporary directory. To find the location of the temporary directory, use <tt>ExpandConstant('{tmp}')</tt>.</p>
 <p>The extracted files are automatically deleted when Setup exits.</p>
 <p>An exception will be raised if the file wasn't extracted successfully, if the file wasn't found, or if the file was found but couldn't be processed because of its MinVersion and/or OnlyBelowVersion parameters.</p></description>
-        <remarks><p>Use <tt>Flags: dontcopy</tt> in the [Files] section to tell Setup to skip the file during the normal file copying stage.</p>
+        <remarks><p>Use <tt>Flags: dontcopy noencryption</tt> in the [Files] section to tell Setup to skip the file during the normal file copying stage, and to ensure it can be extracted before the password is known.</p>
 <p>Use <tt>Flags: noencryption</tt> in the [Files] section if encryption is enabled and you call the ExtractTemporaryFile function prior to the user entering the correct password.</p>
 <p>When solid compression is enabled, be sure to list your temporary files at (or near) the top of the [Files] section. In order to extract an arbitrary file in a solid-compressed installation, Setup must first decompress all prior files (to a temporary buffer in memory). This can result in a substantial delay if a number of other files are listed above the specified file in the [Files] section.</p></remarks>
         <seealso><p><link topic="isxfunc_ExtractTemporaryFiles">ExtractTemporaryFiles</link><br />
@@ -1866,11 +1866,11 @@ end;</pre></example>
         <description><p>Extracts the files matching the wildcard specified by Pattern from the [Files] section to a temporary directory. Returns the number of extracted files. To find the location of the temporary directory, use <tt>ExpandConstant('{tmp}')</tt>.</p>
 <p>The extracted files are automatically deleted when Setup exits.</p>
 <p>An exception will be raised if no files were extracted successfully, no files were found, or if files were found but none could be processed because of their MinVersion and/or OnlyBelowVersion parameters.</p></description>
-        <remarks><p>Use <tt>Flags: dontcopy</tt> in the [Files] section to tell Setup to skip the file during the normal file copying stage.</p>
+        <remarks><p>Use <tt>Flags: dontcopy noencryption</tt> in the [Files] section to tell Setup to skip the file during the normal file copying stage, and to ensure it can be extracted before the password is known.</p>
 <p>When solid compression is enabled, be sure to list your temporary files at (or near) the top of the [Files] section. In order to extract an arbitrary file in a solid-compressed installation, Setup must first decompress all prior files (to a temporary buffer in memory). This can result in a substantial delay if a number of other files are listed above the specified file in the [Files] section.</p></remarks>
         <seealso><p><link topic="isxfunc_ExtractTemporaryFile">ExtractTemporaryFile</link></p></seealso>
         <example><pre>[Files]
-Source: "Readme.txt"; Flags: dontcopy
+Source: "Readme.txt"; Flags: dontcopy noencryption
 Source: "MyProg.exe"; DestDir: "{app}"
 Source: "MyProg.chm"; DestDir: "{app}"