mirror of
https://github.com/VSCodium/vscodium.git
synced 2024-12-23 17:04:12 +03:00
58 lines
3.2 KiB
Diff
58 lines
3.2 KiB
Diff
diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
|
|
index 28ddfb0..0fd18a1 100644
|
|
--- a/build/gulpfile.vscode.linux.js
|
|
+++ b/build/gulpfile.vscode.linux.js
|
|
@@ -192,2 +192,3 @@ function prepareRpmPackage(arch) {
|
|
const spec = code.pipe(es.through(
|
|
+ null,
|
|
async function () {
|
|
@@ -306,4 +307,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
|
|
const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
|
|
- 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);
|
|
@@ -312,4 +312,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
|
|
const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
|
|
- 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);
|
|
diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
|
|
index 19adbeb..fef80a5 100644
|
|
--- a/build/linux/dependencies-generator.js
|
|
+++ b/build/linux/dependencies-generator.js
|
|
@@ -24,3 +24,3 @@ const product = require("../../product.json");
|
|
// 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/124.0.6367.243:chrome/installer/linux/BUILD.gn;l=64-80
|
|
@@ -56,3 +56,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
|
|
// Add the tunnel binary.
|
|
- files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
|
|
+ // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
|
|
// Add the main executable.
|
|
diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
|
|
index 5fe4ac5..1d3e68a 100644
|
|
--- a/build/linux/dependencies-generator.ts
|
|
+++ b/build/linux/dependencies-generator.ts
|
|
@@ -25,3 +25,3 @@ import product = require('../../product.json');
|
|
// are valid, are in dep-lists.ts
|
|
-const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true;
|
|
+const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
|
|
|
|
@@ -61,3 +61,3 @@ export async function getDependencies(packageType: 'deb' | 'rpm', buildDir: stri
|
|
// Add the tunnel binary.
|
|
- files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
|
|
+ // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
|
|
// Add the main executable.
|
|
diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
|
|
index c9e57db..bda2604 100644
|
|
--- a/resources/linux/rpm/code.spec.template
|
|
+++ b/resources/linux/rpm/code.spec.template
|
|
@@ -87 +87,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
|
|
%{_datadir}/zsh/site-functions/_%{name}
|
|
+
|
|
+%config(noreplace) /usr/share/%{name}/resources/app/product.json
|
|
\ No newline at end of file
|