Strona główna Odkrywaj Pomoc
Zaloguj się
pascal
/
innosetup
kopia lustrzana https://github.com/jrsoftware/issrc.git
2
0
Forkuj 0
Pliki Problemy 0 Wiki
Przeglądaj źródła

Merge branch 'main' into ser163-filelist-generator

# Conflicts:
#	Projects/CompForm.pas
#	Projects/Compil32.dpr
Martijn Laan 1 rok temu
rodzic
2445306946 bd2e4aecd0
commit
ad02dbd22a
25 zmienionych plików z 229 dodań i 130 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 19 5
      ISHelp/isetup.xml
  2. 13 4
      ISHelp/isxfunc.xml
  3. 15 13
      Projects/CompForm.dfm
  4. 43 14
      Projects/CompForm.pas
  5. 8 6
      Projects/CompFunc.pas
  6. 4 3
      Projects/CompScintEdit.pas
  7. 5 5
      Projects/Compil32.dpr
  8. 3 0
      Projects/Compile.pas
  9. 5 1
      Projects/Debug.iss
  10. 24 8
      Projects/FileClass.pas
  11. 5 5
      Projects/ISCC.dpr
  12. 5 5
      Projects/ISCmplr.dpr
  13. 5 6
      Projects/ISPP/ISPP.dpr
  14. 7 2
      Projects/Install.pas
  15. 2 1
      Projects/ScriptFunc.pas
  16. 8 3
      Projects/ScriptFunc_R.pas
  17. 5 5
      Projects/Setup.dpr
  18. 5 5
      Projects/SetupLdr.dpr
  19. 1 0
      Projects/SetupSectionDirectives.pas
  20. 3 3
      Projects/Struct.pas
  21. 26 31
      README.md
  22. 1 1
      build-ce.bat
  23. 1 1
      build.bat
  24. 1 1
      setup.iss
  25. 15 2
      whatsnew.htm

+ 19 - 5
ISHelp/isetup.xml
Wyświetl plik 

@@ -87,7 +87,7 @@
 
 <body>

 

 <p>

-<b>Inno Setup version 6.2.3</b><br/>

+<b>Inno Setup version 6.3.0</b><br/>

 <b>Copyright &copy; 1997-2024 Jordan Russell. All rights reserved.</b><br/>

 <b>Portions Copyright &copy; 2000-2024 Martijn Laan. All rights reserved.</b><br/>

 <extlink href="https://jrsoftware.org/">Inno Setup home page</extlink>

@@ -164,7 +164,7 @@ Includes integrated support for "deflate", bzip2, and 7-Zip LZMA/LZMA2 file <lin
 
 <keyword value="Creating Installations" />

 <body>

 

-<p>Installations are created by means of <i>scripts</i>, which are ASCII or Unicode (UTF-8 encoded with a BOM) text files with a format somewhat similar to .INI files. (No, it's not as complicated as you might be thinking!).</p>

+<p>Installations are created by means of <i>scripts</i>, which are ASCII or Unicode (UTF-8 encoded) text files with a format somewhat similar to .INI files. (No, it's not as complicated as you might be thinking!).</p>

 

 <p>Scripts have an ".iss" (meaning Inno Setup Script) extension. The script controls every aspect of the installation. It specifies which files are to be installed and where, what shortcuts are to be created and what they are to be named, and so on.</p>

 

@@ -228,7 +228,7 @@ Source: "MYPROG.EXE"; DestDir: "{app}"
 
 

 <p>By default, scripts use ISPP if available, and .isl files use the built-in preprocessor.</p>

 

-<p>If an Unicode file is used, it must be UTF-8 encoded with a BOM.</p>

+<p>If an Unicode file is used, it must be UTF-8 encoded.</p>

 

 <p><br/><b>See also:</b><br/>

 <link topic="params">Parameters in Sections</link><br/>

@@ -1090,6 +1090,7 @@ DefaultGroupName=My Program
 
 <li><link topic="setup_uninstalldisplayname">UninstallDisplayName</link></li>

 <li><link topic="setup_uninstalldisplaysize">UninstallDisplaySize</link></li>

 <li><link topic="setup_uninstallfilesdir">UninstallFilesDir</link></li>

+<li><link topic="setup_uninstalllogging">UninstallLogging</link></li>

 <li><link topic="setup_uninstalllogmode">UninstallLogMode</link></li>

 <li><link topic="setup_uninstallrestartcomputer">UninstallRestartComputer</link></li>

 <li><link topic="setup_updateuninstalllogappname">UpdateUninstallLogAppName</link></li>

@@ -2124,7 +2125,7 @@ Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"
 
 <p>Specifies the name(s) of the .isl file(s) to read the default messages from. The file(s) must be located in your installation's <link topic="sourcedirectorynotes">source directory</link> when running the compiler, unless a fully qualified pathname is specified or the pathname is prefixed by "compiler:", in which case it looks for the file in the compiler directory.</p>

 <p>Each message file may contain a <link topic="langoptionssection">[LangOptions] section</link>, a <link topic="messagessection">[Messages] section</link>, and a <link topic="custommessagessection">[CustomMessages] section.</link></p>

 <p>When multiple files are specified, they are read in the order they are specified, thus the last message file overrides any language options or messages from previous files. Any language options or messages in the main script override the ones from message files.</p>

-<p>If an Unicode file is used, it must be UTF-8 encoded with a BOM.</p>

+<p>If an Unicode file is used, it must be UTF-8 encoded.</p>

 <examples>

 <pre>

 MessagesFile: "compiler:Dutch.isl"

@@ -2769,7 +2770,7 @@ Type: files; Name: "{win}\MYPROG.INI"
 
 <p>If you don't remember which version you installed, click the "Inno Setup Compiler" shortcut created in the Start Menu. If the version number displayed in its title bar says "(a)" you are running Non Unicode Inno Setup. Otherwise you are running Unicode Inno Setup.</p>

 <p>For the most part the two versions are used identically, and any differences between them are noted throughout the help file. However, the following overview lists the primary differences:</p>

   <ul>

-  <li>Unicode Inno Setup supports UTF-8 encoded .iss and .isl files (but not UTF-16).</li>

+  <li>Unicode Inno Setup supports UTF-8 encoded .iss and .isl files. Starting with Inno Setup 6.3, a UTF-8 preamble (also called BOM) is no longer required. UTF-16 is not supported.</li>

   <li>Any existing ANSI .isl language files are automatically converted during compilation using the <tt>LanguageCodePage</tt> setting of the language.</li>

   <li>Any [Messages] and [CustomMessages] entries in existing ANSI .iss script files must to be converted to Unicode manually if the language used a special <tt>LanguageCodePage</tt>.</li>

   <li>Unicode Inno Setup supports UTF-8 and UTF-16LE encoded .txt files for <tt>LicenseFile</tt>, <tt>InfoBeforeFile</tt>, and <tt>InfoAfterFile</tt>.</li>

@@ -3321,6 +3322,8 @@ Filename: "{win}\MYPROG.INI"; Section: "InstallSettings"; Key: "InstallPath"; St
 
 

 <p>The Setup program accepts optional command line parameters. These can be useful to system administrators, and to other programs calling the Setup program.</p>

 

+<p>Also see <link topic="uninstcmdline">Uninstaller Command Line Parameters</link>.</p>

+

 <dl>

 

 <dt><b><a name="HELP">/HELP</a>, <a name="HELP2">/?</a></b></dt>

@@ -3631,6 +3634,8 @@ Keep the default set of selected tasks, but deselect the "desktopicon" task:<br/
 
 

 <p>The uninstaller program (unins???.exe) accepts optional command line parameters. These can be useful to system administrators, and to other programs calling the uninstaller program.</p>

 

+<p>Also see <link topic="setupcmdline">Setup Command Line Parameters</link>.</p>

+

 <dl>

 

 <dt><b><a name="SILENT">/SILENT</a>, <a name="VERYSILENT">/VERYSILENT</a></b></dt>

@@ -4495,6 +4500,15 @@ UninstallDisplayIcon={app}\MyProg.exe,1
 
 </body>

 </setuptopic>

 

+<setuptopic directive="UninstallLogging">

+<setupvalid><link topic="yesnonotes"><tt>yes</tt> or <tt>no</tt></link></setupvalid>

+<setupdefault><tt>no</tt></setupdefault>

+<body>

+<p>If set to <tt>yes</tt>, the uninstaller will always create a log file if it is launched from the <i>Add/Remove Programs</i> Control Panel applet. Equivalent to passing <link topic="uninstcmdline" anchor="LOG">/LOG</link> on the command line.</p>

+<p>This directive has no effect if <tt>CreateUninstallRegKey</tt> is not set to <tt>yes</tt>.</p>

+</body>

+</setuptopic>

+

 <setuptopic directive="UninstallLogMode">

 <setupvalid><tt>append</tt>, <tt>new</tt>, or <tt>overwrite</tt></setupvalid>

 <setupdefault><tt>append</tt></setupdefault>

+ 13 - 4
ISHelp/isxfunc.xml
Wyświetl plik 

@@ -1861,7 +1861,7 @@ end;</pre>
 
       <function>

         <name>LoadStringsFromFile</name>

         <prototype>function LoadStringsFromFile(const FileName: String; var S: TArrayOfString): Boolean;</prototype>

-        <description><p>Loads the specified text file into the specified string array. Returns True if successful, False otherwise.</p></description>

+        <description><p>Loads the specified text file into the specified string array. UTF-8 encoded files with or without a preamble (also called BOM) are also supported. Returns True if successful, False otherwise.</p></description>

       </function>

       <function>

         <name>SaveStringToFile</name>

@@ -1874,13 +1874,22 @@ end;</pre>
 
         <name>SaveStringsToFile</name>

         <prototype>function SaveStringsToFile(const FileName: String; const S: TArrayOfString; const Append: Boolean): Boolean;</prototype>

         <description><p>Saves the specified string array to the specified file with ASCII encoding. If Append is True and the specified file already exists, it will be appended to instead of overwritten. Returns True if successful, False otherwise.</p></description>

-        <seealso><p><link topic="isxfunc_SaveStringsToUTF8File">SaveStringsToUTF8File</link></p></seealso>

+        <seealso><p><link topic="isxfunc_SaveStringsToUTF8File">SaveStringsToUTF8File</link><br />

+<link topic="isxfunc_SaveStringsToUTF8FileNoPreamble">SaveStringsToUTF8FileNoPreamble</link></p></seealso>

       </function>

       <function>

         <name>SaveStringsToUTF8File</name>

         <prototype>function SaveStringsToUTF8File(const FileName: String; const S: TArrayOfString; const Append: Boolean): Boolean;</prototype>

-        <description><p>Saves the specified string array to the specified file with UTF8 encoding. If Append is True and the specified file already exists, it will be appended to instead of overwritten. Returns True if successful, False otherwise.</p></description>

-        <seealso><p><link topic="isxfunc_SaveStringsToFile">SaveStringsToFile</link></p></seealso>

+        <description><p>Saves the specified string array to the specified file with UTF-8 encoding with a preamble (also called BOM). If Append is True and the specified file already exists, it will be appended to instead of overwritten. Returns True if successful, False otherwise.</p></description>

+        <seealso><p><link topic="isxfunc_SaveStringsToFile">SaveStringsToFile</link><br />

+<link topic="isxfunc_SaveStringsToUTF8FileNoPreamble">SaveStringsToUTF8FileNoPreamble</link></p></seealso>

+      </function>

+      <function>

+        <name>SaveStringsToUTF8FileNoPreamble</name>

+        <prototype>function SaveStringsToUTF8FileNoPreamble(const FileName: String; const S: TArrayOfString; const Append: Boolean): Boolean;</prototype>

+        <description><p>Saves the specified string array to the specified file with UTF-8 encoding without a preamble (also called BOM). If Append is True and the specified file already exists, it will be appended to instead of overwritten. Returns True if successful, False otherwise.</p></description>

+        <seealso><p><link topic="isxfunc_SaveStringsToFile">SaveStringsToFile</link><br />

+<link topic="isxfunc_SaveStringsToUTF8File">SaveStringsToUTF8File</link></p></seealso>

       </function>

     </subcategory>

     <subcategory>

+ 15 - 13
Projects/CompForm.dfm
Wyświetl plik 

@@ -203,6 +203,7 @@ object CompileForm: TCompileForm
 
         Top = 0

         Hint = 'New Main Script (Ctrl+N)'

         ImageIndex = 0

+        ImageName = 'document-new'

         OnClick = FNewMainFileClick

       end

       object OpenMainFileButton: TToolButton

@@ -210,6 +211,7 @@ object CompileForm: TCompileForm
 
         Top = 0

         Hint = 'Open Main Script (Ctrl+O)'

         ImageIndex = 1

+        ImageName = 'folder-open-filled-arrow-down-right'

         OnClick = FOpenMainFileClick

       end

       object SaveButton: TToolButton

@@ -217,6 +219,7 @@ object CompileForm: TCompileForm
 
         Top = 0

         Hint = 'Save (Ctrl+S)'

         ImageIndex = 2

+        ImageName = 'save-filled'

         OnClick = FSaveClick

       end

       object ToolButton4: TToolButton

@@ -231,6 +234,7 @@ object CompileForm: TCompileForm
 
         Top = 0

         Hint = 'Compile (Ctrl+F9)'

         ImageIndex = 3

+        ImageName = 'build'

         OnClick = BCompileClick

       end

       object StopCompileButton: TToolButton

@@ -239,6 +243,7 @@ object CompileForm: TCompileForm
 
         Hint = 'Stop Compile (Esc)'

         Enabled = False

         ImageIndex = 4

+        ImageName = 'build-cancel-2'

         OnClick = BStopCompileClick

       end

       object ToolButton7: TToolButton

@@ -253,6 +258,7 @@ object CompileForm: TCompileForm
 
         Top = 0

         Hint = 'Run (F9)'

         ImageIndex = 5

+        ImageName = 'debug-start-filled'

         OnClick = RRunClick

       end

       object PauseButton: TToolButton

@@ -261,6 +267,7 @@ object CompileForm: TCompileForm
 
         Hint = 'Pause'

         Enabled = False

         ImageIndex = 6

+        ImageName = 'debug-break-all-filled'

         OnClick = RPauseClick

       end

       object TerminateButton: TToolButton

@@ -269,6 +276,7 @@ object CompileForm: TCompileForm
 
         Hint = 'Terminate (Ctrl+F2)'

         Enabled = False

         ImageIndex = 10

+        ImageName = 'debug-stop-filled'

         OnClick = RTerminateClick

       end

       object ToolButton10: TToolButton

@@ -284,6 +292,7 @@ object CompileForm: TCompileForm
 
         Hint = 'Target Setup (Ctrl+Q)'

         Grouped = True

         ImageIndex = 7

+        ImageName = 'install'

         Style = tbsCheck

         OnClick = RTargetClick

       end

@@ -293,6 +302,7 @@ object CompileForm: TCompileForm
 
         Hint = 'Target Uninstall (Ctrl+W)'

         Grouped = True

         ImageIndex = 8

+        ImageName = 'uninstall'

         Style = tbsCheck

         OnClick = RTargetClick

       end

@@ -308,6 +318,7 @@ object CompileForm: TCompileForm
 
         Top = 0

         Hint = 'Help (F1)'

         ImageIndex = 9

+        ImageName = 'button-help'

         OnClick = HDocClick

       end

     end

@@ -364,6 +375,10 @@ object CompileForm: TCompileForm
 
           RadioItem = True

           OnClick = FSaveEncodingItemClick

         end

+        object FSaveEncodingUTF8NoPreamble: TMenuItem

+          Caption = 'UTF-8 without &BOM'

+          OnClick = FSaveEncodingItemClick

+        end

       end

       object FSaveAll: TMenuItem

         Caption = 'Sa&ve All'

@@ -2643,73 +2658,60 @@ object CompileForm: TCompileForm
 
   end

   object ToolBarVirtualImageList: TVirtualImageList

     AutoFill = True

-    DisabledGrayscale = False

-    DisabledSuffix = '_Disabled'

     Images = <

       item

         CollectionIndex = 0

         CollectionName = 'document-new'

-        Disabled = False

         Name = 'document-new'

       end

       item

         CollectionIndex = 1

         CollectionName = 'folder-open-filled-arrow-down-right'

-        Disabled = False

         Name = 'folder-open-filled-arrow-down-right'

       end

       item

         CollectionIndex = 2

         CollectionName = 'save-filled'

-        Disabled = False

         Name = 'save-filled'

       end

       item

         CollectionIndex = 3

         CollectionName = 'build'

-        Disabled = False

         Name = 'build'

       end

       item

         CollectionIndex = 4

         CollectionName = 'build-cancel-2'

-        Disabled = False

         Name = 'build-cancel-2'

       end

       item

         CollectionIndex = 5

         CollectionName = 'debug-start-filled'

-        Disabled = False

         Name = 'debug-start-filled'

       end

       item

         CollectionIndex = 6

         CollectionName = 'debug-break-all-filled'

-        Disabled = False

         Name = 'debug-break-all-filled'

       end

       item

         CollectionIndex = 7

         CollectionName = 'install'

-        Disabled = False

         Name = 'install'

       end

       item

         CollectionIndex = 8

         CollectionName = 'uninstall'

-        Disabled = False

         Name = 'uninstall'

       end

       item

         CollectionIndex = 9

         CollectionName = 'button-help'

-        Disabled = False

         Name = 'button-help'

       end

       item

         CollectionIndex = 10

         CollectionName = 'debug-stop-filled'

-        Disabled = False

         Name = 'debug-stop-filled'

       end>

     ImageCollection = LightToolBarImageCollection

+ 43 - 14
Projects/CompForm.pas
Wyświetl plik 

@@ -209,6 +209,7 @@ type
 
     FPrint: TMenuItem;

     N22: TMenuItem;

     PrintDialog: TPrintDialog;

+    FSaveEncodingUTF8NoPreamble: TMenuItem;

     N23: TMenuItem;

     procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);

     procedure FExitClick(Sender: TObject);

@@ -515,7 +516,7 @@ var
 
 implementation

 

 uses

-  ActiveX, Clipbrd, ShellApi, ShlObj, IniFiles, Registry, Consts, Types, UITypes, Math,

+  ActiveX, Clipbrd, ShellApi, ShlObj, IniFiles, Registry, Consts, Types, UITypes, Math, WideStrUtils,

   PathFunc, CmnFunc, CmnFunc2, FileClass, CompMsgs, TmSchema, BrowseFunc,

   HtmlHelpFunc, TaskbarProgressFunc,

   {$IFDEF STATICCOMPILER} Compile, {$ENDIF}

@@ -1031,7 +1032,7 @@ begin
 
 

   FMainMemo.Filename := '';

   UpdateCaption;

-  FMainMemo.SaveInUTF8Encoding := False;

+  FMainMemo.SaveEncoding := seUTF8;

   FMainMemo.Lines.Clear;

   FModifiedAnySinceLastCompile := True;

   FPreprocessorOutput := '';

@@ -1122,7 +1123,7 @@ begin
 
     end;

 

     if CommandLineWizard then begin

-      SaveTextToFile(CommandLineFileName, WizardForm.ResultScript, False);

+      SaveTextToFile(CommandLineFileName, WizardForm.ResultScript, seUtf8);

     end else begin

       NewMainFile;

       FMainMemo.Lines.Text := WizardForm.ResultScript;

@@ -1141,14 +1142,36 @@ end;
 
 procedure TCompileForm.OpenFile(AMemo: TCompScintFileEdit; AFilename: String;

   const MainMemoAddToRecentDocs: Boolean);

 

-  function IsStreamUTF8Encoded(const Stream: TStream): Boolean;

+  function GetStreamSaveEncoding(const Stream: TStream): TSaveEncoding;

   var

     Buf: array[0..2] of Byte;

   begin

-    Result := False;

-    if Stream.Read(Buf, SizeOf(Buf)) = SizeOf(Buf) then

-      if (Buf[0] = $EF) and (Buf[1] = $BB) and (Buf[2] = $BF) then

-        Result := True;

+    Result := seAuto;

+    var StreamSize := Stream.Size;

+    var CappedSize: Integer;

+    if StreamSize > High(Integer) then

+      CappedSize := High(Integer)

+    else

+      CappedSize := Integer(StreamSize);

+    if (CappedSize >= SizeOf(Buf)) and (Stream.Read(Buf, SizeOf(Buf)) = SizeOf(Buf)) and

+       (Buf[0] = $EF) and (Buf[1] = $BB) and (Buf[2] = $BF) then

+      Result := seUTF8

+    else begin

+      Stream.Seek(0, soFromBeginning);

+      var S: AnsiString;

+      SetLength(S, CappedSize);

+      SetLength(S, Stream.Read(S[1], CappedSize));

+      if IsUTF8String(S) then

+        Result := seUTF8NoPreamble;

+    end;

+  end;

+

+  function GetEncoding(const SaveEncoding: TSaveEncoding): TEncoding;

+  begin

+    if SaveEncoding in [seUTF8, seUTF8NoPreamble] then

+      Result := TEncoding.UTF8

+    else

+      Result := nil;

   end;

 

 var

@@ -1161,9 +1184,9 @@ begin
 
     if AMemo = FMainMemo then

       NewMainFile;

     GetFileTime(Stream.Handle, nil, nil, @AMemo.FileLastWriteTime);

-    AMemo.SaveInUTF8Encoding := IsStreamUTF8Encoded(Stream);

+    AMemo.SaveEncoding := GetStreamSaveEncoding(Stream);

     Stream.Seek(0, soFromBeginning);

-    AMemo.Lines.LoadFromStream(Stream);

+    AMemo.Lines.LoadFromStream(Stream, GetEncoding(AMemo.SaveEncoding));

   finally

     Stream.Free;

   end;

@@ -1209,7 +1232,7 @@ function TCompileForm.SaveFile(const AMemo: TCompScintFileEdit; const SaveAs: Bo
 
         [GetLastError]);

     TempFN := Buf;

     try

-      SaveTextToFile(TempFN, AMemo.Lines.Text, AMemo.SaveInUTF8Encoding);

+      SaveTextToFile(TempFN, AMemo.Lines.Text, AMemo.SaveEncoding);

 

       { Back up existing file if needed }

       if FOptions.MakeBackups and NewFileExists(FN) then begin

@@ -1744,8 +1767,9 @@ var
 
 begin

   FSaveMainFileAs.Enabled := FActiveMemo = FMainMemo;

   FSaveEncoding.Enabled := FSave.Enabled; { FSave.Enabled is kept up-to-date by UpdateSaveMenuItemAndButton }

-  FSaveEncodingAuto.Checked := FSaveEncoding.Enabled and not (FActiveMemo as TCompScintFileEdit).SaveInUTF8Encoding;

-  FSaveEncodingUTF8.Checked := FSaveEncoding.Enabled and (FActiveMemo as TCompScintFileEdit).SaveInUTF8Encoding;

+  FSaveEncodingAuto.Checked := FSaveEncoding.Enabled and ((FActiveMemo as TCompScintFileEdit).SaveEncoding = seAuto);

+  FSaveEncodingUTF8.Checked := FSaveEncoding.Enabled and ((FActiveMemo as TCompScintFileEdit).SaveEncoding = seUTF8);

+  FSaveEncodingUTF8NoPreamble.Checked := FSaveEncoding.Enabled and ((FActiveMemo as TCompScintFileEdit).SaveEncoding = seUTF8NoPreamble);

   FSaveAll.Visible := FOptions.OpenIncludedFiles;

   ReadMRUMainFilesList;

   FMRUMainFilesSep.Visible := FMRUMainFilesList.Count <> 0;

@@ -1801,7 +1825,12 @@ end;
 
 

 procedure TCompileForm.FSaveEncodingItemClick(Sender: TObject);

 begin

-  (FActiveMemo as TCompScintFileEdit).SaveInUTF8Encoding := (Sender = FSaveEncodingUTF8);

+  if Sender = FSaveEncodingUTF8  then

+    (FActiveMemo as TCompScintFileEdit).SaveEncoding := seUTF8

+  else if Sender = FSaveEncodingUTF8NoPreamble  then

+    (FActiveMemo as TCompScintFileEdit).SaveEncoding := seUTF8NoPreamble

+  else

+    (FActiveMemo as TCompScintFileEdit).SaveEncoding := seAuto;

 end;

 

 procedure TCompileForm.FSaveAllClick(Sender: TObject);

+ 8 - 6
Projects/CompFunc.pas
Wyświetl plik 

@@ -2,7 +2,7 @@ unit CompFunc;
 
 

 {

   Inno Setup

-  Copyright (C) 1997-2020 Jordan Russell

+  Copyright (C) 1997-2024 Jordan Russell

   Portions by Martijn Laan

   For conditions of distribution and use, see LICENSE.TXT.

 

@@ -16,7 +16,7 @@ interface
 
 uses

   Windows,

   Classes, Forms, Dialogs, Menus, StdCtrls,

-  ScintEdit, ModernColors;

+  ScintEdit, CompScintEdit, ModernColors;

 

 const

   MRUListMaxCount = 10;

@@ -48,7 +48,7 @@ procedure SetFakeShortCutText(const MenuItem: TMenuItem; const S: String);
 
 procedure SetFakeShortCut(const MenuItem: TMenuItem; const Key: Word;

   const Shift: TShiftState);

 procedure SaveTextToFile(const Filename: String;

-  const S: String; const ForceUTF8Encoding: Boolean);

+  const S: String; const SaveEncoding: TSaveEncoding);

 procedure AddLines(const ListBox: TListBox; const S: String; const AObject: TObject; const LineBreaks: Boolean; const Prefix: TAddLinesPrefix; const PrefixParam: Cardinal);

 procedure SetLowPriority(ALowPriority: Boolean; var SavePriorityClass: DWORD);

 function GetHelpFile: String;

@@ -306,14 +306,14 @@ begin
 
 end;

 

 procedure SaveTextToFile(const Filename: String;

-  const S: String; const ForceUTF8Encoding: Boolean);

+  const S: String; const SaveEncoding: TSaveEncoding);

 var

   AnsiMode: Boolean;

   AnsiStr: AnsiString;

   F: TTextFileWriter;

 begin

   AnsiMode := False;

