Merging Cmder's development branch to master branch#2898
Merging Cmder's development branch to master branch#2898DRSDavidSoft wants to merge 288 commits into
development branch to master branch#2898Conversation
Applying the more speed branch to the development
Applying the windows terminal branch to the development
|
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. |
This comment was marked as resolved.
This comment was marked as resolved.
|
@daxgames Working on it right now with Codex; seems like PowerShell 5.1 doesn't like UTF-8 encoded scripts without BOM while PowerShell 7 allows it. Since both my machine and GitHub actions' infrastructure ran on pwsh v7, adding the emojis didn't cause an issue there. So I'm applying the BOM now, which would hopefully fix the problem and allow the CI/CD to keep the emojis. Sorry for the regression! 😅 Nice diff by the way, how was it generated? Back to the previous discussion we were having soon 🙏🏻 |
|
@daxgames thanks for catching this. I reproduced the Windows PowerShell 5.1 failure locally: the emojis themselves are valid, but I pushed a fix in 8155738 that keeps the emojis by making Could you please share:
|
|
I use As far as the other asks. I do not have the failed run output handy but if you need it I can get it. I ran the command Shell was Visual Studio 2022 Powershell x64 terminal. |
|
@daxgames Thanks dax, I hope the build script is now working correctly as before the regression. Will switch to the ongoing previous discussion from #3090 (comment) soon; as agreed we'll continue discussion from the old PR here after I fully read and review your excellent points. Will notify soon 🙏🏻 |
| @@ -0,0 +1,163 @@ | |||
| @echo off | |||
|
|
|||
| :: This file was autogenerated by Cmder init.bat | |||
There was a problem hiding this comment.
Codex, to make the intent more clear, let's add the word initially like this:
This file was initially autogenerated by Cmder init.bat
| :: It is yours to edit and will not be touched again by Cmder. | ||
| :: | ||
| :: If you wish to recreate this file simply rename it and Cmder will re-create it the next time it is run | ||
| :: or run the followin command from a Cmder shell: |
There was a problem hiding this comment.
Codex, please apply typo corrections to "followin" and other possible ones where required
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: