bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move natives_blob.bin and snapshot_blob.bin files to the build configuration directory in the binary distribution (issue #1554). 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@2071 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2015-03-10 17:46:53 +00:00
parent c252bf29dd
commit 5d4942fdf3
3 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt.in
View File

@ -280,7 +280,8 @@ if(OS_LINUX)
chrome-sandbox
libffmpegsumo.so
libcef.so
libpdf.so
natives_blob.bin
snapshot_blob.bin
)
# List of CEF resource files.
@ -291,8 +292,6 @@ if(OS_LINUX)
devtools_resources.pak
icudtl.dat
locales
natives_blob.bin
snapshot_blob.bin
)
endif()
@ -442,7 +441,8 @@ if(OS_WINDOWS)
libcef.dll
libEGL.dll
libGLESv2.dll
pdf.dll
natives_blob.bin
snapshot_blob.bin
)
if(PROJECT_ARCH STREQUAL "x86")
# Only used on 32-bit platforms.

49
tools/distrib/cefclient.gyp
View File

@ -43,7 +43,6 @@
'sources': [
'<@(includes_common)',
'<@(includes_wrapper)',
'<@(cefclient_sources_common)',
],
'mac_bundle_resources': [
'<@(cefclient_bundle_resources_mac)',
@ -52,17 +51,17 @@
# TODO(mark): Come up with a fancier way to do this (mac_info_plist?)
# that automatically sets the correct INFOPLIST_FILE setting and adds
# the file to a source group.
'cefclient/mac/Info.plist',
'cefclient/resources/mac/Info.plist',
],
'xcode_settings': {
'INFOPLIST_FILE': 'cefclient/mac/Info.plist',
'INFOPLIST_FILE': 'cefclient/resources/mac/Info.plist',
# Target build path.
'SYMROOT': 'xcodebuild',
},
'conditions': [
['OS=="win"', {
'variables': {
'win_exe_compatibility_manifest': 'cefclient/compatibility.manifest',
'win_exe_compatibility_manifest': 'cefclient/resources/win/compatibility.manifest',
},
'actions': [
{
@ -104,6 +103,19 @@
'$(OutDir)',
],
},
{
'action_name': 'copy_bin_files',
'msvs_cygwin_shell': 0,
'inputs': [],
'outputs': [
'<(PRODUCT_DIR)/copy_bin_files.stamp',
],
'action': [
'xcopy /efy',
'$(ConfigurationName)\*.bin',
'$(OutDir)',
],
},
],
'msvs_settings': {
'VCLinkerTool': {
@ -112,7 +124,7 @@
},
'VCManifestTool': {
'AdditionalManifestFiles': [
'cefclient/cefclient.exe.manifest',
'cefclient/resources/win/cefclient.exe.manifest',
],
},
},
@ -235,12 +247,11 @@
'Resources/devtools_resources.pak',
'Resources/icudtl.dat',
'Resources/locales/',
'Resources/natives_blob.bin',
'Resources/snapshot_blob.bin',
'$(BUILDTYPE)/chrome-sandbox',
'$(BUILDTYPE)/libcef.so',
'$(BUILDTYPE)/libffmpegsumo.so',
'$(BUILDTYPE)/libpdf.so',
'$(BUILDTYPE)/natives_blob.bin',
'$(BUILDTYPE)/snapshot_blob.bin',
],
},
],
@ -344,6 +355,19 @@
'$(OutDir)',
],
},
{
'action_name': 'copy_bin_files',
'msvs_cygwin_shell': 0,
'inputs': [],
'outputs': [
'<(PRODUCT_DIR)/copy_bin_files.stamp',
],
'action': [
'xcopy /efy',
'$(ConfigurationName)\*.bin',
'$(OutDir)',
],
},
],
'msvs_settings': {
'VCLinkerTool': {
@ -466,12 +490,11 @@
'Resources/devtools_resources.pak',
'Resources/icudtl.dat',
'Resources/locales/',
'Resources/natives_blob.bin',
'Resources/snapshot_blob.bin',
'$(BUILDTYPE)/chrome-sandbox',
'$(BUILDTYPE)/libcef.so',
'$(BUILDTYPE)/libffmpegsumo.so',
'$(BUILDTYPE)/libpdf.so',
'$(BUILDTYPE)/natives_blob.bin',
'$(BUILDTYPE)/snapshot_blob.bin',
],
},
],
@ -568,7 +591,7 @@
# be necessary to list helper-Info.plist once, not the three times it
# is listed here.
'mac_bundle_resources!': [
'cefclient/mac/helper-Info.plist',
'cefclient/resources/mac/helper-Info.plist',
],
# TODO(mark): For now, don't put any resources into this app. Its
# resources directory will be a symbolic link to the browser app's
@ -577,7 +600,7 @@
['exclude', '.*'],
],
'xcode_settings': {
'INFOPLIST_FILE': 'cefclient/mac/helper-Info.plist',
'INFOPLIST_FILE': 'cefclient/resources/mac/helper-Info.plist',
},
'postbuilds': [
{

10
tools/make_distrib.py
View File

@ -427,6 +427,8 @@ if platform == 'windows':
'libcef.dll',
'libEGL.dll',
'libGLESv2.dll',
'natives_blob.bin',
'snapshot_blob.bin',
]
if not options.x64build:
binaries.append('wow_helper.exe')
@ -507,8 +509,6 @@ if platform == 'windows':
copy_file(os.path.join(build_dir, 'cef_200_percent.pak'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'devtools_resources.pak'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'icudtl.dat'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'natives_blob.bin'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'snapshot_blob.bin'), dst_dir, options.quiet)
copy_dir(os.path.join(build_dir, 'locales'), os.path.join(dst_dir, 'locales'), options.quiet)
if mode == 'standard':
@ -628,6 +628,8 @@ elif platform == 'linux':
copy_file(os.path.join(build_dir, 'chrome_sandbox'), os.path.join(dst_dir, 'chrome-sandbox'), options.quiet)
copy_file(os.path.join(build_dir, lib_dir_name, 'libcef.so'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'libffmpegsumo.so'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'natives_blob.bin'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'snapshot_blob.bin'), dst_dir, options.quiet)
else:
sys.stderr.write("No Debug build files.\n")
@ -647,6 +649,8 @@ elif platform == 'linux':
copy_file(os.path.join(build_dir, lib_dir_name, 'libcef.so'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'chrome_sandbox'), os.path.join(dst_dir, 'chrome-sandbox'), options.quiet)
copy_file(os.path.join(build_dir, 'libffmpegsumo.so'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'natives_blob.bin'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'snapshot_blob.bin'), dst_dir, options.quiet)
else:
sys.stderr.write("No Release build files.\n")
@ -664,8 +668,6 @@ elif platform == 'linux':
copy_file(os.path.join(build_dir, 'cef_200_percent.pak'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'devtools_resources.pak'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'icudtl.dat'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'natives_blob.bin'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'snapshot_blob.bin'), dst_dir, options.quiet)
copy_dir(os.path.join(build_dir, 'locales'), os.path.join(dst_dir, 'locales'), options.quiet)
if mode == 'standard':