Skip to content

Commit 3abaced

Browse files
JoelEinbinderaslushnikov
JoelEinbinder
authored and
aslushnikov
committed
chore(webkit): build wpe and gtk to different folders (#616)
Second try at #556. Uses absolute paths for the environment variables so that WPEDependencies builds properly. Switches from `WebKitBuildWPE` to `WebKitBuild/WPE` to avoid the need to change the .gitignore. My computer takes a long time to build, but it appears to be working.
1 parent f463d06 commit 3abaced

File tree

5 files changed

+39
-31
lines changed

5 files changed

+39
-31
lines changed

‎browser_patches/webkit/archive.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,24 @@ createZipForLinux() {
5757

5858
if [[ -n $USE_WPE ]]; then
5959
# copy all relevant binaries
60-
cp -t $tmpdir ./WebKitBuild/Release/bin/MiniBrowser ./WebKitBuild/Release/bin/WPE*Process
60+
cp -t $tmpdir ./WebKitBuild/WPE/Release/bin/MiniBrowser ./WebKitBuild/WPE/Release/bin/WPE*Process
6161
# copy all relevant shared objects
62-
LD_LIBRARY_PATH="$PWD/WebKitBuild/DependenciesWPE/Root/lib" ldd WebKitBuild/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/[^ ]*' | xargs cp -t $tmpdir
63-
LD_LIBRARY_PATH="$PWD/WebKitBuild/DependenciesWPE/Root/lib" ldd WebKitBuild/Release/bin/WPENetworkProcess | grep -o '[^ ]*WebKitBuild/[^ ]*' | xargs cp -t $tmpdir
64-
LD_LIBRARY_PATH="$PWD/WebKitBuild/DependenciesWPE/Root/lib" ldd WebKitBuild/Release/bin/WPEWebProcess | grep -o '[^ ]*WebKitBuild/[^ ]*' | xargs cp -t $tmpdir
62+
LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir
63+
LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPENetworkProcess | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir
64+
LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPEWebProcess | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir
6565
mkdir -p $tmpdir/gio/modules
66-
cp -t $tmpdir/gio/modules $PWD/WebKitBuild/DependenciesWPE/Root/lib/gio/modules/*
66+
cp -t $tmpdir/gio/modules $PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib/gio/modules/*
6767

6868
cd $tmpdir
6969
ln -s libWPEBackend-fdo-1.0.so.1 libWPEBackend-fdo-1.0.so
7070
cd -
7171
else
7272
# copy all relevant binaries
73-
cp -t $tmpdir ./WebKitBuild/Release/bin/MiniBrowser ./WebKitBuild/Release/bin/WebKit*Process
73+
cp -t $tmpdir ./WebKitBuild/GTK/Release/bin/MiniBrowser ./WebKitBuild/GTK/Release/bin/WebKit*Process
7474
# copy all relevant shared objects
75-
LD_LIBRARY_PATH="$PWD/WebKitBuild/DependenciesGTK/Root/lib" ldd WebKitBuild/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/[^ ]*' | xargs cp -t $tmpdir
75+
LD_LIBRARY_PATH="$PWD/WebKitBuild/GTK/DependenciesGTK/Root/lib" ldd WebKitBuild/GTK/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/GTK/[^ ]*' | xargs cp -t $tmpdir
7676
mkdir -p $tmpdir/gio/modules
77-
cp -t $tmpdir/gio/modules $PWD/WebKitBuild/DependenciesGTK/Root/lib/gio/modules/*
77+
cp -t $tmpdir/gio/modules $PWD/WebKitBuild/GTK/DependenciesGTK/Root/lib/gio/modules/*
7878

7979
# we failed to nicely build libgdk_pixbuf - expect it in the env
8080
rm $tmpdir/libgdk_pixbuf*

‎browser_patches/webkit/build.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
set -e
3-
set +x
3+
set -x
44

55
trap "cd $(pwd -P)" EXIT
66
cd "$(dirname $0)"
@@ -11,15 +11,15 @@ if [[ "$(uname)" == "Darwin" ]]; then
1111
elif [[ "$(uname)" == "Linux" ]]; then
1212
cd "checkout"
1313
if [[ "$1" == "--wpe" ]]; then
14-
if ! [[ -d ./WebKitBuild/DependenciesWPE ]]; then
15-
yes | DEBIAN_FRONTEND=noninteractive ./Tools/Scripts/update-webkitwpe-libs
14+
if ! [[ -d ./WebKitBuild/WPE/DependenciesWPE ]]; then
15+
yes | WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/WPE DEBIAN_FRONTEND=noninteractive ./Tools/Scripts/update-webkitwpe-libs
1616
fi
17-
./Tools/Scripts/build-webkit --wpe --release --touch-events MiniBrowser
17+
WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/WPE ./Tools/Scripts/build-webkit --wpe --release --touch-events MiniBrowser
1818
else
19-
if ! [[ -d ./WebKitBuild/DependenciesGTK ]]; then
20-
yes | DEBIAN_FRONTEND=noninteractive ./Tools/Scripts/update-webkitgtk-libs
19+
if ! [[ -d ./WebKitBuild/GTK/DependenciesGTK ]]; then
20+
yes | WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/GTK DEBIAN_FRONTEND=noninteractive ./Tools/Scripts/update-webkitgtk-libs
2121
fi
22-
./Tools/Scripts/build-webkit --gtk --release --touch-events MiniBrowser
22+
WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/GTK ./Tools/Scripts/build-webkit --gtk --release --touch-events MiniBrowser
2323
fi
2424
elif [[ "$(uname)" == MINGW* ]]; then
2525
/c/Windows/System32/cmd.exe "/c buildwin.bat"

‎browser_patches/webkit/clean.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,9 @@ cd "checkout"
99
if [[ -d ./WebKitBuild ]]; then
1010
rm -rf ./WebKitBuild/Release
1111
fi
12+
if [[ -d ./WebKitBuild/GTK ]]; then
13+
rm -rf ./WebKitBuild/GTK/Release
14+
fi
15+
if [[ -d ./WebKitBuild/WPE ]]; then
16+
rm -rf ./WebKitBuild/WPE/Release
17+
fi

‎browser_patches/webkit/pw_run.sh

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,31 @@ function runOSX() {
1818

1919
function runLinux() {
2020
# if script is run as-is
21-
DEPENDENCIES_FOLDER="DependenciesGTK"
21+
DEPENDENCIES_FOLDER="DependenciesGTK";
2222
MINIBROWSER_FOLDER="minibrowser-gtk";
23-
GIO_DIR=""
23+
BUILD_FOLDER="WebKitBuild/GTK";
24+
GIO_DIR="";
2425
if [[ "$*" == *--headless* ]]; then
2526
DEPENDENCIES_FOLDER="DependenciesWPE";
2627
MINIBROWSER_FOLDER="minibrowser-wpe";
28+
BUILD_FOLDER="WebKitBuild/WPE";
2729
fi
2830
if [[ -d $SCRIPT_PATH/$MINIBROWSER_FOLDER ]]; then
2931
LD_PATH="$SCRIPT_PATH/$MINIBROWSER_FOLDER"
3032
GIO_DIR="$SCRIPT_PATH/$MINIBROWSER_FOLDER/gio/modules"
3133
MINIBROWSER="$SCRIPT_PATH/$MINIBROWSER_FOLDER/MiniBrowser"
32-
elif [[ -d $SCRIPT_PATH/checkout/WebKitBuild ]]; then
33-
LD_PATH="$SCRIPT_PATH/checkout/WebKitBuild/$DEPENDENCIES_FOLDER/Root/lib:$SCRIPT_PATH/checkout/WebKitBuild/Release/bin"
34-
GIO_DIR="$SCRIPT_PATH/checkout/WebKitBuild/$DEPENDENCIES_FOLDER/Root/lib/gio/modules"
35-
MINIBROWSER="$SCRIPT_PATH/checkout/WebKitBuild/Release/bin/MiniBrowser"
34+
elif [[ -d $SCRIPT_PATH/checkout/$BUILD_FOLDER ]]; then
35+
LD_PATH="$SCRIPT_PATH/checkout/$BUILD_FOLDER/$DEPENDENCIES_FOLDER/Root/lib:$SCRIPT_PATH/checkout/$BUILD_FOLDER/Release/bin"
36+
GIO_DIR="$SCRIPT_PATH/checkout/$BUILD_FOLDER/$DEPENDENCIES_FOLDER/Root/lib/gio/modules"
37+
MINIBROWSER="$SCRIPT_PATH/checkout/$BUILD_FOLDER/Release/bin/MiniBrowser"
3638
elif [[ -f $SCRIPT_PATH/MiniBrowser ]]; then
3739
LD_PATH="$SCRIPT_PATH"
3840
GIO_DIR="$SCRIPT_PATH/gio/modules"
3941
MINIBROWSER="$SCRIPT_PATH/MiniBrowser"
40-
elif [[ -d $SCRIPT_PATH/WebKitBuild ]]; then
41-
LD_PATH="$SCRIPT_PATH/WebKitBuild/$DEPENDENCIES_FOLDER/Root/lib:$SCRIPT_PATH/WebKitBuild/Release/bin"
42-
GIO_DIR="$SCRIPT_PATH/WebKitBuild/$DEPENDENCIES_FOLDER/Root/lib/gio/modules"
43-
MINIBROWSER="$SCRIPT_PATH/WebKitBuild/Release/bin/MiniBrowser"
42+
elif [[ -d $SCRIPT_PATH/$BUILD_FOLDER ]]; then
43+
LD_PATH="$SCRIPT_PATH/$BUILD_FOLDER/$DEPENDENCIES_FOLDER/Root/lib:$SCRIPT_PATH/$BUILD_FOLDER/Release/bin"
44+
GIO_DIR="$SCRIPT_PATH/$BUILD_FOLDER/$DEPENDENCIES_FOLDER/Root/lib/gio/modules"
45+
MINIBROWSER="$SCRIPT_PATH/$BUILD_FOLDER/Release/bin/MiniBrowser"
4446
else
4547
echo "Cannot find a MiniBrowser.app in neither location" 1>&2
4648
exit 1

‎browser_patches/webkit/pw_run_debug.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ function runOSX() {
1818

1919
function runLinux() {
2020
# if script is run as-is
21-
if [ -d $SCRIPT_PATH/checkout/WebKitBuild ]; then
22-
LD_PATH="$SCRIPT_PATH/checkout/WebKitBuild/DependenciesGTK/Root/lib:$SCRIPT_PATH/checkout/WebKitBuild/Debug/bin"
23-
MINIBROWSER="$SCRIPT_PATH/checkout/WebKitBuild/Debug/bin/MiniBrowser"
21+
if [ -d $SCRIPT_PATH/checkout/WebKitBuild/GTK ]; then
22+
LD_PATH="$SCRIPT_PATH/checkout/WebKitBuild/GTK/DependenciesGTK/Root/lib:$SCRIPT_PATH/checkout/WebKitBuild/GTK/Debug/bin"
23+
MINIBROWSER="$SCRIPT_PATH/checkout/WebKitBuild/GTK/Debug/bin/MiniBrowser"
2424
elif [ -f $SCRIPT_PATH/MiniBrowser ]; then
2525
LD_PATH="$SCRIPT_PATH"
2626
MINIBROWSER="$SCRIPT_PATH/MiniBrowser"
27-
elif [ -d $SCRIPT_PATH/WebKitBuild ]; then
28-
LD_PATH="$SCRIPT_PATH/WebKitBuild/DependenciesGTK/Root/lib:$SCRIPT_PATH/WebKitBuild/Debug/bin"
29-
MINIBROWSER="$SCRIPT_PATH/WebKitBuild/Debug/bin/MiniBrowser"
27+
elif [ -d $SCRIPT_PATH/WebKitBuild/GTK ]; then
28+
LD_PATH="$SCRIPT_PATH/WebKitBuild/GTK/DependenciesGTK/Root/lib:$SCRIPT_PATH/WebKitBuild/GTK/Debug/bin"
29+
MINIBROWSER="$SCRIPT_PATH/WebKitBuild/GTK/Debug/bin/MiniBrowser"
3030
else
3131
echo "Cannot find a MiniBrowser.app in neither location" 1>&2
3232
exit 1

0 commit comments

Comments
 (0)