bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-26 17:07:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- Linux: Remove unused build.sh file from the binary distribution.

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/2272@2077 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2015-03-12 17:34:27 +00:00
parent 6abaaa81e7
commit bc845db336
4 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt.in
View File

@ -281,6 +281,8 @@ if(OS_LINUX)
libffmpegsumo.so
libcef.so
libpdf.so
natives_blob.bin
snapshot_blob.bin
)
# List of CEF resource files.
@ -291,8 +293,6 @@ if(OS_LINUX)
devtools_resources.pak
icudtl.dat
locales
natives_blob.bin
snapshot_blob.bin
)
endif()

8
tools/distrib/cefclient.gyp
View File

@ -235,12 +235,12 @@
'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',
],
},
],
@ -466,12 +466,12 @@
'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',
],
},
],

12
tools/distrib/linux/build.sh
View File

@ -1,12 +0,0 @@
#!/bin/bash
if [ -z "$1" ]; then
echo "ERROR: Please specify a build target: Debug or Release"
else
make -j8 cefclient cefsimple BUILDTYPE=$1
if [ $? -eq 0 ]; then
echo "Giving SUID permissions to chrome-sandbox..."
echo "(using sudo so you may be asked for your password)"
sudo -- chown root:root "out/$1/chrome-sandbox" &&
sudo -- chmod 4755 "out/$1/chrome-sandbox"
fi
fi

7
tools/make_distrib.py
View File

@ -623,6 +623,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, 'libffmpegsumo.so'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'libpdf.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")
@ -643,6 +645,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, 'libffmpegsumo.so'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'libpdf.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")
@ -660,8 +664,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':
@ -680,7 +682,6 @@ elif platform == 'linux':
'tests/cefsimple/', cefsimple_dir, options.quiet)
# transfer additional files, if any
copy_file(os.path.join(script_dir, 'distrib/linux/build.sh'), output_dir, options.quiet)
transfer_files(cef_dir, script_dir, os.path.join(script_dir, 'distrib/linux/transfer.cfg'), \
output_dir, options.quiet)