Merging Cmder's development branch to master branch#2898
Merging Cmder's development branch to master branch#2898DRSDavidSoft wants to merge 313 commits into
development branch to master branch#2898Conversation
Applying the more speed branch to the development
Applying the windows terminal branch to the development
|
@DRSDavidSoft Questions:
I have looked at your latest merges to They are NEVER going to be perfect. You said a couple of weeks ago you wanted one more 1.x.x release, presumably Can you just get Possible future actions to speed releases while maintaining 1.x.x code base:
I don't mean to sound like a broken record but I just want to release something. |
|
After a little research on the deep technical differences between The ONLY way I can see this working is to include the shim in the repo rather than creating it on on first run with a nag message with a link to docs on how to update his/her terminal config via the gui to use There should be no instruction to delete |
I have made the changes to allow migration to |
revert unnecessary changes.
…elopment * upstream/development: cleanup cleanup cleanup fixes revert unnecessary changes.
Init cmd compatibility
|
I'm preparing the remaining work as discussed and a proper reply to the points you raised in a separate comment. Here are some quick notes while working on this to avoid keeping this left unanswered.
Also, with the new pipeline and the CI/CD tasks, it will be easy to release different branches at the same time, so it makes sense to release a 2.0 before one more 1.x Since 2.0 will semantically be a breaking change, I'll limit the scope of further updates to the dev branch until this PR is done, these will land in 2.1, 2.2, etc.
My apologizes, you're completely right and I appreciate it. The blame is on me as you correctly pointed out. Working to resolve the issues now, including reducing the perfectionism. 🙏🏻 |
# Conflicts: # scripts/build.ps1 # vendor/bin/cmder_diag.ps1
# Conflicts: # .git-blame-ignore-revs # scripts/utils.ps1 # vendor/bin/cmder_diag.ps1 # vendor/init.bat

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: