Merge branch 'main' into files-download

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - name: initialize build environment
+      - name: Initialize build environment
         env:
           ISSRC_BUILD_ENV_ZIP_PASSWORD: ${{ secrets.ISSRC_BUILD_ENV_ZIP_PASSWORD }}
           ISSRC_BUILD_ENV_ZIP_URL: ${{ secrets.ISSRC_BUILD_ENV_ZIP_URL }}
@@ -29,42 +29,48 @@ jobs:
           }
           Remove-Item issrc-build-env.zip
           $DELPHIXEROOT = (Get-Item .\issrc-build-env).FullName
-          "DELPHIXEROOT=$DELPHIXEROOT" |  Out-File -NoNewLine -Encoding ascii -Append "$env:GITHUB_ENV"
-      - name: build issrc
+          "DELPHIXEROOT=$DELPHIXEROOT" | Out-File -NoNewLine -Encoding ascii -Append "$env:GITHUB_ENV"
+      - name: Build issrc
         run: |
           "set DELPHIXEROOT=$env:DELPHIXEROOT" | Out-File -Encoding ascii compilesettings.bat
-          "set ISSIGTOOL_KEY_FILE=${{github.workspace}}\home\bin\mykey.isprivatekey" | Out-File -NoNewline -Encoding ascii -Append compilesettings.bat
+          "set ISSIGTOOL_KEY_FILE=${{github.workspace}}\mykey.isprivatekey" | Out-File -NoNewline -Encoding ascii -Append compilesettings.bat
           "set DELPHIXEROOT=$env:DELPHIXEROOT" | Out-File -NoNewline -Encoding ascii ISHelp\ISHelpGen\compilesettings.bat
           "set HHCEXE=%ProgramFiles(x86)%\HTML Help Workshop\hhc.exe" | Out-File -NoNewline -Encoding ascii ISHelp\compilesettings.bat
           .\build.bat
-      - name: copy license.txt into all artifacts
+      - name: Clean up temporary files
+        if: always()
+        shell: bash
+        run: rm -rf mykey.isprivatekey
+      - name: Copy license.txt into all artifacts
         run: |
           copy license.txt Files
           copy license.txt Output
           copy license.txt ISHelp/Staging
-      - name: upload Files
+      - name: Upload Files/
         uses: actions/upload-artifact@v4
         with:
           name: Files
           path: Files/
-      - name: upload installer
+      - name: Upload Output/
         uses: actions/upload-artifact@v4
         with:
           name: Output
           path: Output/
-      - name: upload ISHelp
+      - name: Upload ISHelp/
         uses: actions/upload-artifact@v4
         with:
           name: ISHelp
-          path: ISHelp/Staging/
-      - name: find mt.exe
+          path: |
+            ISHelp/Staging/
+            ISHelp/Staging-dark/
+      - name: Find mt.exe
         shell: bash
         run: |
           set -x &&
           mt=$(ls -t /c/Program\ Files*/Windows\ Kits/10/bin/*/x64/mt.exe) &&
           test -n "$mt" &&
           echo "${mt%%/mt.exe*}" >>$GITHUB_PATH
-      - name: verify installer
+      - name: Verify installer
         shell: bash
         run: |
           set -x &&
@@ -91,12 +97,12 @@ jobs:
           test -x InnoSetup/ISCC.exe &&
           ./Procmon.exe -Terminate -Quiet &&
           powershell -command 'start-process -NoNewWindow -Wait -FilePath .\Procmon.exe -ArgumentList "-OpenLog trace\procmon.pml -SaveAs trace\procmon.csv"'
-      - name: upload trace
+      - name: Upload trace
         uses: actions/upload-artifact@v4
         with:
           name: trace
           path: trace/
-      - name: check trace
+      - name: Check trace
         shell: bash
         run: |
           set -x &&

ISHelp/ISHelpGen/ISHelpGen.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Console</AppType>
         <FrameworkType>None</FrameworkType>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">ISHelpGen</ProjectName>
     </PropertyGroup>

Projects/Compil32.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">Compil32</ProjectName>
     </PropertyGroup>

Projects/ISCC.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Console</AppType>
         <FrameworkType>None</FrameworkType>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">ISCC</ProjectName>
     </PropertyGroup>

Projects/ISCmplr.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Library</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">ISCmplr</ProjectName>
     </PropertyGroup>

Projects/ISPP.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Library</AppType>
         <FrameworkType>None</FrameworkType>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">ISPP</ProjectName>
     </PropertyGroup>

Projects/ISSigTool.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Console</AppType>
         <FrameworkType>None</FrameworkType>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">ISSigTool</ProjectName>
     </PropertyGroup>

Projects/Setup.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">Setup</ProjectName>
     </PropertyGroup>

Projects/SetupLdr.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>None</FrameworkType>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">SetupLdr</ProjectName>
     </PropertyGroup>

README.md

@@ -38,7 +38,8 @@ Getting Started
 
 2. **Install Embarcadero Delphi**
 
-   We compile all of Inno Setup's projects under Delphi 12.1 Athens with Patch 1 installed.
+   We compile all of Inno Setup's projects under Delphi 12.3 Athens with the
+   May Patch installed.
 
    There's a free version of Delphi available called the Community Edition.
    See https://www.embarcadero.com/products/delphi/starter/free-download.
@@ -248,7 +249,7 @@ 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
+cd /d C:\Program Files (x86)\Embarcadero\Studio\23.0
 "C:\Program Files\7-Zip\7z.exe" a -mx9 -mem=AES256 -p"<password>" ^
 	%USERPROFILE%\issrc-build-env.zip ^
 	bin\dcc32.exe bin\rlink32.dll bin\lnk*.dll ^

build-ce.bat

@@ -120,7 +120,7 @@ echo Creating Inno Setup installer done
 call .\issig.bat sign output\innosetup-%VER%.exe
 if errorlevel 1 goto failed
 powershell.exe -NoProfile -Command "Write-Host -NoNewline 'SHA256 hash: '; (Get-FileHash -Algorithm SHA256 -Path output\innosetup-%VER%.exe).Hash.ToLower()"
-if errorlevel 1 goto failed
+rem ignoring error here
 
 echo All done!
 pause

build.bat

@@ -105,7 +105,7 @@ echo Creating Inno Setup installer done
 call .\issig.bat sign output\innosetup-%VER%.exe
 if errorlevel 1 goto failed
 powershell.exe -NoProfile -Command "Write-Host -NoNewline 'SHA256 hash: '; (Get-FileHash -Algorithm SHA256 -Path output\innosetup-%VER%.exe).Hash.ToLower()"
-if errorlevel 1 goto failed
+rem ignoring error here
 
 echo All done!
 pause