Sākums Izpētīt Palīdzība
Pierakstīties
mirrors
/
vscodium
spogulis no https://github.com/VSCodium/vscodium
2
0
Atdalīts 0
Faili Problēmas 0 Vikivietne
Koks: 97bd0850e2
Atzari Tagi
vscodium
/
patches
/
fix-build-linux.patch

fix-build-linux.patch 3.2 KB
Vēsture Neapstrādāts

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

  2. index 8c2b62f..843e8d4 100644
    3. 

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

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

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

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

  7. +			null,
    8. 

  8.  			async function () {
    9. 

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

  10.  	const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(util.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. @@ -308,4 +308,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
    16. 

  16.  	const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(util.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 80c247d..40f1df2 100644
    23. 

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

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

  25. @@ -24,3 +24,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/120.0.6099.268:chrome/installer/linux/BUILD.gn;l=64-80
    30. 

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

  31.      // Add the tunnel binary.
    32. 

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

  33. +    // files.push(path.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 9f1a068..48e3d52 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. @@ -61,3 +61,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. 

  49. diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
    50. 

  50. index c9e57db..bda2604 100644
    51. 

  51. --- a/resources/linux/rpm/code.spec.template
    52. 

  52. +++ b/resources/linux/rpm/code.spec.template
    53. 

  53. @@ -87 +87,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
    54. 

  54.  %{_datadir}/zsh/site-functions/_%{name}
    55. 

  55. +
    56. 

  56. +%config(noreplace) /usr/share/%{name}/resources/app/product.json
    57. 

  57. \ No newline at end of file
    58.