mirror of
https://github.com/cmderdev/cmder.git
synced 2025-01-26 16:19:08 +08:00
PR - Requested Changes
This commit is contained in:
parent
86091b74e9
commit
08fd69bdef
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@ -45,12 +45,12 @@ jobs:
|
|||||||
- name: Build Cmder Launcher
|
- name: Build Cmder Launcher
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
working-directory: scripts
|
working-directory: scripts
|
||||||
run: .\build.ps1 -Compile -verbose
|
run: .\build.ps1 -Compile -verbose -terminal all
|
||||||
|
|
||||||
- name: Pack the built files
|
- name: Pack the built files
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
working-directory: scripts
|
working-directory: scripts
|
||||||
run: .\pack.ps1 -verbose -emulator all
|
run: .\pack.ps1 -verbose -terminal all
|
||||||
|
|
||||||
- name: Upload artifact (cmder_wt.zip)
|
- name: Upload artifact (cmder_wt.zip)
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
|
@ -57,14 +57,14 @@ Param(
|
|||||||
[switch]$noVendor,
|
[switch]$noVendor,
|
||||||
|
|
||||||
# Using this option will specify the emulator to use [all, conemu-maximus5, or windows-terminal]
|
# Using this option will specify the emulator to use [all, conemu-maximus5, or windows-terminal]
|
||||||
[string]$emulator = 'all',
|
[string]$terminal = 'all',
|
||||||
|
|
||||||
# Build launcher if you have MSBuild tools installed
|
# Build launcher if you have MSBuild tools installed
|
||||||
[switch]$Compile
|
[switch]$Compile
|
||||||
)
|
)
|
||||||
|
|
||||||
# Get the scripts and cmder root dirs we are building in.
|
# Get the scripts and cmder root dirs we are building in.
|
||||||
$cmder_root = [string](Resolve-Path "$PSScriptRoot\..")
|
$cmder_root = Resolve-Path "$PSScriptRoot\.."
|
||||||
|
|
||||||
# Dot source util functions into this scope
|
# Dot source util functions into this scope
|
||||||
. "$PSScriptRoot\utils.ps1"
|
. "$PSScriptRoot\utils.ps1"
|
||||||
@ -137,9 +137,9 @@ if (-not $noVendor) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
foreach ($s in $sources) {
|
foreach ($s in $sources) {
|
||||||
if ($s.name -eq "conemu-maximus5" -and $emulator -eq "windows-terminal") {
|
if ($s.name -eq "conemu-maximus5" -and $terminal -eq "windows-terminal") {
|
||||||
return
|
return
|
||||||
} elseif ($s.name -eq "windows-terminal" -and $emulator -eq "conemu-maximus5") {
|
} elseif ($s.name -eq "windows-terminal" -and $terminal -eq "conemu-maximus5") {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -156,8 +156,8 @@ if (-not $noVendor) {
|
|||||||
# Make Embedded Windows Terminal Portable
|
# Make Embedded Windows Terminal Portable
|
||||||
if ($s.name -eq "windows-terminal") {
|
if ($s.name -eq "windows-terminal") {
|
||||||
$windowTerminalFiles = resolve-path ($saveTo + "\" + $s.name + "\terminal*")
|
$windowTerminalFiles = resolve-path ($saveTo + "\" + $s.name + "\terminal*")
|
||||||
move-item -ErrorAction SilentlyContinue $windowTerminalFiles\* $s.name >$null
|
move-item -ErrorAction SilentlyContinue $windowTerminalFiles\* $s.name >$null
|
||||||
remove-item -ErrorAction SilentlyContinue $windowTerminalFiles >$null
|
remove-item -ErrorAction SilentlyContinue $windowTerminalFiles >$null
|
||||||
write-verbose "Making Windows Terminal Portable..."
|
write-verbose "Making Windows Terminal Portable..."
|
||||||
New-Item -Type Directory -Path (Join-Path $saveTo "/windows-terminal/settings") -ErrorAction SilentlyContinue >$null
|
New-Item -Type Directory -Path (Join-Path $saveTo "/windows-terminal/settings") -ErrorAction SilentlyContinue >$null
|
||||||
New-Item -Type File -Path (Join-Path $saveTo "/windows-terminal/.portable") -ErrorAction SilentlyContinue >$null
|
New-Item -Type File -Path (Join-Path $saveTo "/windows-terminal/.portable") -ErrorAction SilentlyContinue >$null
|
||||||
|
@ -32,7 +32,7 @@ Param(
|
|||||||
[string]$cmderRoot = "$PSScriptRoot\..",
|
[string]$cmderRoot = "$PSScriptRoot\..",
|
||||||
|
|
||||||
# Using this option will pack artifacts for a specific included terminal emulator [all, conemu-maximus5, or windows-terminal]
|
# Using this option will pack artifacts for a specific included terminal emulator [all, conemu-maximus5, or windows-terminal]
|
||||||
[string]$emulator = 'all',
|
[string]$terminal = 'all',
|
||||||
|
|
||||||
# Vendor folder locaton
|
# Vendor folder locaton
|
||||||
[string]$saveTo = "$PSScriptRoot\..\build"
|
[string]$saveTo = "$PSScriptRoot\..\build"
|
||||||
@ -44,13 +44,13 @@ $cmderRoot = Resolve-Path $cmderRoot
|
|||||||
$ErrorActionPreference = "Stop"
|
$ErrorActionPreference = "Stop"
|
||||||
Ensure-Executable "7z"
|
Ensure-Executable "7z"
|
||||||
|
|
||||||
if ($emulator -eq "windows-terminal") {
|
if ($terminal -eq "windows-terminal") {
|
||||||
$targets = @{
|
$targets = @{
|
||||||
"cmder_wt.7z" = "-t7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -myx=7 -mqs=on -xr!`"vendor\conemu-maximus5`"";
|
"cmder_wt.7z" = "-t7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -myx=7 -mqs=on -xr!`"vendor\conemu-maximus5`"";
|
||||||
"cmder_wt.zip" = "-mm=Deflate -mfb=128 -mpass=3 -xr!`"vendor\conemu-maximus5`"";
|
"cmder_wt.zip" = "-mm=Deflate -mfb=128 -mpass=3 -xr!`"vendor\conemu-maximus5`"";
|
||||||
"cmder_wt_mini.zip" = "-xr!`"vendor\git-for-windows`" -xr!`"vendor\conemu-maximus5`"";
|
"cmder_wt_mini.zip" = "-xr!`"vendor\git-for-windows`" -xr!`"vendor\conemu-maximus5`"";
|
||||||
}
|
}
|
||||||
} elseif ($emulator -eq "windows-terminal") {
|
} elseif ($terminal -eq "windows-terminal") {
|
||||||
$targets = @{
|
$targets = @{
|
||||||
"cmder.7z" = "-t7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -myx=7 -mqs=on -xr!`"vendor\windows-terminal`"";
|
"cmder.7z" = "-t7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -myx=7 -mqs=on -xr!`"vendor\windows-terminal`"";
|
||||||
"cmder.zip" = "-mm=Deflate -mfb=128 -mpass=3 -xr!`"vendor\windows-terminal`"";
|
"cmder.zip" = "-mm=Deflate -mfb=128 -mpass=3 -xr!`"vendor\windows-terminal`"";
|
||||||
|
Loading…
Reference in New Issue
Block a user