Initial GYP changes and utility scripts for Mac and Linux support.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@112 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2010-10-09 16:37:43 +00:00
parent 9a5d1c2d35
commit ea442f1c6b
5 changed files with 91 additions and 46 deletions

119
cef.gyp
View File

@ -53,15 +53,6 @@
'tests/cefclient/uiplugin_test.cpp',
'tests/cefclient/uiplugin_test.h',
],
'link_settings': {
'libraries': [
'-lcomctl32.lib',
'-lshlwapi.lib',
'-lrpcrt4.lib',
'-lopengl32.lib',
'-lglu32.lib',
],
},
'conditions': [
['OS=="win"', {
'msvs_settings': {
@ -71,6 +62,15 @@
'EntryPointSymbol' : 'wWinMainCRTStartup',
},
},
'link_settings': {
'libraries': [
'-lcomctl32.lib',
'-lshlwapi.lib',
'-lrpcrt4.lib',
'-lopengl32.lib',
'-lglu32.lib',
],
},
}],
],
},
@ -105,18 +105,31 @@
'target_name': 'patcher',
'type': 'none',
'msvs_guid': 'A6D0953E-899E-4C60-AB6B-CAE75A44B8E6',
'actions': [
{
'action_name': 'patch_source',
'msvs_cygwin_shell': 0,
'inputs': [
'tools/patch_source.bat',
],
'outputs': [
'tools/patch_source.bat.output',
],
'action': ['', '<@(_inputs)'],
},
'conditions': [
['OS=="win"', {
'actions': [{
'action_name': 'patch_source',
'msvs_cygwin_shell': 0,
'inputs': [
'tools/patch_source.bat',
],
'outputs': [
'tools/patch_source.bat.output',
],
'action': ['', '<@(_inputs)'],
}],
}, { # OS!="win"
'actions': [{
'action_name': 'patch_source',
'inputs': [
'tools/patch_source.sh',
],
'outputs': [
'tools/patch_source.sh.output',
],
'action': ['', '<@(_inputs)'],
}],
}],
],
},
{
@ -127,7 +140,6 @@
'../app/app.gyp:app_base',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../breakpad/breakpad.gyp:breakpad_handler',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../gfx/gfx.gyp:gfx',
'../media/media.gyp:media',
@ -173,8 +185,6 @@
'..',
],
'sources': [
'$(OutDir)/obj/global_intermediate/webkit/webkit_resources.rc',
'$(OutDir)/obj/global_intermediate/webkit/webkit_strings_en-US.rc',
'include/cef.h',
'include/cef_capi.h',
'include/cef_export.h',
@ -185,8 +195,6 @@
'include/cef_string_list.h',
'include/cef_string_map.h',
'include/cef_types.h',
'include/cef_types_win.h',
'include/cef_win.h',
'libcef_dll/cef_logging.h',
'libcef_dll/cpptoc/browser_cpptoc.cc',
'libcef_dll/cpptoc/browser_cpptoc.h',
@ -221,16 +229,29 @@
'libcef_dll/ctocpp/write_handler_ctocpp.cc',
'libcef_dll/ctocpp/write_handler_ctocpp.h',
'libcef_dll/libcef_dll.cc',
'libcef_dll/libcef_dll.rc',
'libcef_dll/resource.h',
'libcef_dll/transfer_util.cpp',
'libcef_dll/transfer_util.h',
],
'link_settings': {
'libraries': [
'-lcomctl32.lib',
],
},
'conditions': [
['OS=="win"', {
'dependencies': [
'../breakpad/breakpad.gyp:breakpad_handler',
],
'sources': [
'$(OutDir)/obj/global_intermediate/webkit/webkit_resources.rc',
'$(OutDir)/obj/global_intermediate/webkit/webkit_strings_en-US.rc',
'include/cef_types_win.h',
'include/cef_win.h',
'libcef_dll/libcef_dll.rc',
],
'link_settings': {
'libraries': [
'-lcomctl32.lib',
],
},
}]
],
},
{
'target_name': 'libcef_dll_wrapper',
@ -302,7 +323,6 @@
'../app/app.gyp:app_base',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../breakpad/breakpad.gyp:breakpad_handler',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../gfx/gfx.gyp:gfx',
'../media/media.gyp:media',
@ -342,16 +362,10 @@
'include/cef_string_list.h',
'include/cef_string_map.h',
'include/cef_types.h',
'include/cef_types_win.h',
'include/cef_win.h',
'libcef/browser_appcache_system.cc',
'libcef/browser_appcache_system.h',
'libcef/browser_database_system.cc',
'libcef/browser_database_system.h',
'libcef/browser_drag_delegate.cc',
'libcef/browser_drag_delegate.h',
'libcef/browser_drop_delegate.cc',
'libcef/browser_drop_delegate.h',
'libcef/browser_file_system.cc',
'libcef/browser_file_system.h',
'libcef/browser_impl.cc',
@ -371,11 +385,9 @@
'libcef/browser_webblobregistry_impl.h',
'libcef/browser_webkit_glue.cc',
'libcef/browser_webkit_glue.h',
'libcef/browser_webkit_glue_win.cc',
'libcef/browser_webkit_init.h',
'libcef/browser_webview_delegate.cc',
'libcef/browser_webview_delegate.h',
'libcef/browser_webview_delegate_win.cc',
'libcef/cef_context.cc',
'libcef/cef_context.h',
'libcef/cef_process.cc',
@ -391,10 +403,6 @@
'libcef/cef_string_map.cc',
'libcef/cef_thread.cc',
'libcef/cef_thread.h',
'libcef/printing/print_settings.cc',
'libcef/printing/print_settings.h',
'libcef/printing/win_printing_context.cc',
'libcef/printing/win_printing_context.h',
'libcef/request_impl.cc',
'libcef/request_impl.h',
'libcef/scheme_impl.cc',
@ -409,6 +417,27 @@
'libcef/webwidget_host.cc',
'libcef/webwidget_host.h',
],
'conditions': [
['OS=="win"', {
'dependencies': [
'../breakpad/breakpad.gyp:breakpad_handler',
],
'sources': [
'include/cef_types_win.h',
'include/cef_win.h',
'libcef/browser_drag_delegate.cc',
'libcef/browser_drag_delegate.h',
'libcef/browser_drop_delegate.cc',
'libcef/browser_drop_delegate.h',
'libcef/browser_webkit_glue_win.cc',
'libcef/browser_webview_delegate_win.cc',
'libcef/printing/print_settings.cc',
'libcef/printing/print_settings.h',
'libcef/printing/win_printing_context.cc',
'libcef/printing/win_printing_context.h',
],
}]
],
},
]
}

View File

@ -5,6 +5,12 @@
{
'variables': {
# Directory for CEF source files.
'cef_directory' : '<!(echo %CEF_DIRECTORY%)',
'conditions': [
[ 'OS=="win"', {
'cef_directory' : '<!(echo %CEF_DIRECTORY%)',
}, { # OS!="win"
'cef_directory' : '<!(echo $CEF_DIRECTORY)',
}],
]
},
}

6
cef_create_projects.sh Executable file
View File

@ -0,0 +1,6 @@
#!/bin/sh
echo Patching build configuration files...
tools/patch_build.sh
echo Generating project files...
export CEF_DIRECTORY=$(basename `pwd`)
../tools/gyp/gyp cef.gyp -I ../build/common.gypi -I ../build/features_override.gypi -I cef.gypi --no-circular-check

2
tools/patch_build.sh Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
python tools/patcher.py --patch-config patch/patch_build.cfg

2
tools/patch_source.sh Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
python tools/patcher.py --patch-config patch/patch_source.cfg