fix-build.patch 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
  2. index 28ddfb0..0fd18a1 100644
  3. --- a/build/gulpfile.vscode.linux.js
  4. +++ b/build/gulpfile.vscode.linux.js
  5. @@ -192,2 +192,3 @@ function prepareRpmPackage(arch) {
  6. const spec = code.pipe(es.through(
  7. + null,
  8. async function () {
  9. @@ -306,4 +307,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
  10. const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
  11. - gulp.task(prepareDebTask);
  12. - const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, buildDebPackage(arch));
  13. + const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, task.series(prepareDebTask, buildDebPackage(arch)));
  14. gulp.task(buildDebTask);
  15. @@ -312,4 +312,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
  16. const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
  17. - gulp.task(prepareRpmTask);
  18. - const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, buildRpmPackage(arch));
  19. + const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch)));
  20. gulp.task(buildRpmTask);
  21. diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
  22. index 19adbeb..fef80a5 100644
  23. --- a/build/linux/dependencies-generator.js
  24. +++ b/build/linux/dependencies-generator.js
  25. @@ -24,3 +24,3 @@ const product = require("../../product.json");
  26. // are valid, are in dep-lists.ts
  27. -const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
  28. +const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
  29. // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.243:chrome/installer/linux/BUILD.gn;l=64-80
  30. @@ -56,3 +56,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
  31. // Add the tunnel binary.
  32. - files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
  33. + // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
  34. // Add the main executable.
  35. diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
  36. index 5fe4ac5..1d3e68a 100644
  37. --- a/build/linux/dependencies-generator.ts
  38. +++ b/build/linux/dependencies-generator.ts
  39. @@ -25,3 +25,3 @@ import product = require('../../product.json');
  40. // are valid, are in dep-lists.ts
  41. -const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true;
  42. +const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
  43. @@ -61,3 +61,3 @@ export async function getDependencies(packageType: 'deb' | 'rpm', buildDir: stri
  44. // Add the tunnel binary.
  45. - files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
  46. + // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
  47. // Add the main executable.
  48. diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
  49. index c9e57db..bda2604 100644
  50. --- a/resources/linux/rpm/code.spec.template
  51. +++ b/resources/linux/rpm/code.spec.template
  52. @@ -87 +87,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
  53. %{_datadir}/zsh/site-functions/_%{name}
  54. +
  55. +%config(noreplace) /usr/share/%{name}/resources/app/product.json
  56. \ No newline at end of file