-  if not ForceUTF8Encoding then begin

+  if SaveEncoding = seAuto then begin

     AnsiStr := AnsiString(S);

     if S = String(AnsiStr) then

       AnsiMode := True;

@@ -323,8 +323,10 @@ begin
 
   try

     if AnsiMode then

       F.WriteAnsi(AnsiStr)

-    else

+    else begin

+      F.UTF8NoPreamble := SaveEncoding = seUTF8NoPreamble;

       F.Write(S);

+    end;

   finally

     F.Free;

   end;

+ 4 - 3
Projects/CompScintEdit.pas
Wyświetl plik 

@@ -2,7 +2,7 @@ unit CompScintEdit;
 
 

 {

   Inno Setup

-  Copyright (C) 1997-2020 Jordan Russell

+  Copyright (C) 1997-2024 Jordan Russell

   Portions by Martijn Laan

   For conditions of distribution and use, see LICENSE.TXT.

 

@@ -37,6 +37,7 @@ type
 
   TLineState = (lnUnknown, lnHasEntry, lnEntryProcessed);

   PLineStateArray = ^TLineStateArray;

   TLineStateArray = array[0..0] of TLineState;

+  TSaveEncoding = (seAuto, seUTF8, seUTF8NoPreamble);

 

   TCompScintEdit = class(TScintEdit)

   private

@@ -56,7 +57,7 @@ type
 
     FCompilerFileIndex: Integer;

     FFilename: String;

     FFileLastWriteTime: TFileTime;

-    FSaveInUTF8Encoding: Boolean;

+    FSaveEncoding: TSaveEncoding;

   public

     ErrorLine, ErrorCaretPosition: Integer;

     StepLine: Integer;

@@ -68,7 +69,7 @@ type
 
     property Filename: String read FFileName write FFilename;

     property CompilerFileIndex: Integer read FCompilerFileIndex write FCompilerFileIndex;

     property FileLastWriteTime: TFileTime read FFileLastWriteTime write FFileLastWriteTime;

-    property SaveInUTF8Encoding: Boolean read FSaveInUTF8Encoding write FSaveInUTF8Encoding;

+    property SaveEncoding: TSaveEncoding read FSaveEncoding write FSaveEncoding;

   end;

 

 implementation

+ 5 - 5
Projects/Compil32.dpr
Wyświetl plik 

@@ -9,11 +9,6 @@ program Compil32;
 
   Compiler

 }

 

