Compare commits

...

4 Commits

Author SHA1 Message Date
Peter Squicciarini
c25fd7717b Merge pull request #428 from Unrud/patch-1
Fix telemetry.enableCrashReporter setting
2020-06-26 16:37:36 -07:00
Peter Squicciarini
db359f0711 Merge pull request #431 from tuanpham-dev/master
Fix sqlite error on ARM build
2020-06-19 19:12:46 -07:00
Tuan Pham
22c41976f2 Fix sqlite error on ARM build 2020-06-19 18:39:56 -04:00
Unrud
80f4d30638 Fix telemetry.enableCrashReporter setting
The file containing the setting changed.
2020-06-18 11:29:27 +02:00
2 changed files with 9 additions and 1 deletions

View File

@@ -13,6 +13,14 @@ patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patch
yarn --frozen-lockfile
yarn postinstall
if [[ "$BUILDARCH" == *"arm"* ]]; then
sed -i -z 's/,\n[^\n]*arm[^\n]*//' node_modules/vscode-sqlite3/binding.gyp
sed -i "s/Release\/sqlite'/Release\/sqlite.node'/" node_modules/vscode-sqlite3/lib/sqlite3.js
yarn add -D electron-rebuild
npx electron-rebuild -f -w vscode-sqlite3
fi
mv product.json product.json.bak
# set fields in product.json

View File

@@ -46,4 +46,4 @@ update_setting () {
}
update_setting "$TELEMETRY_ENABLE" src/vs/platform/telemetry/common/telemetryService.ts
update_setting "$TELEMETRY_CRASH_REPORTER" src/vs/workbench/electron-browser/desktop.contribution.ts
update_setting "$TELEMETRY_CRASH_REPORTER" src/vs/workbench/electron-sandbox/desktop.contribution.ts