diff options
| author | Andrew Eikum <aeikum@codeweavers.com> | 2018-07-13 19:19:37 +0300 |
|---|---|---|
| committer | Andrew Eikum <aeikum@codeweavers.com> | 2018-07-13 19:40:33 +0300 |
| commit | 8360110d6287a8f7399da80df78c24aad2ccb2a2 (patch) | |
| tree | 02614b26151a1fb23f118b848f54af7c12d1b9ee | |
| parent | f4bc7b91bb1856443f280ea60421a2cf242bbafb (diff) | |
build_proton: Place wine-gecko installers into the right place
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | build_proton.sh | 20 |
2 files changed, 20 insertions, 1 deletions
@@ -1,2 +1,3 @@ dist/ build/ +contrib/ diff --git a/build_proton.sh b/build_proton.sh index 9c054b21..f8eb6216 100755 --- a/build_proton.sh +++ b/build_proton.sh @@ -596,8 +596,23 @@ case "$BUILD_COMPONENTS" in *) echo "Invalid build components: $BUILD_COMPONENTS" ;; esac +function setup_wine_gecko +{ + mkdir -p "$DST_DIR"/share/wine/gecko/ + if [ -e "$TOP/../gecko/wine_gecko-$1-$2.msi" ]; then + cp "$TOP/../gecko/wine_gecko-$1-$2.msi" "$DST_DIR"/share/wine/gecko/ + else + mkdir -p contrib/ + if [ ! -e "contrib/wine_gecko-$1-$2.msi" ]; then + echo ">>>> Downloading wine-gecko. To avoid this in future, put it here: $TOP/../gecko/wine_gecko-$1-$2.msi" + wget -O "contrib/wine_gecko-$1-$2.msi" "https://dl.winehq.org/wine/wine-gecko/$1/wine_gecko-$1-$2.msi" + fi + cp "contrib/wine_gecko-$1-$2.msi" "$DST_DIR"/share/wine/gecko/ + fi +} + if [ "$PACKAGE" = true ]; then - echo "Packaging..." + echo ">>>> Packaging..." cd "$TOP" #create default prefix @@ -613,6 +628,9 @@ if [ "$PACKAGE" = true ]; then cp -a openvr/bin/win32/openvr_api.dll "$TOP"/build/dist/lib/wine/dxvk/openvr_api_dxvk.dll cp -a openvr/bin/win64/openvr_api.dll "$TOP"/build/dist/lib64/wine/dxvk/openvr_api_dxvk.dll + setup_wine_gecko "2.47" "x86" + setup_wine_gecko "2.47" "x86_64" + #the difference between -1 and -9 is about 20 MB, so prioritize quick startup over file size tar -C build/dist -c . | gzip -c -1 > dist/proton_dist.tar.gz |