Merging Cmder's development branch to master branch

.git-blame-ignore-revs

@@ -0,0 +1,15 @@
+# List of whitespace-only commits to ignore in the Git blame;
+# to improve tracking changes and avoid noise
+58db4e3419bf1e5cc1bb61fcd7ce2ebbca89243a
+efb3338f5cf0eec21e8a75abc62ee14965cb4a7e
+3859f6ffc088b2ae78748abc84986f4adcadcd41
+d6569192fc91167f555c3eff58402ff01f1197ea
+67de97a492c9389f95499db38f9474a1c20ec585
+a0d085f93eaa69c22449d0217e8daf9eaea2b180
+1cfba25beb46c74bb1debca2bcfe7ac470e96172
+f6bc623284914489e891bbac923feb774c862b99
+abbab3f8b477e917d0a175d0de23cce121096631
+126347025f9cade241beff182738b2527da7535e
+4740b836f300658b27e6ad4d79efac63c9c24c24
+be44bac95670b1cbbc91bd657882d985989846f9
+f67e5704eda60526d495be758572181f01a6cac8

.github/workflows/build.yml

@@ -79,6 +79,11 @@ jobs:
           $branchLink = "https://github.com/${{ github.repository }}/tree/$refName"
         }
 
+        Write-Host "::notice title=Build info::Cmder $cmderVersion was built from branch '$actualBranchName' via '$eventName'."
+        if ($prNumber) {
+          Write-Host "::notice title=Pull request::Associated with PR #$prNumber."
+        }
+
         $summary = @"
         ## 📦 Build Cmder - Workflow Summary
 