-{$SetPEFlags 1}

-{$SETPEOSVERSION 6.0}

-{$SETPESUBSYSVERSION 6.0}

-{$WEAKLINKRTTI ON}

-

 uses

   SafeDLLPath in 'SafeDLLPath.pas',

   Windows,

@@ -45,6 +40,11 @@ uses
 
   CompScintEdit in 'CompScintEdit.pas',

   CompFileListWin in 'CompFileListWin.pas' {CFLWForm};

 

+{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED} 

+{$SETPEOSVERSION 6.0}

+{$SETPESUBSYSVERSION 6.0}

+{$WEAKLINKRTTI ON}

+

 {$R Compil32.docicon.res}

 {$R Compil32.manifest.res}

 {$R Compil32.versionandicon.res}

+ 3 - 0
Projects/Compile.pas
Wyświetl plik 

@@ -4132,6 +4132,9 @@ begin
 
     ssUninstallIconFile: begin

         WarningsList.Add(Format(SCompilerEntryObsolete, ['Setup', KeyName]));

       end;

+    ssUninstallLogging: begin

+        SetSetupHeaderOption(shUninstallLogging);

+      end;

     ssUninstallLogMode: begin

         if CompareText(Value, 'append') = 0 then

           SetupHeader.UninstallLogMode := lmAppend

