openkylin
/
kylin-code
9
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

build:fixed编译错误. 

1.gulp task任务的buildDebTask任务序列添加prepareDebTask;
2.计算依赖中禁用FAIL_BUILD_FOR_NEW_DEPENDENCIES=false;
3.rpm的spec template中最后一行添加%config(noreplace) /usr/share/%{name}/resources/app/product.json
This commit is contained in:
wangpenglong 2024-03-05 18:34:06 +08:00
parent b2638a9732
commit cde3449664
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/gulpfile.vscode.linux.js
View File

@ -298,13 +298,13 @@ BUILD_TARGETS.forEach(({ arch }) => {
const debArch = getDebPackageArch(arch); const debArch = getDebPackageArch(arch);
const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(util.rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch))); const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(util.rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
gulp.task(prepareDebTask); 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); gulp.task(buildDebTask);
const rpmArch = getRpmPackageArch(arch); const rpmArch = getRpmPackageArch(arch);
const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(util.rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch))); const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(util.rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
gulp.task(prepareRpmTask); 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); gulp.task(buildRpmTask);
const prepareSnapTask = task.define(`vscode-linux-${arch}-prepare-snap`, task.series(util.rimraf(`.build/linux/snap/${arch}`), prepareSnapPackage(arch))); const prepareSnapTask = task.define(`vscode-linux-${arch}-prepare-snap`, task.series(util.rimraf(`.build/linux/snap/${arch}`), prepareSnapPackage(arch)));

2
build/linux/dependencies-generator.js
View File

@ -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. // 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 // The reference dependencies, which one has to update when the new dependencies
// are valid, are in dep-lists.ts // 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 // 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 // and the Linux Archive build
// Shared library dependencies that we already bundle. // Shared library dependencies that we already bundle.

2
build/linux/dependencies-generator.ts
View File

@ -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. // 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 // The reference dependencies, which one has to update when the new dependencies
// are valid, are in dep-lists.ts // 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 // 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 // and the Linux Archive build

2
resources/linux/rpm/code.spec.template
View File

@ -85,3 +85,5 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_datadir}/pixmaps/@@ICON@@.png %{_datadir}/pixmaps/@@ICON@@.png
%{_datadir}/bash-completion/completions/%{name} %{_datadir}/bash-completion/completions/%{name}
%{_datadir}/zsh/site-functions/_%{name} %{_datadir}/zsh/site-functions/_%{name}
%config(noreplace) /usr/share/%{name}/resources/app/product.json