make arch a script argument

build/lib/snapshotLoader.js

@@ -11,6 +11,8 @@ var snaps;
     var cp = require('child_process');
     var mksnapshot = path.join(__dirname, "../../node_modules/.bin/" + (process.platform === 'win32' ? 'mksnapshot.cmd' : 'mksnapshot'));
     var product = require('../../product.json');
+    console.log(process.argv0);
+    var arch = /--arch=(.*)/.exec(process.argv.join(''))[1];
     //
     var loaderFilepath;
     var startupBlobFilepath;
@@ -21,8 +23,8 @@ var snaps;
             break;
         case 'win32':
         case 'linux':
-            loaderFilepath = "VSCode-" + process.platform + "/loader.js";
-            startupBlobFilepath = "VSCode-" + process.platform + "/snapshot_blob.bin";
+            loaderFilepath = "VSCode-" + process.platform + "-" + arch + "/resources/app/out/vs/loader.js";
+            startupBlobFilepath = "VSCode-" + process.platform + "-" + arch + "/snapshot_blob.bin";
     }
     loaderFilepath = path.join(__dirname, '../../../', loaderFilepath);
     startupBlobFilepath = path.join(__dirname, '../../../', startupBlobFilepath);

build/lib/snapshotLoader.ts

@@ -14,6 +14,7 @@ namespace snaps {
 
 	const mksnapshot = path.join(__dirname, `../../node_modules/.bin/${process.platform === 'win32' ? 'mksnapshot.cmd' : 'mksnapshot'}`);
 	const product = require('../../product.json');
+	const arch = process.argv.join('').match(/--arch=(.*)/)[0];
 
 	//
 	let loaderFilepath: string;
@@ -27,8 +28,8 @@ namespace snaps {
 
 		case 'win32':
 		case 'linux':
-			loaderFilepath = `VSCode-${process.platform}/resources/app/out/vs/loader.js`;
-			startupBlobFilepath = `VSCode-${process.platform}/snapshot_blob.bin`;
+			loaderFilepath = `VSCode-${process.platform}-${arch}/resources/app/out/vs/loader.js`;
+			startupBlobFilepath = `VSCode-${process.platform}-${arch}/snapshot_blob.bin`;
 	}
 
 	loaderFilepath = path.join(__dirname, '../../../', loaderFilepath);

build/tfs/linux/build.sh

@@ -31,7 +31,7 @@ step "Build minified" \
 	npm run gulp -- --max_old_space_size=4096 "vscode-linux-$ARCH-min"
 
 step "Create loader snapshot"
-	node build/lib/snapshotLoader.js
+	node build/lib/snapshotLoader.js --arch=$ARCH
 
 step "Run unit tests" \
 	./scripts/test.sh --build --reporter dot

build/tfs/win32/1_build.ps1

@@ -37,7 +37,7 @@ step "Build minified" {
 }
 
 step "Create loader snapshot" {
-  exec { & 	node build\lib\snapshotLoader.js }
+  exec { & 	node build\lib\snapshotLoader.js --arch=$global:arch }
 }
 
 step "Run unit tests" {