+ 5 - 1
Projects/Debug.iss
Wyświetl plik 

@@ -1,5 +1,9 @@
 
+; -- Debug.iss --

+; Opened when you run the Compil32.dproj project in Debug mode from the Delphi IDE

+; Use it to test the compiler or Setup or the uninstaller

+

 [Setup]

-AppName=My Program

+AppName=ɯɐɹƃoɹd ʎɯ

 AppVerName=My Program version 1.5

 DefaultDirName={autopf}\My Program

 UseSetupLdr=0

+ 24 - 8
Projects/FileClass.pas
Wyświetl plik 

@@ -2,7 +2,7 @@ unit FileClass;
 
 

 {

   Inno Setup

-  Copyright (C) 1997-2010 Jordan Russell

+  Copyright (C) 1997-2024 Jordan Russell

   Portions by Martijn Laan

   For conditions of distribution and use, see LICENSE.TXT.

 

@@ -11,8 +11,6 @@ unit FileClass;
 
   and uses descriptive, localized system error messages.

 

   TTextFileReader and TTextFileWriter support ANSI and UTF8 textfiles only.

-

-  $jrsoftware: issrc/Projects/FileClass.pas,v 1.31 2010/01/26 06:26:18 jr Exp $

 }

 

 {$I VERSION.INC}

@@ -117,12 +115,14 @@ type
 
   TTextFileWriter = class(TFile)

   private

     FSeekedToEnd: Boolean;

+    FUTF8NoPreamble: Boolean;

     procedure DoWrite(const S: AnsiString{$IFDEF UNICODE}; const UTF8: Boolean{$ENDIF});

   protected

     function CreateHandle(const AFilename: String;

       ACreateDisposition: TFileCreateDisposition; AAccess: TFileAccess;

       ASharing: TFileSharing): THandle; override;

   public

+    property UTF8NoPreamble: Boolean read FUTF8NoPreamble write FUTF8NoPreamble;

     procedure Write(const S: String);

     procedure WriteLine(const S: String);

 {$IFDEF UNICODE}

@@ -155,6 +155,7 @@ type
 
 implementation

 

 uses

+  WideStrUtils,

   CmnFunc2;

 

 const

@@ -503,10 +504,25 @@ begin
 
   end;

   {$IFDEF UNICODE}

   if not FSawFirstLine then begin

-    { Handle UTF8 BOM if requested }

-    if UTF8 and (Length(S) > 2) and (S[1] = #$EF) and (S[2] = #$BB) and (S[3] = #$BF) then begin

-      Delete(S, 1, 3);

-      FCodePage := CP_UTF8;

+    if UTF8 then begin

+      { Handle UTF8 as requested: check for a BOM at the start and if not found then check entire file }

+      if (Length(S) > 2) and (S[1] = #$EF) and (S[2] = #$BB) and (S[3] = #$BF) then begin

+        Delete(S, 1, 3);

+        FCodePage := CP_UTF8;

+      end else begin

+        var OldPosition := GetPosition;

+        try

+          var CappedSize := GetCappedSize; //can't be 0

+          Seek(0);

+          var S2: AnsiString;

+          SetLength(S2, CappedSize);

+          SetLength(S2, Read(S2[1], CappedSize));

+          if IsUTF8String(S2) then

+            FCodePage := CP_UTF8;

+        finally

+          Seek64(OldPosition);

+        end;

+      end;

     end;

     FSawFirstLine := True;

   end;

@@ -563,7 +579,7 @@ begin
 
         WriteBuffer(CRLF, SizeOf(CRLF));

       end;

 {$IFDEF UNICODE}

-    end else if UTF8 then

+    end else if UTF8 and not FUTF8NoPreamble then

       WriteBuffer(UTF8Preamble, SizeOf(UTF8Preamble));

 {$ELSE}

     end;

+ 5 - 5
Projects/ISCC.dpr
Wyświetl plik 

@@ -10,11 +10,6 @@ program ISCC;
 
   Command-line compiler

 }

 

-{$SetPEFlags 1} 

-{$SETPEOSVERSION 6.0}

-{$SETPESUBSYSVERSION 6.0}

-{$WEAKLINKRTTI ON}

-

 {x$DEFINE STATICCOMPILER}

 { For debugging purposes, remove the 'x' to have it link the compiler code

   into this program and not depend on ISCmplr.dll. }

@@ -25,6 +20,11 @@ uses
 
   {$IFDEF STATICCOMPILER} Compile, {$ENDIF}

   PathFunc, CmnFunc2, CompInt, FileClass, CompTypes;

 

+{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED} 

+{$SETPEOSVERSION 6.0}

+{$SETPESUBSYSVERSION 6.0}

+{$WEAKLINKRTTI ON}

+

 {$R ISCC.manifest.res}

 {$R ISCC.versionandicon.res}

+ 5 - 5
Projects/ISCmplr.dpr
Wyświetl plik 

@@ -9,11 +9,6 @@ library ISCmplr;
 
   Compiler DLL

 }

 

-{$IMAGEBASE $00800000}

-{$SETPEOSVERSION 6.0}

-{$SETPESUBSYSVERSION 6.0}