@@ -88,7 +93,8 @@ jobs:
         | Property | Value |
         | --- | --- |
         | Repository | [``${{ github.repository }}``](https://github.com/${{ github.repository }}) |
-        | Branch | [``$actualBranchName``]($branchLink) |
+        | Source Branch | [``$actualBranchName``]($branchLink) |
+        | Event | ``$eventName`` |
         "@
 
         if ($prNumber) {
@@ -98,7 +104,7 @@ jobs:
         $summary += @"
         | Commit | [``${{ github.sha }}``](https://github.com/${{ github.repository }}/commit/${{ github.sha }}) |
         | Actor | [@${{ github.actor }}](https://github.com/${{ github.actor }}) |
-        | Workflow | ``${{ github.workflow }}`` |
+        | Workflow | [``${{ github.workflow }}``](https://github.com/${{ github.repository }}/blob/${{ github.sha }}/.github/workflows/build.yml) |
         | Cmder Version | **$cmderVersion** |
 
         ---
@@ -135,7 +141,6 @@ jobs:
         }
 
         $summary += "`n"
-
         $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8
 
     - name: Add MSBuild to PATH
@@ -144,116 +149,194 @@ jobs:
     - name: Build Cmder Launcher
       shell: pwsh
       working-directory: scripts
-      run: .\build.ps1 -Compile -verbose
+      run: .\build.ps1 -Compile -Terminal all -Verbose
 
     - name: Summary - Build completed
       if: success()
       shell: pwsh
       run: |
-        $summary = @"
-
-        ---
-
-        ✅ Cmder built successfully.
-
-        "@
-
-        $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8
+        echo "### ✅ Build Status" >> $env:GITHUB_STEP_SUMMARY
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+        echo "Cmder launcher successfully compiled." >> $env:GITHUB_STEP_SUMMARY
+        echo "" >> $env:GITHUB_STEP_SUMMARY
 
     - name: Pack the built files
       shell: pwsh
       working-directory: scripts
-      run: .\pack.ps1 -verbose
+      run: .\pack.ps1 -Terminal all -Verbose
 
-    - name: Upload artifact (cmder.zip)
+    - name: Upload artifact (cmder_slim.7z)
+      id: upload_cmder_slim_7z
+      uses: actions/upload-artifact@v7
+      with:
+        path: build/cmder_slim/cmder_slim.7z
+        if-no-files-found: error
+        archive: false
+
+    - name: Upload artifact (cmder_slim.zip)
+      id: upload_cmder_slim_zip
       uses: actions/upload-artifact@v7
       with:
-        path: build/cmder.zip
-        name: cmder.zip
+        path: build/cmder_slim/cmder_slim.zip
+        if-no-files-found: error
         archive: false
+
+    - name: Upload artifact (cmder_slim_mini.zip)
+      id: upload_cmder_slim_mini_zip
+      uses: actions/upload-artifact@v7
+      with:
+        path: build/cmder_slim/cmder_slim_mini.zip
         if-no-files-found: error
+        archive: false
 
     - name: Upload artifact (cmder.7z)
+      id: upload_cmder_7z
       uses: actions/upload-artifact@v7
       with:
-        path: build/cmder.7z
-        name: cmder.7z
+        path: build/cmder/cmder.7z
+        if-no-files-found: error
+        archive: false
+
+    - name: Upload artifact (cmder.zip)
+      id: upload_cmder_zip
+      uses: actions/upload-artifact@v7
+      with:
+        path: build/cmder/cmder.zip
+        if-no-files-found: error
         archive: false
 
     - name: Upload artifact (cmder_mini.zip)
+      id: upload_cmder_mini_zip
+      uses: actions/upload-artifact@v7
+      with:
+        path: build/cmder/cmder_mini.zip
+        if-no-files-found: error
+        archive: false
+
+    - name: Upload artifact (cmder_conemu.7z)
+      id: upload_cmder_conemu_7z
       uses: actions/upload-artifact@v7
       with:
-        path: build/cmder_mini.zip
-        name: cmder_mini.zip
+        path: build/cmder_conemu/cmder_conemu.7z
+        if-no-files-found: error
+        archive: false
+
+    - name: Upload artifact (cmder_conemu.zip)
+      id: upload_cmder_conemu_zip
+      uses: actions/upload-artifact@v7
+      with:
+        path: build/cmder_conemu/cmder_conemu.zip
+        if-no-files-found: error
+        archive: false
+
+    - name: Upload artifact (cmder_conemu_mini.zip)
+      id: upload_cmder_conemu_mini_zip
+      uses: actions/upload-artifact@v7
+      with:
+        path: build/cmder_conemu/cmder_conemu_mini.zip
+        if-no-files-found: error
         archive: false
 
     - name: Upload artifact (hashes.txt)
+      id: upload_hashes_txt
       uses: actions/upload-artifact@v7
       with:
         path: build/hashes.txt
-        name: hashes.txt
+        if-no-files-found: error
         archive: false
 
-    - name: Summary - Artifacts uploaded
+    - name: Summary - Package artifacts
       if: success()
       shell: pwsh
       env:
         GH_TOKEN: ${{ github.token }}
+        ARTIFACT_URL_CMDER_SLIM_7Z: ${{ steps.upload_cmder_slim_7z.outputs.artifact-url }}
+        ARTIFACT_URL_CMDER_SLIM_ZIP: ${{ steps.upload_cmder_slim_zip.outputs.artifact-url }}
+        ARTIFACT_URL_CMDER_SLIM_MINI_ZIP: ${{ steps.upload_cmder_slim_mini_zip.outputs.artifact-url }}
+        ARTIFACT_URL_CMDER_7Z: ${{ steps.upload_cmder_7z.outputs.artifact-url }}
+        ARTIFACT_URL_CMDER_ZIP: ${{ steps.upload_cmder_zip.outputs.artifact-url }}
+        ARTIFACT_URL_CMDER_MINI_ZIP: ${{ steps.upload_cmder_mini_zip.outputs.artifact-url }}
+        ARTIFACT_URL_CMDER_CONEMU_7Z: ${{ steps.upload_cmder_conemu_7z.outputs.artifact-url }}
+        ARTIFACT_URL_CMDER_CONEMU_ZIP: ${{ steps.upload_cmder_conemu_zip.outputs.artifact-url }}
+        ARTIFACT_URL_CMDER_CONEMU_MINI_ZIP: ${{ steps.upload_cmder_conemu_mini_zip.outputs.artifact-url }}
+        ARTIFACT_URL_HASHES_TXT: ${{ steps.upload_hashes_txt.outputs.artifact-url }}
       run: |
         # Source utility functions
         . scripts/utils.ps1
+        function Get-ArtifactUrl {
+          param(
+            [Parameter(Mandatory = $true)]
+            [string]$ArtifactName
+          )
+
+          $envName = "ARTIFACT_URL_" + (($ArtifactName -replace '[^A-Za-z0-9]+', '_').Trim('_')).ToUpperInvariant()
+          $downloadUrl = [Environment]::GetEnvironmentVariable($envName)
+          if ($downloadUrl) {
+            return $downloadUrl
+          }
+
+          return Get-ArtifactDownloadUrl -ArtifactName $ArtifactName -Repository "${{ github.repository }}" -RunId "${{ github.run_id }}"
+        }
 
+        $profiles = Get-CmderPackageProfiles -Terminal all
         $summary = @"
-        ### 🗃️ Artifacts
 
-        | Artifact | Size | Hash (SHA256) |
-        | --- | --- | --- |
+        ### 🗃️ Packages
         "@
 
-        # Get all files from the build directory (excluding directories and hidden files)
-        if (Test-Path "build") {
-          $buildFiles = Get-ChildItem -Path "build" -File | Where-Object { -not $_.Name.StartsWith('.') } | Sort-Object Name
+        foreach ($profile in $profiles) {
+          $profilePath = Join-Path "build" $profile.outputFolder
+          if (-not (Test-Path $profilePath)) {
+            continue
+          }
+
+          $summary += "`n`n#### 📁 $($profile.displayName) ``$($profile.outputFolder)``"
+          $summary += "`n`n| Artifact | Size | Hash (SHA256) |"
+          $summary += "`n| --- | --- | --- |"
 
+          $buildFiles = Get-ChildItem -Path $profilePath -File | Where-Object { -not $_.Name.StartsWith('.') } | Sort-Object Name
           foreach ($file in $buildFiles) {
             $artifact = $file.Name
-            $path = $file.FullName
-            $sizeFormatted = Format-FileSize -Bytes $file.Length
-            $hash = (Get-FileHash $path -Algorithm SHA256).Hash
-
-            # Try to get the actual artifact download URL
-            $downloadUrl = Get-ArtifactDownloadUrl -ArtifactName $artifact -Repository "${{ github.repository }}" -RunId "${{ github.run_id }}"
+            $downloadUrl = Get-ArtifactUrl -ArtifactName $artifact
             $warning = ""
 
             if (-not $downloadUrl) {
-              # Fallback to workflow run page if artifact URL fetch fails
               $downloadUrl = "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
               $warning = " ⚠️"
             }
 
-            # Determine emoji based on file type
-            if ($artifact -match '\.txt$') {
-              $emoji = "📄"
-            } elseif ($artifact -match '\.(zip|rar|7z)$') {
-              $emoji = "🗄️"
-            } else {
-              $emoji = "📦"
-            }
-
+            $emoji = Get-ArtifactTypeEmoji -Name $artifact
+            $sizeFormatted = Format-FileSize -Bytes $file.Length
+            $hash = (Get-FileHash $file.FullName -Algorithm SHA256).Hash
             $summary += "`n| $emoji [``$artifact``$warning]($downloadUrl) | $sizeFormatted | ``$hash`` |"
           }
         }
-        $summary += "`n"
 
+        $hashesPath = "build/hashes.txt"
+        if (Test-Path $hashesPath) {
+          $downloadUrl = Get-ArtifactUrl -ArtifactName "hashes.txt"
+          $warning = ""
+
+          if (-not $downloadUrl) {
+            $downloadUrl = "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+            $warning = " ⚠️"
+          }
+
+          $hashesSize = Format-FileSize -Bytes (Get-Item $hashesPath).Length
+          $hashesHash = (Get-FileHash $hashesPath -Algorithm SHA256).Hash
+          $summary += "`n`n#### 🧾 Hash Manifest"
+          $summary += "`n`n| Artifact | Size | Hash (SHA256) |"
+          $summary += "`n| --- | --- | --- |"
+          $summary += "`n| 📄 [``hashes.txt``$warning]($downloadUrl) | $hashesSize | ``$hashesHash`` |"
+        }
+
+        $summary += "`n"
         $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8
 
     - name: Create Release
       uses: softprops/action-gh-release@v3
       with:
-        files: |
-          build/cmder.zip
-          build/cmder.7z
-          build/cmder_mini.zip
-          build/hashes.txt
+        files: build/**/*.*
         draft: true
         generate_release_notes: true
       if: startsWith(github.ref, 'refs/tags/')
@@ -262,6 +345,8 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       shell: pwsh
       run: |
+        . scripts/utils.ps1
+        $profiles = Get-CmderPackageProfiles -Terminal all
         $summary = @"
 
         ---
@@ -270,12 +355,12 @@ jobs:
 
         🚀 Draft release created for tag: **``${{ github.ref_name }}``**
 
-        Release includes:
-        - Full version (``cmder.zip``, ``cmder.7z``)
-        - Mini version (``cmder_mini.zip``)
-        - File hashes (``hashes.txt``)
-
-        > ⚠️ Release is in **draft** mode. Please review and publish manually.
+        Release includes these package groups:
         "@
 
+        foreach ($profile in $profiles) {
+          $summary += "`n- **$($profile.displayName)** ``$($profile.outputFolder)``"
+        }
+
+        $summary += "`n`n> ⚠️ Release is in **draft** mode. Please review and publish manually.`n"
         $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8

.github/workflows/codeql.yml

@@ -108,6 +108,7 @@ jobs:
       uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
+        build-mode: manual
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
@@ -121,7 +122,7 @@ jobs:
     - name: Build Cmder Launcher
       shell: pwsh
       working-directory: scripts
-      run: .\build.ps1 -Compile -verbose
+      run: .\build.ps1 -Compile -NoVendor -Verbose
 
     - name: Summary - Build status
       if: success()

.github/workflows/tests.yml

@@ -106,7 +106,7 @@ jobs:
     - name: Initialize vendors
       shell: pwsh
       working-directory: scripts
-      run: .\build.ps1 -verbose
+      run: .\build.ps1 -Verbose
 
     - name: Summary - Vendor initialization
       if: success()

.github/workflows/vendor.yml

@@ -67,7 +67,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
           $currentVersion = (Get-Content -Raw .\vendor\sources.json | ConvertFrom-Json)
-          . .\scripts\update.ps1 -verbose
+          . .\scripts\update.ps1 -Verbose
 
           # Export count of updated packages (update.ps1 is expected to set $count)
           if (-not ($count)) { $count = 0 }

.gitignore

@@ -31,3 +31,10 @@ launcher/src/version.rc2
 .vs/*
 .vscode
 .idea
+.vagrant/
+scripts/packer/iso/*.iso
+!scripts/packer/floppy/*.exe
+scripts/packer/packer_cache
+scripts/packer/output-*
+*.box
+