Merge branch 'master' into making-things-easy

Conflicts:
	.gitignore
	Rakefile

.gitignore

@@ -1,6 +1,10 @@
 .DS_Store
+.project
 .svn
+atom-build
 atom.xcodeproj
 build
 atom-build
 .xcodebuild-info
+node_modules
+npm-debug.log

Rakefile

@@ -1,24 +1,21 @@
 require 'timeout'
 
 $ATOM_ARGS = []
+ENV['PATH'] = "#{ENV['PATH']}:/opt/github/bin/"
 
-ENV['PATH'] = "#{ENV['PATH']}:/usr/local/bin/"
+COFFEE_PATH = "node_modules/.bin/coffee"
 BUILD_DIR = 'atom-build'
 
 desc "Create xcode project from gpy file"
 task "create-project" do
   `rm -rf atom.xcodeproj`
   `python tools/gyp/gyp --depth=. atom.gyp`
-  # `killall -c Xcode -9 2> /dev/null `
-  # `open atom.xcodeproj` # In order for the xcodebuild to know about the schemes, the project needs to have been opened once. This is xcode bullshit and is a bug on Apple's end (No radar has been file because I have no faith in radar's)
-  Timeout::timeout(10) do
-    sleep 0 while `xcodebuild -list` =~ /This project contains no schemes./ # Give xcode some time to open
-  end
 end
 
 desc "Build Atom via `xcodebuild`"
-task :build => ["create-project", "verify-prerequisites"] do
-  command = "xcodebuild -target Atom -configuration Debug -scheme Atom" # -scheme is required, otherwise xcodebuild creates a binary that won't run on Corey's Air. He recieves the error "Check failed: !loaded_locale.empty(). Locale could not be found for en-US"
+task :build => "create-project" do
+  command = "xcodebuild -target Atom configuration=Release SYMROOT=#{BUILD_DIR}"
+  puts command
   output = `#{command}`
   if $?.exitstatus != 0
     $stderr.puts "Error #{$?.exitstatus}:\n#{output}"
@@ -89,7 +86,8 @@ task :nof do
   system %{find . -name *spec.coffee | xargs sed -E -i "" "s/f+(it|describe) +(['\\"])/\\1 \\2/g"}
 end
 
-task "copy-files-to-bundle" => ["verify-prerequisites", "create-xcodebuild-info"] do
+desc "Copy files to bundle and compile CoffeeScripts"
+task :"copy-files-to-bundle" do
   project_dir  = ENV['PROJECT_DIR'] || '.'
   built_dir    = ENV['BUILT_PRODUCTS_DIR'] || '.'
   contents_dir = ENV['CONTENTS_FOLDER_PATH']
@@ -104,19 +102,7 @@ task "copy-files-to-bundle" => ["verify-prerequisites", "create-xcodebuild-info"
     rm_rf dest_path
     cp_r dir, dest_path
 
-    `coffee -c '#{dest_path.gsub(" ", "\\ ")}'`
-  end
-end
-
-task "create-xcodebuild-info" do
-  `echo $TARGET_BUILD_DIR/$FULL_PRODUCT_NAME > .xcodebuild-info`
-end
-
-task :"verify-prerequisites" do
-  `hash coffee`
-  if not $?.success?
-    abort "error: coffee is required but it's not installed - " +
-          "http://coffeescript.org/ - (try `npm i -g coffee-script`)"
+    `#{COFFEE_PATH} -c '#{dest_path.gsub(" ", "\\ ")}'`
   end
 end
 

atom.gyp

@@ -143,9 +143,7 @@
             {
               'postbuild_name': 'Copy and Compile Static Files',
               'action': [
-                'rake',
-                '--trace',
-                'copy-files-to-bundle',
+                'script/copy-files-to-bundle'
               ],
             },
             {
@@ -172,7 +170,7 @@
               'action': [
                 'cp',
                 '-r',
-                'cef/resources',
+                'cef/Resources',
                 '${BUILT_PRODUCTS_DIR}/Atom.app/Contents/Frameworks/Chromium Embedded Framework.framework/'
               ],
             },
@@ -325,9 +323,7 @@
             {
               'postbuild_name': 'Copy and Compile Static Files',
               'action': [
-                'rake',
-                '--trace',
-                'copy-files-to-bundle',
+                'script/copy-files-to-bundle'
               ],
             },
           ],