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

Link with component build shared libraries

Browse source
This commit is contained in:
Cheng Zhao 2015-04-02 14:05:43 +08:00
parent 19198a579a
commit 7e41b9e44d
5 changed files with 39 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

18
brightray/brightray.gyp
View file

@ -2,9 +2,6 @@
'includes': [ 'includes': [
'brightray.gypi', 'brightray.gypi',
], ],
'variables': {
'brightray_source_root': '<!(["python", "tools/brightray_source_root.py"])',
},
'targets': [ 'targets': [
{ {
'target_name': 'brightray', 'target_name': 'brightray',
@ -106,8 +103,8 @@
'<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)', '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)',
], ],
'libraries': [ 'libraries': [
'<(brightray_source_root)/<(libchromiumcontent_library_dir)/libchromiumcontent.so', '<@(libchromiumcontent_shared_libraries)',
'<(brightray_source_root)/<(libchromiumcontent_library_dir)/libchromiumviews.a', '<(libchromiumcontent_library_dir)/libchromiumviews.a',
'-lpthread', '-lpthread',
'<!@(pkg-config --libs-only-l gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)', '<!@(pkg-config --libs-only-l gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)',
], ],
@ -116,7 +113,7 @@
['OS=="mac"', { ['OS=="mac"', {
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'<(brightray_source_root)/<(libchromiumcontent_library_dir)/libchromiumcontent.dylib', '<@(libchromiumcontent_shared_libraries)',
'$(SDKROOT)/System/Library/Frameworks/AppKit.framework', '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
], ],
}, },
@ -124,10 +121,11 @@
['OS=="win"', { ['OS=="win"', {
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'<(brightray_source_root)/<(libchromiumcontent_library_dir)/base_static.lib', '<@(libchromiumcontent_shared_libraries)',
'<(brightray_source_root)/<(libchromiumcontent_library_dir)/chromiumcontent.dll.lib', '<(libchromiumcontent_library_dir)/base_static.lib',
'<(brightray_source_root)/<(libchromiumcontent_library_dir)/chromiumviews.lib', '<(libchromiumcontent_library_dir)/chromiumcontent.dll.lib',
'<(brightray_source_root)/<(libchromiumcontent_library_dir)/sandbox_static.lib', '<(libchromiumcontent_library_dir)/chromiumviews.lib',
'<(libchromiumcontent_library_dir)/sandbox_static.lib',
], ],
}, },
}], }],

5
brightray/brightray.gypi
View file

@ -1,10 +1,13 @@
{ {
'includes': [
'vendor/download/libchromiumcontent/filenames.gypi',
],
'variables': { 'variables': {
'libchromiumcontent_dir': 'vendor/download/libchromiumcontent',
'libchromiumcontent_library_dir': '<(libchromiumcontent_dir)/Release', 'libchromiumcontent_library_dir': '<(libchromiumcontent_dir)/Release',
'libchromiumcontent_include_dir': '<(libchromiumcontent_dir)/src', 'libchromiumcontent_include_dir': '<(libchromiumcontent_dir)/src',
'libchromiumcontent_resources_dir': '<(libchromiumcontent_library_dir)', 'libchromiumcontent_resources_dir': '<(libchromiumcontent_library_dir)',
'libchromiumcontent_src_dir': '<(libchromiumcontent_dir)/src', 'libchromiumcontent_src_dir': '<(libchromiumcontent_dir)/src',
'mac_deployment_target%': '10.8', 'mac_deployment_target%': '10.8',
'mac_sdkroot%': 'macosx', 'mac_sdkroot%': 'macosx',

1
brightray/script/bootstrap
View file

@ -29,6 +29,7 @@ def parse_args():
def update_submodules(): def update_submodules():
return
return (subprocess.call(['git', 'submodule', 'sync', '--quiet']) or return (subprocess.call(['git', 'submodule', 'sync', '--quiet']) or
subprocess.call(['git', 'submodule', 'update', '--init', subprocess.call(['git', 'submodule', 'update', '--init',
'--recursive'])) '--recursive']))

9
brightray/tools/brightray_source_root.py
View file

@ -1,9 +0,0 @@
#!/usr/bin/env python
import os
"""Prints the absolute path of the root of brightray's source tree.
"""
print os.path.abspath(os.path.dirname(os.path.dirname(__file__)))

2
brightray/vendor/libchromiumcontent vendored

@ -1 +1 @@
Subproject commit cb8ec5790c07bad7c11e8fb16e767ccef7f50ecb Subproject commit e19d6d778ff3c574906b832102783cb80f5a43c1