timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-23 11:30:14 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: patch all versions (for macos and reh) (#1198)

Browse Source
This commit is contained in:
Baptiste Augrain
2022-08-16 16:11:08 +02:00
committed by GitHub
parent 79cdcd61bf
commit bffbd569a5
4 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/build_linux.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
rm -rf VSCode* rm -rf VSCode*
rm -rf vscode rm -rf vscode*
./get_repo.sh ./get_repo.sh

2
build/build_macos.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
rm -rf VSCode* rm -rf VSCode*
rm -rf vscode rm -rf vscode*
UNAME_ARCH=$( uname -m ) UNAME_ARCH=$( uname -m )

2
build/build_windows.sh
View File

@@ -3,7 +3,7 @@
# to run with Bash: "C:\Program Files\Git\bin\bash.exe" ./build/build_windows.sh # to run with Bash: "C:\Program Files\Git\bin\bash.exe" ./build/build_windows.sh
rm -rf VSCode* rm -rf VSCode*
rm -rf vscode rm -rf vscode*
rm -rf build/windows/msi/releasedir rm -rf build/windows/msi/releasedir
. get_repo.sh . get_repo.sh

28
patches/build-version.patch
View File

@@ -1,3 +1,29 @@
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index 2abc3f3..91724a5 100644
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -238,7 +238,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
const sources = es.merge(src, extensions, extensionsCommonDependencies)
.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
- let version = packageJson.version;
+ let version = packageJson.version.replace('+', '.');
const quality = product.quality;
if (quality && quality !== 'stable') {
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 28f8e52..c83a4e1 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -187,7 +187,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
const sources = es.merge(src, extensions)
.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
- let version = packageJson.version;
+ let version = packageJson.version.replace('+', '.');
const quality = product.quality;
if (quality && quality !== 'stable') {
diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
index 489d9cc..51db755 100644 index 489d9cc..51db755 100644
--- a/build/gulpfile.vscode.linux.js --- a/build/gulpfile.vscode.linux.js
@@ -116,7 +142,7 @@ index 0a5e7d2..e453393 100644
return false; return false;
} }
diff --git a/src/vs/platform/externalServices/common/marketplace.ts b/src/vs/platform/externalServices/common/marketplace.ts diff --git a/src/vs/platform/externalServices/common/marketplace.ts b/src/vs/platform/externalServices/common/marketplace.ts
index 5923e1c..a1c9db8 100644 index 5923e1c..d70c59f 100644
--- a/src/vs/platform/externalServices/common/marketplace.ts --- a/src/vs/platform/externalServices/common/marketplace.ts
+++ b/src/vs/platform/externalServices/common/marketplace.ts +++ b/src/vs/platform/externalServices/common/marketplace.ts
@@ -13,6 +13,10 @@ import { IStorageService } from 'vs/platform/storage/common/storage'; @@ -13,6 +13,10 @@ import { IStorageService } from 'vs/platform/storage/common/storage';