Move over Windows x64 artifact naming changes for build consistency

Author: daviwil

script/build

@@ -104,8 +104,10 @@ if (!argv.generateApiDocs) {
           }
           if (argv.createWindowsInstaller) {
             return createWindowsInstaller(packagedAppPath)
-              .then(() => argv.codeSign && codeSignOnWindows([ path.join(CONFIG.buildOutputPath, 'AtomSetup.exe') ]))
-              .then(() => packagedAppPath)
+              .then((installerPath) => {
+                argv.codeSign && codeSignOnWindows([installerPath])
+                return packagedAppPath
+              })
           } else {
             console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer.'.gray)
           }

script/lib/compress-artifacts.js

@@ -19,7 +19,7 @@ module.exports = function (packagedAppPath) {
 function getArchiveName () {
   switch (process.platform) {
     case 'darwin': return 'atom-mac.zip'
-    case 'win32': return 'atom-windows.zip'
+    case 'win32': return `atom-${process.arch === 'x64' ? 'x64-' : ''}windows.zip`
     default: return `atom-${getLinuxArchiveArch()}.tar.gz`
   }
 }

script/lib/create-windows-installer.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const electronInstaller = require('electron-winstaller')
-const fs = require('fs-extra')
+const fs = require('fs')
 const glob = require('glob')
 const path = require('path')
 
@@ -17,16 +17,30 @@ module.exports = (packagedAppPath) => {
     outputDirectory: CONFIG.buildOutputPath,
     noMsi: true,
     remoteReleases: `https://atom.io/api/updates${archSuffix}?version=${CONFIG.appMetadata.version}`,
+    setupExe: `AtomSetup${process.arch === 'x64' ? '-x64' : ''}.exe`,
     setupIcon: path.join(CONFIG.repositoryRootPath, 'resources', 'app-icons', CONFIG.channel, 'atom.ico')
   }
 
   const cleanUp = () => {
-    for (let nupkgPath of glob.sync(`${CONFIG.buildOutputPath}/*.nupkg`)) {
+    const releasesPath = `${CONFIG.buildOutputPath}/RELEASES`
+    if (process.arch === 'x64' && fs.existsSync(releasesPath)) {
+      fs.renameSync(releasesPath, `${releasesPath}-x64`)
+    }
+
+    for (let nupkgPath of glob.sync(`${CONFIG.buildOutputPath}/atom-*.nupkg`)) {
       if (!nupkgPath.includes(CONFIG.appMetadata.version)) {
         console.log(`Deleting downloaded nupkg for previous version at ${nupkgPath} to prevent it from being stored as an artifact`)
-        fs.removeSync(nupkgPath)
+        fs.unlinkSync(nupkgPath)
+      } else {
+        if (process.arch === 'x64') {
+          // Use the original .nupkg filename to generate the `atom-x64` name by inserting `-x64` after `atom`
+          const newNupkgPath = nupkgPath.replace('atom-', 'atom-x64-')
+          fs.renameSync(nupkgPath, newNupkgPath)
+        }
       }
     }
+
+    return `${CONFIG.buildOutputPath}/${options.setupExe}`
   }
 
   console.log(`Creating Windows Installer for ${packagedAppPath}`)