-{$WEAKLINKRTTI ON}

-

 uses

   SafeDLLPath in 'SafeDLLPath.pas',

   SysUtils,

@@ -36,6 +31,11 @@ uses
 
   ArcFour in 'ArcFour.pas',

   VerInfo in 'VerInfo.pas';

 

+{$IMAGEBASE $00800000}

+{$SETPEOSVERSION 6.0}

+{$SETPESUBSYSVERSION 6.0}

+{$WEAKLINKRTTI ON}

+

 {$R ISCmplr.images.res}

 {$R ISCmplr.version.res}

+ 5 - 6
Projects/ISPP/ISPP.dpr
Wyświetl plik 

@@ -10,12 +10,6 @@
 
 

 library ISPP;

 

-{$IMAGEBASE $01800000}

-{$SETPEOSVERSION 6.0}

-{$SETPESUBSYSVERSION 6.0}

-{$WEAKLINKRTTI ON}

-{$I ..\Version.inc}

-

 uses

   SysUtils,

   Windows,

@@ -41,6 +35,11 @@ uses
 
   SHA1 in '..\SHA1.pas',

   Struct in '..\Struct.pas';

   

+{$IMAGEBASE $01800000}

+{$SETPEOSVERSION 6.0}

+{$SETPESUBSYSVERSION 6.0}

+{$WEAKLINKRTTI ON}

+

 {$R ISPP.version.res}

 

 exports

+ 7 - 2
Projects/Install.pas
Wyświetl plik 

@@ -691,8 +691,13 @@ var
 
         I := 63;

       SetStringValue(H2, 'DisplayName', Copy(Z, 1, I));

       SetStringValueUnlessEmpty(H2, 'DisplayIcon', ExpandConst(SetupHeader.UninstallDisplayIcon));

-      SetStringValue(H2, 'UninstallString', '"' + UninstallExeFilename + '"');

-      SetStringValue(H2, 'QuietUninstallString', '"' + UninstallExeFilename + '" /SILENT');

+      var ExtraUninstallString: String;

+      if shUninstallLogging in SetupHeader.Options then

+        ExtraUninstallString := ' /LOG'

+      else

+        ExtraUninstallString := '';

+      SetStringValue(H2, 'UninstallString', '"' + UninstallExeFilename + '"' + ExtraUninstallString);

+      SetStringValue(H2, 'QuietUninstallString', '"' + UninstallExeFilename + '" /SILENT' + ExtraUninstallString);

       SetStringValueUnlessEmpty(H2, 'DisplayVersion', ExpandConst(SetupHeader.AppVersion));

       SetStringValueUnlessEmpty(H2, 'Publisher', ExpandConst(SetupHeader.AppPublisher));

       SetStringValueUnlessEmpty(H2, 'URLInfoAbout', ExpandConst(SetupHeader.AppPublisherURL));

+ 2 - 1
Projects/ScriptFunc.pas
Wyświetl plik 

@@ -349,7 +349,7 @@ const
 
   );

 

   { Other }

-  OtherTable: array [0..33] of AnsiString =

+  OtherTable: array [0..34] of AnsiString =

   (

     'procedure BringToFrontAndRestore;',

     'function WizardDirValue: String;',

@@ -379,6 +379,7 @@ const
 
     'function SaveStringToFile(const FileName: String; const S: AnsiString; const Append: Boolean): Boolean;',

     'function SaveStringsToFile(const FileName: String; const S: TArrayOfString; const Append: Boolean): Boolean;',

     'function SaveStringsToUTF8File(const FileName: String; const S: TArrayOfString; const Append: Boolean): Boolean;',

+    'function SaveStringsToUTF8FileNoPreamble(const FileName: String; const S: TArrayOfString; const Append: Boolean): Boolean;',

     'function EnableFsRedirection(const Enable: Boolean): Boolean;',

     'function GetUninstallProgressForm: TUninstallProgressForm;',

     'function CreateCallback(Method: AnyMethod): Longword;',

+ 8 - 3
Projects/ScriptFunc_R.pas
Wyświetl plik 

@@ -1793,7 +1793,7 @@ function OtherProc(Caller: TPSExec; Proc: TPSExternalProcRec; Global, Stack: TPS
 
     end;

   end;

 

-  function SaveStringsToFile(const FileName: String; const Arr: PPSVariantIFC; Append, UTF8: Boolean): Boolean;

+  function SaveStringsToFile(const FileName: String; const Arr: PPSVariantIFC; Append, UTF8, UTF8NoPreamble: Boolean): Boolean;

   var

     F: TTextFileWriter;

     I, N: Integer;

@@ -1809,6 +1809,8 @@ function OtherProc(Caller: TPSExec; Proc: TPSExternalProcRec; Global, Stack: TPS
 
       else

         F := TTextFileWriterRedir.Create(ScriptFuncDisableFsRedir, FileName, fdCreateAlways, faWrite, fsNone);

       try

+        if UTF8 and UTF8NoPreamble then

+          F.UTF8NoPreamble := UTF8NoPreamble;

         N := PSDynArrayGetLength(Pointer(Arr.Dta^), Arr.aType);

         for I := 0 to N-1 do begin

           S := VNGetString(PSGetArrayField(Arr^, I));

@@ -2027,10 +2029,13 @@ begin
 
     Stack.SetBool(PStart, SaveStringToFile(Stack.GetString(PStart-1), StackGetAnsiString(Stack, PStart-2), Stack.GetBool(PStart-3)));

   end else if Proc.Name = 'SAVESTRINGSTOFILE' then begin

     Arr := NewTPSVariantIFC(Stack[PStart-2], True);

-    Stack.SetBool(PStart, SaveStringsToFile(Stack.GetString(PStart-1), @Arr, Stack.GetBool(PStart-3), False));

+    Stack.SetBool(PStart, SaveStringsToFile(Stack.GetString(PStart-1), @Arr, Stack.GetBool(PStart-3), False, False));

   end else if Proc.Name = 'SAVESTRINGSTOUTF8FILE' then begin

     Arr := NewTPSVariantIFC(Stack[PStart-2], True);

-    Stack.SetBool(PStart, SaveStringsToFile(Stack.GetString(PStart-1), @Arr, Stack.GetBool(PStart-3), True));

+    Stack.SetBool(PStart, SaveStringsToFile(Stack.GetString(PStart-1), @Arr, Stack.GetBool(PStart-3), True, False));

+  end else if Proc.Name = 'SAVESTRINGSTOUTF8FILENOPREAMBLE' then begin

+    Arr := NewTPSVariantIFC(Stack[PStart-2], True);

+    Stack.SetBool(PStart, SaveStringsToFile(Stack.GetString(PStart-1), @Arr, Stack.GetBool(PStart-3), True, True));

   end else if Proc.Name = 'ENABLEFSREDIRECTION' then begin

     Stack.SetBool(PStart, not ScriptFuncDisableFsRedir);

     if Stack.GetBool(PStart-1) then

+ 5 - 5
Projects/Setup.dpr
Wyświetl plik 

@@ -9,11 +9,6 @@ program Setup;
 
   Setup program

 }

 

-{$SetPEFlags 1} 

-{$SETPEOSVERSION 6.1}

-{$SETPESUBSYSVERSION 6.1}

-{$WEAKLINKRTTI ON}

-

 uses

   SafeDLLPath in 'SafeDLLPath.pas',

   XPTheme in 'XPTheme.pas',

@@ -74,6 +69,11 @@ uses
 
   SpawnClient in 'SpawnClient.pas',

   TaskDialog in 'TaskDialog.pas';

 

+{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}

+{$SETPEOSVERSION 6.1}

+{$SETPESUBSYSVERSION 6.1}

+{$WEAKLINKRTTI ON}

+

 {$R Setup.icon.res}

 {$R Setup.images.res}

 {$R Setup.version.res}

+ 5 - 5
Projects/SetupLdr.dpr
Wyświetl plik 

@@ -9,11 +9,6 @@ program SetupLdr;
 
   Setup Loader

 }

 

-{$SetPEFlags 1} 

-{$SETPEOSVERSION 6.1}

-{$SETPESUBSYSVERSION 6.1}

-{$WEAKLINKRTTI ON}

-

 uses

   SafeDLLPath in 'SafeDLLPath.pas',

   XPTheme in 'XPTheme.pas',

@@ -31,6 +26,11 @@ uses
 
   InstFunc in 'InstFunc.pas',

   FileClass in 'FileClass.pas';

 

+{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED} 

+{$SETPEOSVERSION 6.1}

+{$SETPESUBSYSVERSION 6.1}

+{$WEAKLINKRTTI ON}

+

 {$R Setup.icon.res}

 {$R SetupLdr.version.res}

 {$R SetupLdr.offsettable.res}

+ 1 - 0
Projects/SetupSectionDirectives.pas
Wyświetl plik 

@@ -136,6 +136,7 @@ type
 
     ssUninstallDisplaySize,

     ssUninstallFilesDir,

     ssUninstallIconFile,

+    ssUninstallLogging,

     ssUninstallLogMode,

     ssUninstallRestartComputer,

     ssUninstallStyle,

+ 3 - 3
Projects/Struct.pas
Wyświetl plik 

@@ -17,8 +17,8 @@ uses
 
 

 const

   SetupTitle = 'Inno Setup';

-  SetupVersion = '6.2.3-dev';

-  SetupBinVersion = (6 shl 24) + (2 shl 16) + (3 shl 8) + 0;

+  SetupVersion = '6.3.0';

+  SetupBinVersion = (6 shl 24) + (3 shl 16) + (0 shl 8) + 0;

 

 type

   TSetupID = array[0..63] of AnsiChar;

@@ -66,7 +66,7 @@ type
 
     shSignedUninstaller, shUsePreviousLanguage, shDisableWelcomePage,

     shCloseApplications, shRestartApplications, shAllowNetworkDrive,

     shForceCloseApplications, shAppNameHasConsts, shUsePreviousPrivileges,

-    shWizardResizable);

