From c036986cc49c5dc79b3651881ffc1f53eeff09e6 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 31 Mar 2016 09:23:04 -0700 Subject: [PATCH 1/4] atom.gyp -> electron.gyp --- atom.gyp => electron.gyp | 0 script/bump-version.py | 4 ++-- script/lib/util.py | 2 +- script/update.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename atom.gyp => electron.gyp (100%) diff --git a/atom.gyp b/electron.gyp similarity index 100% rename from atom.gyp rename to electron.gyp diff --git a/script/bump-version.py b/script/bump-version.py index e2c22e8cd9..5c70d4494e 100755 --- a/script/bump-version.py +++ b/script/bump-version.py @@ -44,13 +44,13 @@ def increase_version(versions, index): def update_atom_gyp(version): pattern = re.compile(" *'version%' *: *'[0-9.]+'") - with open('atom.gyp', 'r') as f: + with open('electron.gyp', 'r') as f: lines = f.readlines() for i in range(0, len(lines)): if pattern.match(lines[i]): lines[i] = " 'version%': '{0}',\n".format(version) - with open('atom.gyp', 'w') as f: + with open('electron.gyp', 'w') as f: f.write(''.join(lines)) return diff --git a/script/lib/util.py b/script/lib/util.py index fc52d316d3..4e5fb90988 100644 --- a/script/lib/util.py +++ b/script/lib/util.py @@ -180,7 +180,7 @@ def execute_stdout(argv, env=os.environ): def atom_gyp(): SOURCE_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..')) - gyp = os.path.join(SOURCE_ROOT, 'atom.gyp') + gyp = os.path.join(SOURCE_ROOT, 'electron.gyp') with open(gyp) as f: obj = eval(f.read()); return obj['variables'] diff --git a/script/update.py b/script/update.py index e91e8401cb..33a4cff50f 100755 --- a/script/update.py +++ b/script/update.py @@ -68,7 +68,7 @@ def run_gyp(target_arch, component): '-Dmas_build={0}'.format(mas_build), ] return subprocess.call([python, gyp, '-f', 'ninja', '--depth', '.', - 'atom.gyp', '-Icommon.gypi'] + defines, env=env) + 'electron.gyp', '-Icommon.gypi'] + defines, env=env) if __name__ == '__main__': From ce95747a255775574e6bbabdfd45ca343e35081e Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 31 Mar 2016 09:26:11 -0700 Subject: [PATCH 2/4] atom.asar -> electron.asar --- atom/common/node_bindings.cc | 2 +- electron.gyp | 4 ++-- lib/common/api/callbacks-registry.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc index b0b4148c7b..ce3b9a7081 100644 --- a/atom/common/node_bindings.cc +++ b/atom/common/node_bindings.cc @@ -161,7 +161,7 @@ node::Environment* NodeBindings::CreateEnvironment( FILE_PATH_LITERAL("browser") : FILE_PATH_LITERAL("renderer"); base::FilePath resources_path = GetResourcesPath(is_browser_); base::FilePath script_path = - resources_path.Append(FILE_PATH_LITERAL("atom.asar")) + resources_path.Append(FILE_PATH_LITERAL("electron.asar")) .Append(process_type) .Append(FILE_PATH_LITERAL("init.js")); std::string script_path_str = script_path.AsUTF8Unsafe(); diff --git a/electron.gyp b/electron.gyp index 501cc3ab77..9652bd662c 100644 --- a/electron.gyp +++ b/electron.gyp @@ -87,7 +87,7 @@ }, # The application doesn't have real localizations, it just has # empty .lproj directories, which is enough to convince Cocoa - # atom-shell supports those languages. + # that Electron supports those languages. { 'postbuild_name': 'Make Empty Localizations', 'variables': { @@ -353,7 +353,7 @@ '<@(js_sources)', ], 'outputs': [ - '<(resources_path)/atom.asar', + '<(resources_path)/electron.asar', ], 'action': [ 'python', diff --git a/lib/common/api/callbacks-registry.js b/lib/common/api/callbacks-registry.js index 3e71899df2..7a9bf534f7 100644 --- a/lib/common/api/callbacks-registry.js +++ b/lib/common/api/callbacks-registry.js @@ -26,7 +26,7 @@ class CallbacksRegistry { if (location.indexOf('(native)') !== -1) { continue } - if (location.indexOf('atom.asar') !== -1) { + if (location.indexOf('electron.asar') !== -1) { continue } ref = /([^\/^\)]*)\)?$/gi.exec(location) From ee9128268eb1a83d457146d214dd4d7cb436604d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 31 Mar 2016 14:07:28 -0700 Subject: [PATCH 3/4] Rename atom.icns to electron.icns --- atom/browser/resources/mac/Info.plist | 2 +- .../resources/mac/{atom.icns => electron.icns} | Bin filenames.gypi | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename atom/browser/resources/mac/{atom.icns => electron.icns} (100%) diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist index f7bd068e8f..e2afa33f7d 100644 --- a/atom/browser/resources/mac/Info.plist +++ b/atom/browser/resources/mac/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleIconFile - atom.icns + electron.icns CFBundleVersion 0.37.3 CFBundleShortVersionString diff --git a/atom/browser/resources/mac/atom.icns b/atom/browser/resources/mac/electron.icns similarity index 100% rename from atom/browser/resources/mac/atom.icns rename to atom/browser/resources/mac/electron.icns diff --git a/filenames.gypi b/filenames.gypi index 97c2c0e6c5..2c39a8dcce 100644 --- a/filenames.gypi +++ b/filenames.gypi @@ -5,7 +5,7 @@ 'atom/app/atom_main.h', ], 'bundle_sources': [ - 'atom/browser/resources/mac/atom.icns', + 'atom/browser/resources/mac/electron.icns', ], 'js_sources': [ 'lib/browser/api/app.js', From 3c96d7b72651d21dccd43c70bdf2bb70d50a2650 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 31 Mar 2016 15:46:41 -0700 Subject: [PATCH 4/4] Rename atom.asar to electron.asar in specs --- spec/asar-spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/asar-spec.js b/spec/asar-spec.js index 45c4c119ca..a0cb7b4aab 100644 --- a/spec/asar-spec.js +++ b/spec/asar-spec.js @@ -17,7 +17,7 @@ describe('asar package', function () { it('does not leak fd', function () { var readCalls = 1 while (readCalls <= 10000) { - fs.readFileSync(path.join(process.resourcesPath, 'atom.asar', 'renderer', 'api', 'ipc.js')) + fs.readFileSync(path.join(process.resourcesPath, 'electron.asar', 'renderer', 'api', 'ipc.js')) readCalls++ } })