Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

build(webkit): inlcude libvpx.so.5 into the .zip (#2458)

Browse source
This commit is contained in:
Yury Semikhatsky 2020-06-03 16:35:45 -07:00 committed by GitHub
parent a55687d5f5
commit 8149e1d9dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser_patches/webkit/BUILD_NUMBER
View file

@ -1 +1 @@
1261
1262

16
browser_patches/webkit/archive.sh
View file

@ -51,9 +51,9 @@ createZipForLinux() {
mkdir -p $tmpdir
# copy runner
cp -t $tmpdir ../pw_run.sh
cp -t $tmpdir $SCRIPTS_DIR/pw_run.sh
# copy protocol
node ../concat_protocol.js > $tmpdir/protocol.json
node $SCRIPTS_DIR/concat_protocol.js > $tmpdir/protocol.json
if [[ "$LINUX_FLAVOR" == "--wpe" ]]; then
# copy all relevant binaries
@ -62,6 +62,8 @@ createZipForLinux() {
LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir
LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPENetworkProcess | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir
LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPEWebProcess | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir
# Copy libvpx.so.5 as Ubuntu 20.04 comes with libvpx.so.6
ldd WebKitBuild/WPE/Release/bin/MiniBrowser | grep -o '[^ ]*\/libvpx.so.5[^ ]*' | xargs cp -t $tmpdir
mkdir -p $tmpdir/gio/modules
cp -t $tmpdir/gio/modules $PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib/gio/modules/*
@ -73,6 +75,8 @@ createZipForLinux() {
cp -t $tmpdir ./WebKitBuild/GTK/Release/bin/MiniBrowser ./WebKitBuild/GTK/Release/bin/WebKit*Process
# copy all relevant shared objects
LD_LIBRARY_PATH="$PWD/WebKitBuild/GTK/DependenciesGTK/Root/lib" ldd WebKitBuild/GTK/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/GTK/[^ ]*' | xargs cp -t $tmpdir
# Copy libvpx.so.5 as Ubuntu 20.04 comes with libvpx.so.6
ldd WebKitBuild/GTK/Release/bin/MiniBrowser | grep -o '[^ ]*\/libvpx.so.5[^ ]*' | xargs cp -t $tmpdir
mkdir -p $tmpdir/gio/modules
cp -t $tmpdir/gio/modules $PWD/WebKitBuild/GTK/DependenciesGTK/Root/lib/gio/modules/*
@ -107,7 +111,7 @@ createZipForWindows() {
cd -
# copy protocol
node ../concat_protocol.js > $tmpdir/protocol.json
node $SCRIPTS_DIR/concat_protocol.js > $tmpdir/protocol.json
# tar resulting directory and cleanup TMP.
cd $tmpdir
zip -r $ZIP_PATH ./
@ -134,7 +138,7 @@ createZipForMac() {
ditto {./WebKitBuild/Release,$tmpdir}/WebKitLegacy.framework
ditto {..,$tmpdir}/pw_run.sh
# copy protocol
node ../concat_protocol.js > $tmpdir/protocol.json
node $SCRIPTS_DIR/concat_protocol.js > $tmpdir/protocol.json
# zip resulting directory and cleanup TMP.
ditto -c -k $tmpdir $ZIP_PATH
@ -142,6 +146,8 @@ createZipForMac() {
}
trap "cd $(pwd -P)" EXIT
cd "$(dirname "$0")"
SCRIPTS_DIR="$(dirname "$0")"
cd $SCRIPTS_DIR
main "$@"