chore: update application name logic for win32 scripts (#295777)

This commit is contained in:
Robo
2026-02-18 00:13:55 +09:00
committed by GitHub
parent d797e9f914
commit d112b3987e
5 changed files with 31 additions and 16 deletions

View File

@@ -387,14 +387,20 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
}));
const packageSubJsonStream = gulp.src(['package.json'], { base: '.' })
.pipe(jsonEditor((json: Record<string, unknown>) => {
json.name = `sessions-${quality || 'oss-dev'}`;
return json;
}))
.pipe(rename('package.sub.json'));
const isInsiderOrExploration = quality === 'insider' || quality === 'exploration';
const embedded = isInsiderOrExploration
? (product as typeof product & { embedded?: { nameShort: string; nameLong: string; applicationName: string; dataFolderName: string; darwinBundleIdentifier: string } }).embedded
: undefined;
const packageSubJsonStream = isInsiderOrExploration
? gulp.src(['package.json'], { base: '.' })
.pipe(jsonEditor((json: Record<string, unknown>) => {
json.name = `sessions-${quality || 'oss-dev'}`;
return json;
}))
.pipe(rename('package.sub.json'))
: undefined;
const embedded = (product as typeof product & { embedded?: { nameShort: string; nameLong: string; applicationName: string; dataFolderName: string; darwinBundleIdentifier: string } }).embedded;
const productSubJsonStream = embedded
? gulp.src(['product.json'], { base: '.' })
.pipe(jsonEditor((json: Record<string, unknown>) => {
@@ -406,7 +412,7 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
return json;
}))
.pipe(rename('product.sub.json'))
: gulp.src(['product.sub.json'], { base: '.', allowEmpty: true });
: undefined;
const license = gulp.src([product.licenseFileName, 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.', allowEmpty: true });
@@ -443,17 +449,22 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
'node_modules/vsda/**' // retain copy of `vsda` in node_modules for internal use
], 'node_modules.asar'));
let all = es.merge(
const mergeStreams = [
packageJsonStream,
productJsonStream,
packageSubJsonStream,
productSubJsonStream,
license,
api,
telemetry,
sources,
deps
);
];
if (packageSubJsonStream) {
mergeStreams.push(packageSubJsonStream);
}
if (productSubJsonStream) {
mergeStreams.push(productSubJsonStream);
}
let all = es.merge(...mergeStreams);
if (platform === 'win32') {
all = es.merge(all, gulp.src([

View File

@@ -8,7 +8,8 @@ pushd %~dp0..
:: Get electron, compile, built-in extensions
if "%VSCODE_SKIP_PRELAUNCH%"=="" node build/lib/preLaunch.ts
for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do set NAMESHORT=%%~a
set "NAMESHORT="
for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do if not defined NAMESHORT set "NAMESHORT=%%~a"
set NAMESHORT=%NAMESHORT: "=%
set NAMESHORT=%NAMESHORT:"=%.exe
set CODE=".build\electron\%NAMESHORT%"

View File

@@ -10,7 +10,8 @@ if "%VSCODE_SKIP_PRELAUNCH%"=="" (
node build/lib/preLaunch.ts
)
for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do set NAMESHORT=%%~a
set "NAMESHORT="
for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do if not defined NAMESHORT set "NAMESHORT=%%~a"
set NAMESHORT=%NAMESHORT: "=%
set NAMESHORT=%NAMESHORT:"=%.exe
set CODE=".build\electron\%NAMESHORT%"

View File

@@ -5,7 +5,8 @@ set ELECTRON_RUN_AS_NODE=1
pushd %~dp0\..
for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do set NAMESHORT=%%~a
set "NAMESHORT="
for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do if not defined NAMESHORT set "NAMESHORT=%%~a"
set NAMESHORT=%NAMESHORT: "=%
set NAMESHORT=%NAMESHORT:"=%.exe
set CODE=".build\electron\%NAMESHORT%"

View File

@@ -6,7 +6,8 @@ set ELECTRON_RUN_AS_NODE=
pushd %~dp0\..
:: Get Code.exe location
for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do set NAMESHORT=%%~a
set "NAMESHORT="
for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do if not defined NAMESHORT set "NAMESHORT=%%~a"
set NAMESHORT=%NAMESHORT: "=%
set NAMESHORT=%NAMESHORT:"=%.exe
set CODE=".build\electron\%NAMESHORT%"