diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in index ae88556e6..1a37f4b6b 100644 --- a/CMakeLists.txt.in +++ b/CMakeLists.txt.in @@ -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() diff --git a/tools/distrib/cefclient.gyp b/tools/distrib/cefclient.gyp index 63fd0daac..63de35332 100644 --- a/tools/distrib/cefclient.gyp +++ b/tools/distrib/cefclient.gyp @@ -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', ], }, ], diff --git a/tools/distrib/linux/build.sh b/tools/distrib/linux/build.sh deleted file mode 100755 index 08b4e49d8..000000000 --- a/tools/distrib/linux/build.sh +++ /dev/null @@ -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 diff --git a/tools/make_distrib.py b/tools/make_distrib.py index 160917a1c..000645603 100644 --- a/tools/make_distrib.py +++ b/tools/make_distrib.py @@ -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)