Inicio Explorar Axuda
Iniciar sesión
mirrors
/
vscodium
réplica de https://github.com/VSCodium/vscodium
2
0
Fork 0
Ficheiros Incidencias 0 Wiki
Árbore: b9975ba5d2
Ramas Etiquetas
vscodium
/
patches
/
linux
/
fix-build.patch

fix-build.patch 2.8 KB
Histórico Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748 
  1. diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
    2. 

  2. index fb0e5a4..412a6cc 100644
    3. 

  3. --- a/build/gulpfile.vscode.linux.js
    4. 

  4. +++ b/build/gulpfile.vscode.linux.js
    5. 

  5. @@ -197,2 +197,3 @@ function prepareRpmPackage(arch) {
    6. 

  6.  		const spec = code.pipe(es.through(
    7. 

  7. +			null,
    8. 

  8.  			async function () {
    9. 

  9. @@ -312,4 +313,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
    10. 

  10.  	const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
    11. 

  11. -	gulp.task(prepareDebTask);
    12. 

  12. -	const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, buildDebPackage(arch));
    13. 

  13. +	const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, task.series(prepareDebTask, buildDebPackage(arch)));
    14. 

  14.  	gulp.task(buildDebTask);
    15. 

  15. @@ -318,4 +318,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
    16. 

  16.  	const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
    17. 

  17. -	gulp.task(prepareRpmTask);
    18. 

  18. -	const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, buildRpmPackage(arch));
    19. 

  19. +	const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch)));
    20. 

  20.  	gulp.task(buildRpmTask);
    21. 

  21. diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
    22. 

  22. index 39e2b4e..aae72ae 100644
    23. 

  23. --- a/build/linux/dependencies-generator.js
    24. 

  24. +++ b/build/linux/dependencies-generator.js
    25. 

  25. @@ -27,3 +27,3 @@ const product = require("../../product.json");
    26. 

  26.  // are valid, are in dep-lists.ts
    27. 

  27. -const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
    28. 

  28. +const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
    29. 

  29.  // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:chrome/installer/linux/BUILD.gn;l=64-80
    30. 

  30. @@ -60,3 +60,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
    31. 

  31.      // Add the tunnel binary.
    32. 

  32. -    files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
    33. 

  33. +    // files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
    34. 

  34.      // Add the main executable.
    35. 

  35. diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
    36. 

  36. index 83d2ec7..6c14583 100644
    37. 

  37. --- a/build/linux/dependencies-generator.ts
    38. 

  38. +++ b/build/linux/dependencies-generator.ts
    39. 

  39. @@ -25,3 +25,3 @@ import product = require('../../product.json');
    40. 

  40.  // are valid, are in dep-lists.ts
    41. 

  41. -const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true;
    42. 

  42. +const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
    43. 

  43.  
    44. 

  44. @@ -62,3 +62,3 @@ export async function getDependencies(packageType: 'deb' | 'rpm', buildDir: stri
    45. 

  45.  	// Add the tunnel binary.
    46. 

  46. -	files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
    47. 

  47. +	// files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
    48. 

  48.  	// Add the main executable.
    49.