Merging Cmder's development branch to master branch#2898
Merging Cmder's development branch to master branch#2898DRSDavidSoft wants to merge 275 commits into
development branch to master branch#2898Conversation
Sync with master
Keep the PowerShell common parameter at the end of command lines for consistent, readable invocations across workflows and docs. Requested by @DRSDavidSoft.
Restore the build summary artifact link and keep the slim package naming aligned with the open backlog discussion.
Bring back file-type emojis and code-formatted profile headings in the package summary while keeping the new profile-based artifact layout.
DRSDavidSoft
changed the title
development branch to master branch
Upload each package file separately again so the build summary can link to the individual artifact downloads, matching the previous behavior.
| IDS_TITLE "Cmder Launcher" | ||
|
|
||
| IDS_SWITCHES L"Valid options:\n\n /c [CMDER User Root Path]\n /task [ConEmu Task Name]\n /icon [CMDER Icon Path]\n [/start [Start in Path] | [Start in Path]]\n /single\n /m\n /x [ConEmu extra arguments]\n\nor, either:\n /register [USER | ALL]\n /unregister [USER | ALL]" | ||
| IDS_SWITCHES L"Valid options:\n\n /c [CMDER User Root Path]\n /task [Windows Terminal Profile/ConEmu Task Name]\n /icon [CMDER Icon Path] - ConEmu ONLY!\n [/start [Start in Path] | [Start in Path]]\n /single - ConEmu ONLY!\n /m\n -- [ConEmu/Windows Terminal extra arguments]\n\nNote: '-- [...]' must be the last argument!\n\nor, either:\n /register [USER | ALL]\n /unregister [USER | ALL]" |
There was a problem hiding this comment.
Need to adjust the help message to separate out the console-specific flags.
The current " - * ONLY!" message, while accurate, is less UX-friendly than could be, especially using the current TaskDialog design.
I need to work on it once development is merged into master.
| # Using this option will skip all downloads, if you only need to build launcher | ||
| [switch]$noVendor, | ||
|
|
||
| # Using this option will specify the emulator to use [none, all, conemu-maximus5, or windows-terminal] |
There was a problem hiding this comment.
What I need to do next:
- Use the phrase "terminal emulator" instead of "emulator"
- Refer the user to the new
packaging-profiles.jsoninfrastructure
| ) | ||
|
|
||
| # Get the scripts and Cmder root dirs we are building in. | ||
| # Get the scripts and cmder root dirs we are building in. |
There was a problem hiding this comment.
No need to make the application's name lower case here, "Cmder" was just fine, and should be used everywhere as branding is capitalized
| else { $WinTermSettingsJson = "" } | ||
|
|
||
| # Kill ssh-agent.exe if it is running from the $env:cmder_root we are building | ||
| $cmder_folder = $cmder_root.toString() |
There was a problem hiding this comment.
Investigate whether this could still be a cast to string without requiring to declaring a new $cmder_folder variable, in addition to $cmder_root, making below a one-liner again without actually breaking the build script like it used to.
If not, I think a more suitable name should be used for it.
A task for the AI to investigate.
|
See my last comment in #3090 (comment) I edited it like 20 times so just want to make sure you see it in its final glory @DRSDavidSoft. We should continue the discussion here since this pr is actually open. |
Summary
This PR merges the current
developmentbranch on top ofmasterand brings in the accumulated Cmder work since the last sync.The biggest themes in this branch are:
What’s included
Windows Terminal support
This branch adds and refines support for launching Cmder in Windows Terminal, including:
Cmder.batandlauncher/src/CmderLauncher.cppvendor/cmder.sh,vendor/profile.ps1, andvendor/psmodules/Cmder.ps1vendor/windows_terminal_default_settings.jsonBuild and packaging refactor
The build system has been modernized to use package profiles and shared helpers:
scripts/package-profiles.jsonscripts/utils.ps1scripts/build.ps1,scripts/pack.ps1, andscripts/update.ps1scripts/README.mdThis makes the packaging flow more structured and easier to extend.
Workflow and CI updates
The GitHub Actions workflows were cleaned up and aligned with the new scripts:
Cmder launcher and runtime improvements
This branch also includes a substantial update to the launcher and core runtime behavior:
CmderLauncher.cppchanges for the new launch flowCmder.batvendor/init.bat,vendor/lib/lib_base.cmd, andvendor/lib/lib_path.cmdDocumentation and repo hygiene
A number of documentation and maintenance updates are included as well:
README.mdandconfig/Readme.mdadjustmentsCHANGELOG.mdupdates.gitignoreandpackignoreadditions.git-blame-ignore-revsfor cleaner blame historyNotes
This branch is mostly a consolidation of the Windows Terminal work, launcher/runtime improvements, and packaging refactors that have been developed on
development.Verification
The updated workflows were run successfully on
development, including:Files touched
This merge includes changes across: