diff --git a/README.md b/README.md index 3a87a1ab7..9fe55a823 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,17 @@ This will do a couple of things: * Run electron-builder to build a package. The package built will match the operating system you're running the build process on. +If you're on Windows, you can choose to build specifically for 32 or 64 bit: +``` +yarn run build32 +``` +or +``` +yarn run build64 +``` + +This build step will not build any native modules. + If you'd like to build the native modules (for searching in encrypted rooms): This will take 10 minutes or so, and will require a number of native tools to be installed, depending on your OS (eg. rust, tcl, make/nmake). @@ -66,6 +77,9 @@ to be installed, depending on your OS (eg. rust, tcl, make/nmake). yarn run build:native ``` +On Windows, this will automatically determine the architecture to build for based +on the environment (ie. set up by vcvarsall.bat). + You can also build using docker, which will always produce the linux package: ``` # Run this once to make the docker image diff --git a/package.json b/package.json index 4db1665aa..474ef09f8 100644 --- a/package.json +++ b/package.json @@ -17,10 +17,12 @@ "setversion": "node scripts/set-version.js", "start": "electron .", "lint": "eslint src/ scripts/ hak/", + "build:native": "yarn run hak", + "build32": "yarn run setversion && electron-builder --ia32", + "build64": "yarn run setversion && electron-builder --x64", "build": "yarn run setversion && electron-builder", - "buildnative": "yarn run hak", "docker:setup": "docker build -t riot-desktop-dockerbuild dockerbuild", - "docker:buildnative": "scripts/in-docker.sh yarn run hak", + "docker:build:native": "scripts/in-docker.sh yarn run hak", "docker:build": "scripts/in-docker.sh yarn run build", "docker:install": "scripts/in-docker.sh yarn install", "debrepo": "scripts/mkrepo.sh", @@ -92,11 +94,7 @@ }, "win": { "target": { - "target": "squirrel", - "arch": [ - "x64", - "ia32" - ] + "target": "squirrel" }, "certificateSubjectName": "New Vector Ltd" },