2
0

fix-build.patch 2.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
  2. index cd8610d..0d94563 100644
  3. --- a/build/gulpfile.vscode.linux.js
  4. +++ b/build/gulpfile.vscode.linux.js
  5. @@ -309,4 +309,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
  6. const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
  7. - gulp.task(prepareDebTask);
  8. - const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, buildDebPackage(arch));
  9. + const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, task.series(prepareDebTask, buildDebPackage(arch)));
  10. gulp.task(buildDebTask);
  11. @@ -315,4 +314,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
  12. const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
  13. - gulp.task(prepareRpmTask);
  14. - const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, buildRpmPackage(arch));
  15. + const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch)));
  16. gulp.task(buildRpmTask);
  17. diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
  18. index 448ab38..ffc71f9 100644
  19. --- a/build/linux/dependencies-generator.js
  20. +++ b/build/linux/dependencies-generator.js
  21. @@ -27,3 +27,3 @@ const product = require("../../product.json");
  22. // are valid, are in dep-lists.ts
  23. -const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
  24. +const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
  25. // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.210:chrome/installer/linux/BUILD.gn;l=64-80
  26. @@ -60,3 +60,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
  27. // Add the tunnel binary.
  28. - files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
  29. + // files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
  30. // Add the main executable.
  31. diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
  32. index 6c1f7b7..31cc2a8 100644
  33. --- a/build/linux/dependencies-generator.ts
  34. +++ b/build/linux/dependencies-generator.ts
  35. @@ -25,3 +25,3 @@ import product = require('../../product.json');
  36. // are valid, are in dep-lists.ts
  37. -const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true;
  38. +const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
  39. @@ -62,3 +62,3 @@ export async function getDependencies(packageType: 'deb' | 'rpm', buildDir: stri
  40. // Add the tunnel binary.
  41. - files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
  42. + // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
  43. // Add the main executable.