Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

devops: strictly configure build folder for Firefox builds #1454

Merged
merged 1 commit into from
Mar 21, 2020
Merged

devops: strictly configure build folder for Firefox builds #1454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions browser_patches/firefox/archive.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ trap "cd $(pwd -P)" EXIT
cd "$(dirname $0)"
cd checkout

OBJ_FOLDER=$(ls -1 | grep obj-)
if [[ $OBJ_FOLDER == "" ]]; then
echo "ERROR: cannot find obj-* folder in the checkout/. Did you build?"
exit 1;
fi
OBJ_FOLDER="obj-build-playwright"

./mach package
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist/firefox
Expand Down
8 changes: 5 additions & 3 deletions browser_patches/firefox/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,14 @@ else
exit 1;
fi

OBJ_FOLDER="obj-build-playwright"
echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig

./mach build

OBJ_FOLDER=$(ls -1 | grep obj-)
if [[ "$(uname)" == "Darwin" ]]; then
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist
node ../install-preferences.js $PWD/${OBJ_FOLDER}/dist
else
node ../install-preferences.js $PWD/$OBJ_FOLDER/dist/bin
node ../install-preferences.js $PWD/${OBJ_FOLDER}/dist/bin
fi

2 changes: 1 addition & 1 deletion browser_patches/firefox/clean.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ trap "cd $(pwd -P)" EXIT
cd "$(dirname $0)"
cd "checkout"

OBJ_FOLDER=$(ls -1 | grep obj- || true)
OBJ_FOLDER="obj-build-playwright"
if [[ -d $OBJ_FOLDER ]]; then
rm -rf $OBJ_FOLDER
fi
Expand Down