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

Rename "frameworks" to "external_binaries".

Browse source
This commit is contained in:
Cheng Zhao 2014-05-18 23:35:07 +08:00
parent 6358fd1a4b
commit 9754050598
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
atom.gyp
View file

@ -235,7 +235,7 @@
}, },
'target_defaults': { 'target_defaults': {
'mac_framework_dirs': [ 'mac_framework_dirs': [
'<(atom_source_root)/frameworks', '<(atom_source_root)/external_binaries',
], ],
'includes': [ 'includes': [
# Rules for excluding e.g. foo_win.cc from the build on non-Windows. # Rules for excluding e.g. foo_win.cc from the build on non-Windows.
@ -288,9 +288,9 @@
'files': [ 'files': [
'<(PRODUCT_DIR)/<(product_name) Helper.app', '<(PRODUCT_DIR)/<(product_name) Helper.app',
'<(PRODUCT_DIR)/<(framework_name).framework', '<(PRODUCT_DIR)/<(framework_name).framework',
'frameworks/Squirrel.framework', 'external_binaries/Squirrel.framework',
'frameworks/ReactiveCocoa.framework', 'external_binaries/ReactiveCocoa.framework',
'frameworks/Mantle.framework', 'external_binaries/Mantle.framework',
], ],
}, },
{ {
@ -330,8 +330,8 @@
'<(libchromiumcontent_library_dir)/libEGL.dll', '<(libchromiumcontent_library_dir)/libEGL.dll',
'<(libchromiumcontent_library_dir)/libGLESv2.dll', '<(libchromiumcontent_library_dir)/libGLESv2.dll',
'<(libchromiumcontent_resources_dir)/content_shell.pak', '<(libchromiumcontent_resources_dir)/content_shell.pak',
'frameworks/d3dcompiler_43.dll', 'external_binaries/d3dcompiler_43.dll',
'frameworks/xinput1_3.dll', 'external_binaries/xinput1_3.dll',
], ],
}, },
{ {
@ -601,9 +601,9 @@
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'$(SDKROOT)/System/Library/Frameworks/Carbon.framework', '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
'frameworks/Squirrel.framework', 'external_binaries/Squirrel.framework',
'frameworks/ReactiveCocoa.framework', 'external_binaries/ReactiveCocoa.framework',
'frameworks/Mantle.framework', 'external_binaries/Mantle.framework',
], ],
}, },
'mac_bundle': 1, 'mac_bundle': 1,

1
script/cibuild
View file

@ -16,6 +16,7 @@ def main():
rm_rf(os.path.join(SOURCE_ROOT, 'out')) rm_rf(os.path.join(SOURCE_ROOT, 'out'))
rm_rf(os.path.join(SOURCE_ROOT, 'node_modules')) rm_rf(os.path.join(SOURCE_ROOT, 'node_modules'))
rm_rf(os.path.join(SOURCE_ROOT, 'frameworks')) rm_rf(os.path.join(SOURCE_ROOT, 'frameworks'))
rm_rf(os.path.join(SOURCE_ROOT, 'external_binaries'))
rm_rf(os.path.join(SOURCE_ROOT, 'vendor', 'apm', 'node_modules')) rm_rf(os.path.join(SOURCE_ROOT, 'vendor', 'apm', 'node_modules'))
rm_rf(os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor', 'download', rm_rf(os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor', 'download',
'libchromiumcontent')) 'libchromiumcontent'))

4
script/update-frameworks.py → script/update-external-binaries.py
View file

@ -15,7 +15,7 @@ FRAMEWORKS_URL = 'https://github.com/atom/atom-shell-frameworks/releases' \
def main(): def main():
os.chdir(SOURCE_ROOT) os.chdir(SOURCE_ROOT)
try: try:
os.makedirs('frameworks') os.makedirs('external_binaries')
except OSError as e: except OSError as e:
if e.errno != errno.EEXIST: if e.errno != errno.EEXIST:
raise raise
@ -33,7 +33,7 @@ def main():
def download_and_unzip(framework): def download_and_unzip(framework):
zip_path = download_framework(framework) zip_path = download_framework(framework)
if zip_path: if zip_path:
extract_zip(zip_path, 'frameworks') extract_zip(zip_path, 'external_binaries')
def download_framework(framework): def download_framework(framework):

6
script/update.py
View file

@ -11,12 +11,12 @@ SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
def main(): def main():
os.chdir(SOURCE_ROOT) os.chdir(SOURCE_ROOT)
update_frameworks() update_external_binaries()
update_gyp() update_gyp()
def update_frameworks(): def update_external_binaries():
uf = os.path.join('script', 'update-frameworks.py') uf = os.path.join('script', 'update-external-binaries.py')
subprocess.check_call([sys.executable, uf]) subprocess.check_call([sys.executable, uf])