Merge pull request #13135 from atom/dg-windows-64bit

Windows 64-bit version

README.md

@@ -33,15 +33,14 @@ Atom will automatically update when a new release is available.
 
 ### Windows
 
-Download the latest [AtomSetup.exe installer](https://github.com/atom/atom/releases/latest).
+Download the latest [Atom installer](https://github.com/atom/atom/releases/latest).  AtomSetup.exe is 32-bit, AtomSetup-x64.exe for 64-bit systems.
 
 Atom will automatically update when a new release is available.
 
-You can also download an `atom-windows.zip` file from the [releases page](https://github.com/atom/atom/releases/latest).
+You can also download `atom-windows.zip` (32-bit) or `atom-x64-windows.zip` (64-bit) from the [releases page](https://github.com/atom/atom/releases/latest).
 The `.zip` version will not automatically update.
 
-Using [chocolatey](https://chocolatey.org/)? Run `cinst Atom` to install
-the latest version of Atom.
+Using [chocolatey](https://chocolatey.org/)? Run `cinst Atom` to install the latest version of Atom.
 
 ### Debian Linux (Ubuntu)
 

apm/package.json

@@ -6,6 +6,6 @@
     "url": "https://github.com/atom/atom.git"
   },
   "dependencies": {
-    "atom-package-manager": "1.14.1"
+    "atom-package-manager": "1.15.0"
   }
 }

appveyor.yml

@@ -8,6 +8,7 @@ clone_depth: 10
 
 platform:
   - x86
+  - x64
 
 environment:
   global:

docs/build-instructions/windows.md

@@ -2,20 +2,20 @@
 
 ## Requirements
 
-* Node.js 4.4.x or later
+* Node.js 4.4.x or later (the architecture of node available to the build system will determine whether you build 32-bit or 64-bit Atom)
 * Python v2.7.x
-  * The python.exe must be available at `%SystemDrive%\Python27\python.exe`. If it is installed elsewhere, you can create a symbolic link to the directory containing the python.exe using: `mklink /d %SystemDrive%\Python27 D:\elsewhere\Python27`
+  * The python.exe must be available at `%SystemDrive%\Python27\python.exe`. If it is installed elsewhere create a symbolic link to the directory containing the python.exe using: `mklink /d %SystemDrive%\Python27 D:\elsewhere\Python27`
 * Visual Studio, either:
   * [Visual C++ Build Tools 2015](http://landinghub.visualstudio.com/visual-cpp-build-tools)
   * [Visual Studio 2013 Update 5](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs) (Express Edition or better)
   * [Visual Studio 2015](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs) (Community Edition or better)
 
-  Whichever version you use, ensure that:
+  Also ensure that:
   * The default installation folder is chosen so the build tools can find it
   * If using Visual Studio make sure Visual C++ support is selected/installed
   * If using Visual C++ Build Tools make sure Windows 8 SDK is selected/installed
   * A `git` command is in your path
-  * Set the `GYP_MSVS_VERSION` environment variable to the Visual Studio/Build Tools version (`2013` or `2015`) e.g. ``[Environment]::SetEnvironmentVariable("GYP_MSVS_VERSION", "2015", "User")`` in PowerShell or set it in Windows advanced system settings control panel.
+  * Set the `GYP_MSVS_VERSION` environment variable to the Visual Studio/Build Tools version (`2013` or `2015`) e.g. ``[Environment]::SetEnvironmentVariable("GYP_MSVS_VERSION", "2015", "User")`` in PowerShell (or set it in Windows advanced system settings).
 
 ## Instructions
 
@@ -32,8 +32,8 @@ To also install the newly built application, use `script\build --create-windows-
 
 ### `script\build` Options
 * `--code-sign`: signs the application with the GitHub certificate specified in `$WIN_P12KEY_URL`.
-* `--compress-artifacts`: zips the generated application as `out/atom-windows.zip` (requires 7-zip).
-* `--create-windows-installer`: creates an `.msi`, an `.exe` and a `.nupkg` installer in the `out/` directory.
+* `--compress-artifacts`: zips the generated application as `out\atom-windows.zip` (requires [7-Zip](http://www.7-zip.org)).
+* `--create-windows-installer`: creates an `.msi`, an `.exe` and two `.nupkg` packages in the `out` directory.
 * `--install`: installs the application in `%LOCALAPPDATA%\Atom\app-dev\`.
 
 ### Running tests
@@ -53,22 +53,18 @@ When building Atom from source, the `apm` command is not added to the system pat
 
 ### Common Errors
 * `node is not recognized`
-  * If you just installed Node.js, you'll need to restart Command Prompt before the `node` command is available on your Path.
+  * If you just installed Node.js, you'll need to restart Command Prompt before the `node` command is available on your path.
 
 * `msbuild.exe failed with exit code: 1`
-   * If you installed Visual Studio, ensure you have Visual C++ support installed. Go into Add/Remove Programs, select Visual Studio, press Modify, and then check the Visual C++ box.
-   * If you installed Visual C++ Build Tools, ensure you have Windows 8 SDK support installed. Go into Add/Remove Programs, select Visual Studio, press Modify and then check the Windows 8 SDK box.
+   * If using **Visual Studio**, ensure you have the **Visual C++** component installed. Go into Add/Remove Programs, select Visual Studio, press Modify, and then check the Visual C++ box.
+   * If using **Visual C++ Build Tools**, ensure you have the **Windows 8 SDK** component installed. Go into Add/Remove Programs, select Visual C++ Build Tools, press Modify and then check the Windows 8 SDK box.
 
-* `script\build` stop with no error or warning shortly after displaying the versions of node, npm and Python
+* `script\build` stops with no error or warning shortly after displaying the versions of node, npm and Python
   * Make sure that the path where you have checked out Atom does not include a space. For example, use `C:\atom` instead of `C:\my stuff\atom`.
-
-* `script\build` outputs only the Node.js and Python versions before returning
-  * Try moving the repository to `C:\atom`. Most likely, the path is too long.
-    See [issue #2200](https://github.com/atom/atom/issues/2200).
+  * Try moving the repository to `C:\atom`. Most likely, the path is too long. See [issue #2200](https://github.com/atom/atom/issues/2200).
 
 * `error MSB4025: The project file could not be loaded. Invalid character in the given encoding.`
-  * This can occur because your home directory (`%USERPROFILE%`) has non-ASCII
-    characters in it. This is a bug in [gyp](https://code.google.com/p/gyp/)
+  * This can occur because your home directory (`%USERPROFILE%`) has non-ASCII characters in it. This is a bug in [gyp](https://code.google.com/p/gyp/)
     which is used to build native Node.js modules and there is no known workaround.
     * https://github.com/TooTallNate/node-gyp/issues/297
     * https://code.google.com/p/gyp/issues/detail?id=393
@@ -80,14 +76,14 @@ When building Atom from source, the `apm` command is not added to the system pat
   * See the next item.
 
 * `error MSB8020: The build tools for Visual Studio 201? (Platform Toolset = 'v1?0') cannot be found.`
-  * Try setting the `GYP_MSVS_VERSION` environment variable to 2013 or 2015 depending on what version of Visual Studio/Build Tools is installed and then `script\clean` followed by `script\build` (re-open the Command Prompt if you set the variable using the GUI).
+  * Try setting the `GYP_MSVS_VERSION` environment variable to **2013** or **2015** depending on what version of Visual Studio/Build Tools is installed and then `script\clean` followed by `script\build` (re-open the Command Prompt if you set the variable using the GUI).
 
 * `'node-gyp' is not recognized as an internal or external command, operable program or batch file.`
   * Try running `npm install -g node-gyp`, and run `script\build` again.
 
 * Other `node-gyp` errors on first build attempt, even though the right Node.js and Python versions are installed.
-  * Do try the build command one more time, as experience shows it often works on second try in many of these cases.
+  * Do try the build command one more time as experience shows it often works on second try in many cases.
 
 ### Windows build error reports in atom/atom
 * If all fails, use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Awindows&type=Issues) to get a list of reports about build errors on Windows, and see if yours has already been reported.
-* If it hasn't, please open a new issue with your Windows version, architecture (x86 or amd64), and a screenshot of your build output, including the Node.js and Python versions.
+* If it hasn't, please open a new issue with your Windows version, architecture (x86 or x64), and a screenshot of your build output, including the Node.js and Python versions.

script/lib/compress-artifacts.js

@@ -7,23 +7,7 @@ const spawnSync = require('./spawn-sync')
 const CONFIG = require('../config')
 
 module.exports = function (packagedAppPath) {
-  let appArchiveName
-  if (process.platform === 'darwin') {
-    appArchiveName = 'atom-mac.zip'
-  } else if (process.platform === 'win32') {
-    appArchiveName = 'atom-windows.zip'
-  } else {
-    let arch
-    if (process.arch === 'ia32') {
-      arch = 'i386'
-    } else if (process.arch === 'x64') {
-      arch = 'amd64'
-    } else {
-      arch = process.arch
-    }
-    appArchiveName = `atom-${arch}.tar.gz`
-  }
-  const appArchivePath = path.join(CONFIG.buildOutputPath, appArchiveName)
+  const appArchivePath = path.join(CONFIG.buildOutputPath, getArchiveName())
   compress(packagedAppPath, appArchivePath)
 
   if (process.platform === 'darwin') {
@@ -32,6 +16,22 @@ module.exports = function (packagedAppPath) {
   }
 }
 
+function getArchiveName () {
+  switch (process.platform) {
+    case 'darwin':  return 'atom-mac.zip'
+    case 'win32':   return `atom-windows.zip`
+    default:        return `atom-${getLinuxArchiveArch()}.tar.gz`
+  }
+}
+
+function getLinuxArchiveArch () {
+  switch (process.arch) {
+    case 'ia32':  return 'i386'
+    case 'x64' :  return 'amd64'
+    default:      return process.arch
+  }
+}
+
 function compress (inputDirPath, outputArchivePath) {
   if (fs.existsSync(outputArchivePath)) {
     console.log(`Deleting "${outputArchivePath}"`)

script/lib/create-windows-installer.js

@@ -11,16 +11,22 @@ const spawnSync = require('./spawn-sync')
 const CONFIG = require('../config')
 
 module.exports = function (packagedAppPath, codeSign) {
+  const archSuffix = process.arch === 'ia32' ? '' : '-' + process.arch
   const options = {
     appDirectory: packagedAppPath,
     authors: 'GitHub Inc.',
     iconUrl: `https://raw.githubusercontent.com/atom/atom/master/resources/app-icons/${CONFIG.channel}/atom.ico`,
     loadingGif: path.join(CONFIG.repositoryRootPath, 'resources', 'win', 'loading.gif'),
     outputDirectory: CONFIG.buildOutputPath,
-    remoteReleases: `https://atom.io/api/updates?version=${CONFIG.appMetadata.version}`,
+    remoteReleases: `https://atom.io/api/updates${archSuffix}`,
     setupIcon: path.join(CONFIG.repositoryRootPath, 'resources', 'app-icons', CONFIG.channel, 'atom.ico')
   }
 
+  // Remove this once an x64 version is published or atom.io is returning blank instead of 404 for RELEASES-X64
+  if (process.arch === 'x64') {
+    options.remoteReleases = null
+  }
+
   const certPath = path.join(os.tmpdir(), 'win.p12')
   const signing = codeSign && process.env.WIN_P12KEY_URL
 

script/lib/dependencies-fingerprint.js

@@ -22,7 +22,7 @@ module.exports = {
     // Include the electron minor version in the fingerprint since that changing requires a re-install
     const electronVersion = CONFIG.appMetadata.electronVersion.replace(/\.\d+$/, '')
     const apmVersion = CONFIG.apmMetadata.dependencies['atom-package-manager']
-    const body = electronVersion + apmVersion + process.platform + process.version
+    const body = electronVersion + apmVersion + process.platform + process.version + process.arch
     return crypto.createHash('sha1').update(body).digest('hex')
   }
 }

script/lib/install-atom-dependencies.js

@@ -12,10 +12,6 @@ module.exports = function () {
   // Set our target (Electron) version so that node-pre-gyp can download the
   // proper binaries.
   installEnv.npm_config_target = CONFIG.appMetadata.electronVersion;
-  // Force 32-bit modules on Windows. (Ref.: https://github.com/atom/atom/issues/10450)
-  if (process.platform === 'win32') {
-    installEnv.npm_config_target_arch = 'ia32'
-  }
   childProcess.execFileSync(
     CONFIG.getApmBinPath(),
     ['--loglevel=error', 'install'],

script/lib/package-application.js

@@ -18,12 +18,7 @@ module.exports = function () {
     'app-bundle-id': 'com.github.atom',
     'app-copyright': `Copyright © 2014-${(new Date()).getFullYear()} GitHub, Inc. All rights reserved.`,
     'app-version': CONFIG.appMetadata.version,
-    'arch': (() => {
-      if (process.platform === 'linux') {
-        return process.arch
-      } else {
-        return process.platform === 'win32' ? 'ia32' : 'x64'
-      }})(),
+    'arch': process.platform === 'darwin' ? 'x64' : process.arch, // OS X is 64-bit only
     'asar': {unpack: buildAsarUnpackGlobExpression()},
     'build-version': CONFIG.appMetadata.version,
     'download': {cache: CONFIG.electronDownloadPath},
@@ -174,6 +169,9 @@ function renamePackagedAppDir (packageOutputDirPath) {
   } else {
     const appName = CONFIG.channel === 'beta' ? 'Atom Beta' : 'Atom'
     packagedAppPath = path.join(CONFIG.buildOutputPath, appName)
+    if (process.platform === 'win32' && process.arch !== 'ia32') {
+      packagedAppPath += ` ${process.arch}`
+    }
     if (fs.existsSync(packagedAppPath)) fs.removeSync(packagedAppPath)
     fs.renameSync(packageOutputDirPath, packagedAppPath)
   }

script/package.json

@@ -9,7 +9,7 @@
     "csslint": "1.0.2",
     "donna": "1.0.13",
     "electron-packager": "7.3.0",
-    "electron-winstaller": "2.3.4",
+    "electron-winstaller": "2.4.0",
     "fs-extra": "0.30.0",
     "glob": "7.0.3",
     "joanna": "0.0.6",

src/main-process/atom-application.coffee

@@ -34,7 +34,7 @@ class AtomApplication
     unless options.socketPath?
       if process.platform is 'win32'
         userNameSafe = new Buffer(process.env.USERNAME).toString('base64')
-        options.socketPath = "\\\\.\\pipe\\atom-#{options.version}-#{userNameSafe}-sock"
+        options.socketPath = "\\\\.\\pipe\\atom-#{options.version}-#{userNameSafe}-#{process.arch}-sock"
       else
         options.socketPath = path.join(os.tmpdir(), "atom-#{options.version}-#{process.env.USER}.sock")
 

src/main-process/auto-update-manager.coffee

@@ -17,13 +17,15 @@ class AutoUpdateManager
   constructor: (@version, @testMode, resourcePath, @config) ->
     @state = IdleState
     @iconPath = path.resolve(__dirname, '..', '..', 'resources', 'atom.png')
-    @feedUrl = "https://atom.io/api/updates?version=#{@version}"
     process.nextTick => @setupAutoUpdater()
 
   setupAutoUpdater: ->
     if process.platform is 'win32'
+      archSuffix = if process.arch is 'ia32' then '' else '-' + process.arch
+      @feedUrl = "https://atom.io/api/updates#{archSuffix}"
       autoUpdater = require './auto-updater-win32'
     else
+      @feedUrl = "https://atom.io/api/updates?version=#{@version}"
       {autoUpdater} = require 'electron'
 
     autoUpdater.on 'error', (event, message) =>

src/main-process/start.js

@@ -39,7 +39,7 @@ module.exports = function start (resourcePath, startTime) {
   }
 
   // NB: This prevents Win10 from showing dupe items in the taskbar
-  app.setAppUserModelId('com.squirrel.atom.atom')
+  app.setAppUserModelId('com.squirrel.atom.' + process.arch)
 
   function addPathToOpen (event, pathToOpen) {
     event.preventDefault()