Skip to content

Commit 3b19657

Browse files
authored
Merge pull request #85326 from richard-townsend-arm/woa
Add gulp targets, fix build for Windows on Arm.
2 parents 5a98e13 + 2e0cf81 commit 3b19657

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

build/gulpfile.vscode.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ const buildRoot = path.dirname(root);
324324
const BUILD_TARGETS = [
325325
{ platform: 'win32', arch: 'ia32' },
326326
{ platform: 'win32', arch: 'x64' },
327+
{ platform: 'win32', arch: 'arm64' },
327328
{ platform: 'darwin', arch: null, opts: { stats: true } },
328329
{ platform: 'linux', arch: 'ia32' },
329330
{ platform: 'linux', arch: 'x64' },

build/gulpfile.vscode.win32.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ function archiveWin32Setup(arch) {
127127

128128
gulp.task(task.define('vscode-win32-ia32-archive', task.series(util.rimraf(zipDir('ia32')), archiveWin32Setup('ia32'))));
129129
gulp.task(task.define('vscode-win32-x64-archive', task.series(util.rimraf(zipDir('x64')), archiveWin32Setup('x64'))));
130+
gulp.task(task.define('vscode-win32-arm64-archive', task.series(util.rimraf(zipDir('arm64')), archiveWin32Setup('arm64'))));
130131

131132
function copyInnoUpdater(arch) {
132133
return () => {
@@ -149,3 +150,4 @@ gulp.task(task.define('vscode-win32-x64-inno-updater', task.series(copyInnoUpdat
149150

150151
gulp.task(task.define('vscode-win32-ia32-code-helper', task.series(updateIcon(path.join(buildPath('ia32'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));
151152
gulp.task(task.define('vscode-win32-x64-code-helper', task.series(updateIcon(path.join(buildPath('x64'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));
153+
gulp.task(task.define('vscode-win32-arm64-code-helper', task.series(updateIcon(path.join(buildPath('arm64'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"vscode-nsfw": "1.2.8",
5555
"vscode-proxy-agent": "^0.5.2",
5656
"vscode-ripgrep": "^1.5.8",
57-
"vscode-sqlite3": "4.0.9",
57+
"vscode-sqlite3": "4.0.10",
5858
"vscode-textmate": "4.4.0",
5959
"xterm": "4.6.0-beta.4",
6060
"xterm-addon-search": "0.6.0",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9707,10 +9707,10 @@ vscode-ripgrep@^1.5.8:
97079707
resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.8.tgz#32cb33da6d1a9ca8f5de8c2813ed5114fd55fc11"
97089708
integrity sha512-l6Pv/t1Jk63RU+kEkMO04XxnNRYdyzuesizj9AzFpcfrUxxpAjEJBK1qO9Mov30UUGZl7uDUBn+uCv9koaHPPA==
97099709

9710-
vscode-sqlite3@4.0.9:
9711-
version "4.0.9"
9712-
resolved "https://registry.yarnpkg.com/vscode-sqlite3/-/vscode-sqlite3-4.0.9.tgz#cad04964aff1e39121dd8c7cdb87c64a71bad9ce"
9713-
integrity sha512-g/xnAn4sgkVO+px/DfC7kpmCQ666W124tfMSVpbnQXsjMHlLhi4Urz4wPhS9YEFPz1Orl6h6MUF6wptzI6QFdg==
9710+
vscode-sqlite3@4.0.10:
9711+
version "4.0.10"
9712+
resolved "https://registry.yarnpkg.com/vscode-sqlite3/-/vscode-sqlite3-4.0.10.tgz#cf34cd98e5a49b24d3bb5ff5f2058744931f7cee"
9713+
integrity sha512-oYH3Nff3AMfbZpDiOhUh+hVtxClwrXBt9SGHGed+RcKf1Z4/fkLpfaldZeWgn4YBHFjNJjJ8HHRRfVvB8fXj1w==
97149714
dependencies:
97159715
nan "^2.14.0"
97169716

0 commit comments

Comments
 (0)