mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move resources file under resources/

Browse source
This commit is contained in:
Cheng Zhao 2014-01-31 19:34:31 +08:00
parent fe30880ec0
commit a85075103f
10 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
atom.gyp
View file

@ -8,7 +8,7 @@
'app/atom_main.h', 'app/atom_main.h',
], ],
'bundle_sources': [ 'bundle_sources': [
'browser/mac/atom.icns', 'browser/resources/mac/atom.icns',
], ],
'coffee_sources': [ 'coffee_sources': [
'browser/api/lib/app.coffee', 'browser/api/lib/app.coffee',
@ -191,9 +191,9 @@
'conditions': [ 'conditions': [
['OS=="win"', { ['OS=="win"', {
'app_sources': [ 'app_sources': [
'app/win/resource.h', 'browser/resources/win/resource.h',
'app/win/atom.ico', 'browser/resources/win/atom.ico',
'app/win/atom.rc', 'browser/resources/win/atom.rc',
'<(libchromiumcontent_src_dir)/content/app/startup_helper_win.cc', '<(libchromiumcontent_src_dir)/content/app/startup_helper_win.cc',
], ],
}], # OS=="win" }], # OS=="win"
@ -249,7 +249,7 @@
'<(project_name)_helper', '<(project_name)_helper',
], ],
'xcode_settings': { 'xcode_settings': {
'INFOPLIST_FILE': 'browser/mac/Info.plist', 'INFOPLIST_FILE': 'browser/resources/mac/Info.plist',
'LD_RUNPATH_SEARCH_PATHS': [ 'LD_RUNPATH_SEARCH_PATHS': [
'@executable_path/../Frameworks', '@executable_path/../Frameworks',
], ],
@ -499,11 +499,11 @@
}, },
'mac_bundle': 1, 'mac_bundle': 1,
'mac_bundle_resources': [ 'mac_bundle_resources': [
'browser/mac/MainMenu.xib', 'common/resources/mac/MainMenu.xib',
'<(libchromiumcontent_resources_dir)/content_shell.pak', '<(libchromiumcontent_resources_dir)/content_shell.pak',
], ],
'xcode_settings': { 'xcode_settings': {
'INFOPLIST_FILE': 'common/mac/Info.plist', 'INFOPLIST_FILE': 'common/resources/mac/Info.plist',
'LIBRARY_SEARCH_PATHS': [ 'LIBRARY_SEARCH_PATHS': [
'<(libchromiumcontent_library_dir)', '<(libchromiumcontent_library_dir)',
], ],
@ -564,7 +564,7 @@
], ],
'mac_bundle': 1, 'mac_bundle': 1,
'xcode_settings': { 'xcode_settings': {
'INFOPLIST_FILE': 'renderer/mac/Info.plist', 'INFOPLIST_FILE': 'renderer/resources/mac/Info.plist',
'LD_RUNPATH_SEARCH_PATHS': [ 'LD_RUNPATH_SEARCH_PATHS': [
'@executable_path/../../..', '@executable_path/../../..',
], ],

0
browser/mac/Info.plist → browser/resources/mac/Info.plist
View file

0
browser/mac/atom.icns → browser/resources/mac/atom.icns
View file

0
app/win/atom.ico → browser/resources/win/atom.ico
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 345 KiB

After

Width:  |  Height:  |  Size: 345 KiB

0
app/win/atom.rc → browser/resources/win/atom.rc
View file

0
app/win/resource.h → browser/resources/win/resource.h
View file

0
common/mac/Info.plist → common/resources/mac/Info.plist
View file

0
browser/mac/MainMenu.xib → common/resources/mac/MainMenu.xib
View file

0
renderer/mac/Info.plist → renderer/resources/mac/Info.plist
View file

4
script/bump-version.py
View file

@ -71,7 +71,7 @@ def update_win_rc(version, versions):
pattern_fvs = re.compile(' *VALUE "FileVersion", "[0-9.]+"') pattern_fvs = re.compile(' *VALUE "FileVersion", "[0-9.]+"')
pattern_pvs = re.compile(' *VALUE "ProductVersion", "[0-9.]+"') pattern_pvs = re.compile(' *VALUE "ProductVersion", "[0-9.]+"')
win_rc = os.path.join('app', 'win', 'atom.rc') win_rc = os.path.join('browser', 'resources', 'win', 'atom.rc')
with open(win_rc, 'r') as f: with open(win_rc, 'r') as f:
lines = f.readlines() lines = f.readlines()
@ -109,7 +109,7 @@ def update_version_h(versions):
def update_info_plist(version): def update_info_plist(version):
info_plist = os.path.join('browser', 'mac', 'Info.plist') info_plist = os.path.join('browser', 'resources', 'mac', 'Info.plist')
with open(info_plist, 'r') as f: with open(info_plist, 'r') as f:
lines = f.readlines() lines = f.readlines()