From cde3449664b570f695c4c0e77d04e3e418efdd46 Mon Sep 17 00:00:00 2001 From: wangpenglong Date: Tue, 5 Mar 2024 18:34:06 +0800 Subject: [PATCH] =?UTF-8?q?build:fixed=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?= =?UTF-8?q?.=201.gulp=20task=E4=BB=BB=E5=8A=A1=E7=9A=84buildDebTask?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=BA=8F=E5=88=97=E6=B7=BB=E5=8A=A0prepareDe?= =?UTF-8?q?bTask;=202.=E8=AE=A1=E7=AE=97=E4=BE=9D=E8=B5=96=E4=B8=AD?= =?UTF-8?q?=E7=A6=81=E7=94=A8FAIL=5FBUILD=5FFOR=5FNEW=5FDEPENDENCIES=3Dfal?= =?UTF-8?q?se;=203.rpm=E7=9A=84spec=20template=E4=B8=AD=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E8=A1=8C=E6=B7=BB=E5=8A=A0%config(noreplace)=20/usr/s?= =?UTF-8?q?hare/%{name}/resources/app/product.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/gulpfile.vscode.linux.js | 4 ++-- build/linux/dependencies-generator.js | 4 ++-- build/linux/dependencies-generator.ts | 2 +- resources/linux/rpm/code.spec.template | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js index 0d7d3c5b..a2a4bf50 100644 --- a/build/gulpfile.vscode.linux.js +++ b/build/gulpfile.vscode.linux.js @@ -298,13 +298,13 @@ BUILD_TARGETS.forEach(({ arch }) => { const debArch = getDebPackageArch(arch); const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(util.rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch))); gulp.task(prepareDebTask); - const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, buildDebPackage(arch)); + const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, task.series(prepareDebTask, buildDebPackage(arch))); gulp.task(buildDebTask); const rpmArch = getRpmPackageArch(arch); const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(util.rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch))); gulp.task(prepareRpmTask); - const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, buildRpmPackage(arch)); + const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch))); gulp.task(buildRpmTask); const prepareSnapTask = task.define(`vscode-linux-${arch}-prepare-snap`, task.series(util.rimraf(`.build/linux/snap/${arch}`), prepareSnapPackage(arch))); diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js index efd75d6c..dcb21aa2 100644 --- a/build/linux/dependencies-generator.js +++ b/build/linux/dependencies-generator.js @@ -20,7 +20,7 @@ const types_2 = require("./rpm/types"); // If true, we fail the build if there are new dependencies found during that task. // The reference dependencies, which one has to update when the new dependencies // are valid, are in dep-lists.ts -const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true; +const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false; // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/114.0.5735.199:chrome/installer/linux/BUILD.gn;l=64-80 // and the Linux Archive build // Shared library dependencies that we already bundle. @@ -97,4 +97,4 @@ function mergePackageDeps(inputDeps) { } return requires; } -//# sourceMappingURL=dependencies-generator.js.map \ No newline at end of file +//# sourceMappingURL=dependencies-generator.js.map diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts index 5c4b9d24..a2c629af 100644 --- a/build/linux/dependencies-generator.ts +++ b/build/linux/dependencies-generator.ts @@ -21,7 +21,7 @@ import { isRpmArchString, RpmArchString } from './rpm/types'; // If true, we fail the build if there are new dependencies found during that task. // The reference dependencies, which one has to update when the new dependencies // are valid, are in dep-lists.ts -const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true; +const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false; // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/114.0.5735.199:chrome/installer/linux/BUILD.gn;l=64-80 // and the Linux Archive build diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template index c0851097..2df117d1 100644 --- a/resources/linux/rpm/code.spec.template +++ b/resources/linux/rpm/code.spec.template @@ -85,3 +85,5 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_datadir}/pixmaps/@@ICON@@.png %{_datadir}/bash-completion/completions/%{name} %{_datadir}/zsh/site-functions/_%{name} + +%config(noreplace) /usr/share/%{name}/resources/app/product.json \ No newline at end of file