Merge branch 'master' into chrome39

Conflicts:
	vendor/brightray

atom.gyp

@@ -60,7 +60,6 @@
       'atom/app/atom_content_client.h',
       'atom/app/atom_main_delegate.cc',
       'atom/app/atom_main_delegate.h',
-      'atom/app/atom_main_delegate_mac.mm',
       'atom/browser/api/atom_api_app.cc',
       'atom/browser/api/atom_api_app.h',
       'atom/browser/api/atom_api_auto_updater.cc',

atom/app/atom_main_delegate.h

@@ -26,10 +26,6 @@ class AtomMainDelegate : public brightray::MainDelegate {
   scoped_ptr<brightray::ContentClient> CreateContentClient() override;
   void AddDataPackFromPath(
       ui::ResourceBundle* bundle, const base::FilePath& pak_dir) override;
-#if defined(OS_MACOSX)
-  void OverrideChildProcessPath() override;
-  void OverrideFrameworkBundlePath() override;
-#endif
 
  private:
   brightray::ContentClient content_client_;

atom/app/atom_main_delegate_mac.mm

@@ -1,37 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/app/atom_main_delegate.h"
-
-#include "base/mac/bundle_locations.h"
-#include "base/files/file_path.h"
-#include "base/path_service.h"
-#include "brightray/common/mac/main_application_bundle.h"
-#include "content/public/common/content_paths.h"
-
-namespace atom {
-
-namespace {
-
-base::FilePath GetFrameworksPath() {
-  return brightray::MainApplicationBundlePath().Append("Contents")
-                                               .Append("Frameworks");
-}
-
-}  // namespace
-
-void AtomMainDelegate::OverrideFrameworkBundlePath() {
-  base::mac::SetOverrideFrameworkBundlePath(
-      GetFrameworksPath().Append("Atom Framework.framework"));
-}
-
-void AtomMainDelegate::OverrideChildProcessPath() {
-  base::FilePath helper_path = GetFrameworksPath().Append("Atom Helper.app")
-                                                  .Append("Contents")
-                                                  .Append("MacOS")
-                                                  .Append("Atom Helper");
-  PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
-}
-
-}  // namespace atom

atom/browser/atom_browser_main_parts_mac.mm

@@ -13,6 +13,11 @@
 
 namespace atom {
 
+std::string GetApplicationName() {
+  std::string name = brightray::MainApplicationBundlePath().BaseName().AsUTF8Unsafe();
+  return name.substr(0, name.length() - 4/*.app*/);
+}
+
 void AtomBrowserMainParts::PreMainMessageLoopStart() {
   // Initialize locale setting.
   l10n_util::OverrideLocaleWithCocoaLocale();
@@ -26,7 +31,7 @@ void AtomBrowserMainParts::PreMainMessageLoopStart() {
   base::FilePath frameworkPath = brightray::MainApplicationBundlePath()
       .Append("Contents")
       .Append("Frameworks")
-      .Append("Atom Framework.framework");
+      .Append(GetApplicationName() + " Framework.framework");
   NSBundle* frameworkBundle = [NSBundle
        bundleWithPath:base::mac::FilePathToNSString(frameworkPath)];
   NSNib* mainNib = [[NSNib alloc] initWithNibNamed:@"MainMenu"

docs/development/build-instructions-linux.md

@@ -38,7 +38,7 @@ there is no `Makefile` generated.
 
 ```bash
 $ cd atom-shell
-$ ./script/bootstrap.py
+$ ./script/bootstrap.py -v
 ```
 
 ## Building

docs/development/build-instructions-mac.md

@@ -25,7 +25,7 @@ there is no Xcode project generated.
 
 ```bash
 $ cd atom-shell
-$ ./script/bootstrap.py
+$ ./script/bootstrap.py -v
 ```
 
 ## Building

docs/development/build-instructions-windows.md

@@ -35,7 +35,7 @@ there is no Visual Studio project generated.
 
 ```powershell
 cd atom-shell
-python script\bootstrap.py
+python script\bootstrap.py -v
 ```
 
 ## Building

docs/tutorial/application-distribution.md

@@ -27,6 +27,35 @@ Then execute `Atom.app` (or `atom` on Linux, and `atom.exe` on Windows), and
 atom-shell will start as your app. The `atom-shell` directory would then be
 your distribution that should be delivered to final users.
 
+## Renaming Atom Shell for your app
+
+The best way to rename Atom Shell is to change the `atom.gyp` file, then build
+from source. Open up `atom.gyp` and change the first lines:
+
+```
+'project_name': 'atom',
+'product_name': 'Atom',
+'framework_name': 'Atom Framework',
+```
+
+Once you make the change, re-run `script/bootstrap` then run the command:
+
+```sh
+script/build.py -c Release -t $whatever_you_chose_for_project_name
+```
+
+If your app is OS X / Linux-only, you can also simply rename the "Atom.app"
+folder as well as the names under "Framework" (i.e. "Atom Framework.framework"
+=> "MyApp Framework.framework"), but this will break loading native Node
+modules on Windows.
+
+Fixing this is complicated, but a Grunt task has been created that will handle
+this automatically,
+[grunt-build-atom-shell](https://github.com/paulcbetts/grunt-build-atom-shell).
+This task will automatically handle editing the .gyp file, building from
+source, then rebuilding your app's native Node modules to match the new
+executable name.
+
 ## Packaging your app into a file
 
 Apart from shipping your app by copying all its sources files, you can also

script/bootstrap.py

@@ -4,8 +4,9 @@ import argparse
 import os
 import sys
 
-from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL
+from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, \
-from lib.util import execute, scoped_cwd, enable_verbose_execute
+                       enable_verbose_mode, is_verbose_mode
+from lib.util import execute_stdout, scoped_cwd
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
@@ -19,7 +20,7 @@ def main():
 
   args = parse_args()
   if args.verbose:
-    enable_verbose_execute()
+    enable_verbose_mode()
   update_submodules()
   update_node_modules('.')
   update_atom_modules('spec')
@@ -49,19 +50,22 @@ def parse_args():
 
 
 def update_submodules():
-  execute(['git', 'submodule', 'sync'])
+  execute_stdout(['git', 'submodule', 'sync'])
-  execute(['git', 'submodule', 'update', '--init', '--recursive'])
+  execute_stdout(['git', 'submodule', 'update', '--init', '--recursive'])
 
 
 def bootstrap_brightray(url):
   bootstrap = os.path.join(VENDOR_DIR, 'brightray', 'script', 'bootstrap')
-  execute([sys.executable, bootstrap, '--commit', LIBCHROMIUMCONTENT_COMMIT,
+  execute_stdout([sys.executable, bootstrap, '--commit',
-           url])
+                  LIBCHROMIUMCONTENT_COMMIT, url])
 
 
 def update_node_modules(dirname):
   with scoped_cwd(dirname):
-    execute([NPM, 'install'])
+    if is_verbose_mode():
+      execute_stdout([NPM, 'install', '--verbose'])
+    else:
+      execute_stdout([NPM, 'install'])
 
 
 def update_atom_modules(dirname):
@@ -70,20 +74,20 @@ def update_atom_modules(dirname):
     if sys.platform in ['win32', 'cygwin']:
       apm = os.path.join(SOURCE_ROOT, 'node_modules', 'atom-package-manager',
                          'bin', 'apm.cmd')
-    execute([apm, 'install'])
+    execute_stdout([apm, 'install'])
 
 
 def update_win32_python():
   with scoped_cwd(VENDOR_DIR):
     if not os.path.exists('python_26'):
-      execute(['git', 'clone', PYTHON_26_URL])
+      execute_stdout(['git', 'clone', PYTHON_26_URL])
 
 
 def install_runas():
   # TODO This is needed by the tools/win/register_msdia80_dll.js, should move
   # this to a better place.
   with scoped_cwd(os.path.join(SOURCE_ROOT, 'tools', 'win')):
-    execute([NPM, 'install', 'runas'])
+    execute_stdout([NPM, 'install', 'runas'])
 
 
 def create_chrome_version_h():
@@ -112,7 +116,7 @@ def touch_config_gypi():
 
 def update_atom_shell():
   update = os.path.join(SOURCE_ROOT, 'script', 'update.py')
-  execute([sys.executable, update])
+  execute_stdout([sys.executable, update])
 
 
 if __name__ == '__main__':

script/lib/config.py

@@ -23,3 +23,13 @@ TARGET_PLATFORM = {
   'linux2': 'linux',
   'win32': 'win32',
 }[sys.platform]
+
+verbose_mode = False
+
+def enable_verbose_mode():
+  print 'Running in verbose mode'
+  global verbose_mode
+  verbose_mode = True
+
+def is_verbose_mode():
+  return verbose_mode

script/lib/util.py

@@ -12,7 +12,7 @@ import urllib2
 import os
 import zipfile
 
-verbose_mode = False
+from config import is_verbose_mode
 
 def tempdir(prefix=''):
   directory = tempfile.mkdtemp(prefix=prefix)
@@ -20,12 +20,6 @@ def tempdir(prefix=''):
   return directory
 
 
-def enable_verbose_execute():
-  print 'Running in verbose mode'
-  global verbose_mode
-  verbose_mode = True
-
-
 @contextlib.contextmanager
 def scoped_cwd(path):
   cwd = os.getcwd()
@@ -132,9 +126,11 @@ def safe_mkdir(path):
 
 
 def execute(argv):
+  if is_verbose_mode():
+    print ' '.join(argv)
   try:
     output = subprocess.check_output(argv, stderr=subprocess.STDOUT)
-    if verbose_mode:
+    if is_verbose_mode():
       print output
     return output
   except subprocess.CalledProcessError as e:
@@ -142,6 +138,18 @@ def execute(argv):
     raise e
 
 
+def execute_stdout(argv):
+  if is_verbose_mode():
+    print ' '.join(argv)
+    try:
+      subprocess.check_call(argv)
+    except subprocess.CalledProcessError as e:
+      print e.output
+      raise e
+  else:
+    execute(argv)
+
+
 def get_atom_shell_version():
   return subprocess.check_output(['git', 'describe', '--tags']).strip()