Merge branch 'win-bootstrap-native-modules' of https://github.com/atom/atom into win-bootstrap-native-modules

Gruntfile.coffee

@@ -8,14 +8,21 @@ _ = require 'underscore-plus'
 packageJson = require './package.json'
 
 module.exports = (grunt) ->
-  appName = 'Atom.app'
   [major, minor, patch] = packageJson.version.split('.')
-  tmpDir = if process.platform is 'win32' then os.tmpdir() else '/tmp'
+  if process.platform is 'win32'
+    appName = 'Atom'
+    tmpDir = os.tmpdir()
+    installRoot = process.env.ProgramFiles
+  else
+    appName = 'Atom.app'
+    tmpDir = '/tmp'
+    installRoot = '/Applications'
+
   buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
   shellAppDir = path.join(buildDir, appName)
   contentsDir = path.join(shellAppDir, 'Contents')
   appDir = path.join(contentsDir, 'Resources', 'app')
-  installDir = path.join('/Applications', appName)
+  installDir = path.join(installRoot, appName)
 
   coffeeConfig =
     options:

tasks/build-task.coffee

@@ -12,12 +12,6 @@ module.exports = (grunt) ->
     rm shellAppDir
     mkdir path.dirname(buildDir)
 
-    if process.platform is 'darwin'
-      cp 'atom-shell/Atom.app', shellAppDir
-    else if process.platform is 'win32'
-      console.log shellAppDir
-      cp 'atom-shell/', shellAppDir
-
     if process.platform is 'darwin'
       cp 'atom-shell/Atom.app', shellAppDir
     else if process.platform is 'win32'