+    shWizardResizable, shUninstallLogging);

   TSetupLanguageDetectionMethod = (ldUILanguage, ldLocale, ldNone);

   TSetupCompressMethod = (cmStored, cmZip, cmBzip, cmLZMA, cmLZMA2);

   TSetupSalt = array[0..7] of Byte;

+ 26 - 31
README.md
Wyświetl plik 

@@ -1,8 +1,8 @@
 
 Inno Setup

 ==========

 

-Copyright (C) 1997-2024 Jordan Russell. All rights reserved.  

-Portions Copyright (C) 2000-2024 Martijn Laan. All rights reserved.  

+Copyright (C) 1997-2024 Jordan Russell. All rights reserved.

+Portions Copyright (C) 2000-2024 Martijn Laan. All rights reserved.

 For conditions of distribution and use, see LICENSE.TXT.

 

 Source code README

@@ -47,12 +47,12 @@ Getting Started
 
    every change on every Delphi version.

   

    There's a free version of Delphi available called the Community Edition.

-   See https://www.embarcadero.com/products/delphi/starter/free-download

+   See https://www.embarcadero.com/products/delphi/starter/free-download.

 

 3. **Install Microsoft HTML Help Workshop**

 

    Install Microsoft HTML Help Workshop if you haven't already done so.

-   See https://docs.microsoft.com/en-us/previous-versions/windows/desktop/htmlhelp/microsoft-html-help-downloads and 

+   See https://docs.microsoft.com/en-us/previous-versions/windows/desktop/htmlhelp/microsoft-html-help-downloads and

    http://web.archive.org/web/20160201063255/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe

 

    Note: Microsoft HTML Help Workshop is only needed to be able to compile the

@@ -62,26 +62,26 @@ Getting Started
 
 4. **Build Inno Setup**

 

    Unfortunately, Embarcadero has removed command line compilation support

-   from the Community Edition, which means you there's two different build 

+   from the Community Edition, which means there's two different build

    scripts.

 

    Community Edition: To build all files run **build-ce.bat** and follow the

-   instructions  

+   instructions.

 

    Otherwise: To build all files run **build.bat** and follow the instructions.

 

    To just compile Inno Setup run **compile.bat** and follow the instructions.

-   This batch file can not be used with the Community Edition, open

+   This batch file cannot be used with the Community Edition, open

    Projects\Projects.groupproj instead.

 

    To just compile the Inno Setup help file and its web version run

    **ISHelp\ISHelpGen\compile.bat** and **ISHelp\compile.bat** and follow the

-   instructions. The former batch file can not be used with the

+   instructions. The former batch file cannot be used with the

    Community Edition, open Projects\Projects.groupproj instead.

 

    To just compile the Inno Setup Preprocessor help file and its web version run

    **ISHelp\ISHelpGen\compile.bat** and **Projects\Ispp\Help\compile.bat** and

-   follow the instructions. The former batch file can not be used with the

+   follow the instructions. The former batch file cannot be used with the

    Community Edition, open Projects\Projects.groupproj instead.

 

 

@@ -226,20 +226,18 @@ Inno Setup-specific editing guidelines for the help files
 
 Setting up Continuous Integration

 ---------------------------------

 

-Delphi is not offered for download via a public link, and while there is a

-free-of-charge community version, its license terms forbid sharing it with others, or

-even let other developers (outside your direct teammates) use it. However, what _is_

-allowed is to copy the files (or a subset thereof) to another machine for the specific

-purpose of supporting unattended builds.

-

-Inno Setup's source code includes a GitHub workflow that performs such unattended

-builds upon `push` events, it requires some setting up, though.

+Inno Setup's source code includes a GitHub workflow that performs unattended builds

+upon `push` events, it requires some setting up, though.

 

 Note: The following instructions assume that you have a correctly-licensed version

-of Delphi installed into `C:\Program Files (x86)\Embarcadero\Studio\20.0`.

+of Delphi installed into `C:\Program Files (x86)\Embarcadero\Studio\20.0`. This may

+not be a Community Edition because it does not support command line compilation.

+Also ensure your current Delphi license still allows you to copy a subset of the

+Delphi files to another machine for the specific purpose of supporting unattended

+builds.

 

