Merge branch 'master' of github.com:github/atom

Atom.xcodeproj/project.pbxproj

@@ -865,7 +865,6 @@
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					"PROJECT_DIR=\"\\\"$PROJECT_DIR\\\"\"",
 					"\"CHROMIUM_BUILD\"",
 					"\"ENABLE_REMOTING=1\"",
 					"\"ENABLE_P2P_APIS=1\"",

Atom/src/Atom.mm

@@ -81,7 +81,6 @@
   callback(context, global);
   
   context->Exit();
-
 }
 
 - (CefRefPtr<CefV8Context>)atomContext {
@@ -108,8 +107,14 @@
 
     CefRefPtr<CefV8Value> atom = CefV8Value::CreateObject(NULL);
     global->SetValue("atom", atom, V8_PROPERTY_ATTRIBUTE_NONE);
-
-    CefRefPtr<CefV8Value> loadPath = CefV8Value::CreateString(PROJECT_DIR);
+      
+#ifdef DEBUG
+    char path[] = PROJECT_DIR;
+#else
+    const char *path = [[[NSBundle mainBundle] resourcePath] UTF8String];
+#endif
+    
+    CefRefPtr<CefV8Value> loadPath = CefV8Value::CreateString(path);
     atom->SetValue("loadPath", loadPath, V8_PROPERTY_ATTRIBUTE_NONE);    
   }];
 }

Rakefile

@@ -7,7 +7,7 @@ BUILD_DIR = '/tmp/atom-build'
 
 desc "Build Atom via `xcodebuild`"
 task :build => :"verify-prerequisites" do
-  output = `xcodebuild SYMROOT=#{BUILD_DIR}`
+  output = `xcodebuild -scheme atom-release SYMROOT=#{BUILD_DIR}`
   if $?.exitstatus != 0
     $stderr.puts "Error #{$?.exitstatus}:\n#{output}"
     exit($?.exitstatus)
@@ -108,7 +108,7 @@ end
 
 def binary_path
   if app_path = application_path()
-    binary_path = "#{applications.first}/Contents/MacOS/Atom"
+    binary_path = "#{app_path}/Contents/MacOS/Atom"
     if File.exists?(binary_path)
       return binary_path
     else