-To generate the (encrypted) `.zip` file containing the files needed to build

-Inno Setup, use [7-Zip](https://www.7-zip.org/):

+First, generate an encrypted `.zip` file containing the files needed to build

+Inno Setup using [7-Zip]:

 

 ```

 cd C:\Program Files (x86)\Embarcadero\Studio\20.0

@@ -254,10 +252,9 @@ cd C:\Program Files (x86)\Embarcadero\Studio\20.0
 
 	lib/win32/release/Winapi.*.dcu

 ```

 

-Then, upload this somewhere public, e.g. by attaching it to a comment in a

-GitHub issue. After that, add this URL as a new repository

-[secret](https://docs.github.com/en/actions/security-guides/encrypted-secrets)

-(at https://github.com/YOUR-USER-NAME/issrc/settings/secrets/actions), under the name

+Then, upload this encrypted file somewhere public, e.g. by attaching it to a comment

+in a GitHub issue. After that, add this URL as a new repository

+[secret] (at https://github.com/YOUR-USER-NAME/issrc/settings/secrets/actions), under the name

 `ISSRC_BUILD_ENV_ZIP_URL`, and the password as `ISSRC_BUILD_ENV_ZIP_PASSWORD`.

 

 Finally, indicate that your fork of the repository has those secrets, by adding the

@@ -272,9 +269,8 @@ workflow will be triggered automatically.
 
 If you have a code-signing certificate, you can use that in the Continuous

 Integration to produce artifacts that are code-signed, too, as long as the

 certificate does not require any local-only security factor such as a USB

-security key. To use the certificate, you first have to add the [repository

-secret](https://docs.github.com/en/actions/security-guides/encrypted-secrets#creating-encrypted-secrets-for-a-repository)

-`CODESIGN_P12`, using as value the base64-encoded file contents of the

+security key. To use the certificate, you first have to add the repository

+[secret] `CODESIGN_P12`, using as value the base64-encoded file contents of the

 certificate's `.p12` file (obtain this value e.g. by running `base64 -w 0

 <my-certificate.p12`). Then, add the corresponding certificate password as

 repository secret named `CODESIGN_PASS`.

@@ -283,10 +279,7 @@ Once these two repository secrets are set, the Continuous Integration will
 
 automatically pick them up and code-sign the generated executable files.

 

 Note: These repository secrets are only _used_ in the Continuous Integration,

-and will _not_ be included in the build artifacts. Meaning: You do not have to

-worry that the InnoSetup compiler that is produced by the Continuous

-Integration will automatically use your code-signing certificate

-_on its own_ to produce code-signed installers.

+and will _not_ be included in the build artifacts.

 

 <!-- Link references -->

 [CONTRIBUTING.md]: <CONTRIBUTING.md>

@@ -295,3 +288,5 @@ _on its own_ to produce code-signed installers.
 
 [Examples\MyProg]: <Examples/MyProg>

 [Projects\LzmaDecode\compiling.txt]: <Projects/LzmaDecode/compiling.txt>

 [Projects\Lzma2\Decoder\compiling.txt]: <Projects/Lzma2/Decoder/compiling.txt>

+[7-Zip]: https://www.7-zip.org/

+[secret]: https://docs.github.com/en/actions/security-guides/encrypted-secrets

+ 1 - 1
build-ce.bat
Wyświetl plik 

@@ -19,7 +19,7 @@ rem  Once done the installer can be found in Output
 
 

 setlocal

 

-set VER=6.2.3-dev

+set VER=6.3.0

 

 echo Building Inno Setup %VER%...

 echo.

+ 1 - 1
build.bat
Wyświetl plik 

@@ -20,7 +20,7 @@ rem  Once done the installer can be found in Output
 
 

 setlocal

 

-set VER=6.2.3-dev

+set VER=6.3.0

 

 echo Building Inno Setup %VER%...

 echo.

+ 1 - 1
setup.iss
Wyświetl plik 

@@ -15,7 +15,7 @@
 
 [Setup]

 AppName=Inno Setup

 AppId={code:GetAppId|Inno Setup 6}

-AppVersion=6.2.3-dev

+AppVersion=6.3.0

 AppPublisher=jrsoftware.org

 AppPublisherURL=https://www.innosetup.com/

 AppSupportURL=https://www.innosetup.com/

+ 15 - 2
whatsnew.htm
Wyświetl plik 

@@ -28,13 +28,26 @@ For conditions of distribution and use, see <a href="https://jrsoftware.org/file
 
 

 <p><b>Want to be notified by e-mail of new Inno Setup releases?</b> <a href="https://jrsoftware.org/ismail.php">Subscribe</a> to the Inno Setup Mailing List!</p>

 

-<p><a name="6.2.3"></a><span class="ver">6.2.3-dev </span><span class="date">(?)</span></p>

+<p><a name="6.3.0"></a><span class="ver">6.3.0-dev </span><span class="date">(?)</span></p>

 <ul>

+  <li>Inno Setup now supports UTF-8 encoded .iss script files and .isl messages files without an UTF-8 preamble (also called BOM).</li>

+  <li>Compiler IDE changes:

+  <ul>

+  <li>Added new <i>UTF-8 without BOM</i> menu item to the <i>Save Encoding</i> submenu of the <i>File</i> menu.</li>

+  <li>New script files are now saved as UTF-8 with BOM by default. Existing files are still saved as they were.</li>

+  </ul>

+  </li>

+  <li>Pascal Scripting changes:

+  <ul>

+    <li>Support function <tt>LoadStringsFromFile</tt> now also supports UTF8-encoded files without an UTF-8 preamble.</li>

+    <li>Added new <tt>SaveStringsToUTF8FileNoPreamble</tt> support function.</li>

+  </ul>

+  <li>Added new [Setup] section directive <tt>UninstallLogging</tt>, which defaults to <tt>no</tt>. If set to <tt>yes</tt>, the uninstaller will always create a log file if it is launched from the <i>Add/Remove Programs</i> Control Panel applet. Equivalent to passing /LOG on the command line.</li>

   <li>During startup Setup would always ask Windows to create any missing <tt>{usercf}</tt>, <tt>{userpf}</tt>, and <tt>{usersavedgames}</tt> folders. It no longer does until the script asks for the folder. Note that scripts running in administrative install mode should not do this because it violates the <a href="https://jrsoftware.org/ishelp/index.php?topic=setup_useduserareaswarning">used user areas warning</a>.</li>

   <li>Added support for IIS group users identifiers (<tt>iisiusrs</tt>) for use in <tt>Permissions</tt> parameters, contributed by Achim Stuy.</li> 

   <li>Pascal Scripting change: type <tt>TShellFolderID</tt> was removed because it wasn't used by any support function.</a>

   <li>Added official Korean translation.</li>

-  <li>Inno Setup is now built using Delphi 10.4.2 Sydney instead of Delphi 10.3 Rio.</li>

+  <li>Inno Setup is now built using Delphi 11.3 Alexandria instead of Delphi 10.3 Rio.</li>

 </ul>

 

 <p><a name="6.2.2"></a><span class="ver">6.2.2 </span><span class="date">(2023-02-15)</span></p>