mozilla-unified changes
This commit is contained in:
parent
a6e86400a5
commit
8307ff568c
1 changed files with 54 additions and 7 deletions
61
build.sh
61
build.sh
|
|
@ -101,14 +101,25 @@ do_patches() {
|
|||
|
||||
echo 'Applying patches...'
|
||||
|
||||
patch -p1 -i ../linux/mozilla-vpn-ad.patch
|
||||
if [ $? -ne 0 ]; then exit 1; fi
|
||||
|
||||
if [ "$srcdir" == "mozilla-unified" ]; then
|
||||
echo "(todo)"
|
||||
#! patch -p1 -i ../linux/context-menu.patch
|
||||
#! if [ $? -ne 0 ]; then exit 1; fi
|
||||
#! patch -p1 -i ../linux/megabar.patch
|
||||
#! if [ $? -ne 0 ]; then exit 1; fi
|
||||
patch -p1 -i ../linux/mozilla-vpn-ad.patch
|
||||
if [ $? -ne 0 ]; then exit 1; fi
|
||||
#! patch -p1 -i ../linux/remove_addons.patch
|
||||
#! if [ $? -ne 0 ]; then exit 1; fi
|
||||
else
|
||||
patch -p1 -i ../linux/context-menu.patch
|
||||
if [ $? -ne 0 ]; then exit 1; fi
|
||||
patch -p1 -i ../linux/megabar.patch
|
||||
if [ $? -ne 0 ]; then exit 1; fi
|
||||
patch -p1 -i ../linux/remove_addons.patch
|
||||
if [ $? -ne 0 ]; then exit 1; fi
|
||||
fi
|
||||
|
||||
echo 'GNU sed patches...'
|
||||
|
||||
|
|
@ -341,13 +352,35 @@ policies_diff() {
|
|||
popd > /dev/null
|
||||
}
|
||||
|
||||
#
|
||||
# Nightly builds
|
||||
#
|
||||
|
||||
init_mozilla_unified() {
|
||||
wget https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py
|
||||
python3 bootstrap.py --vcs=git
|
||||
rm -f bootstrap.py
|
||||
wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py
|
||||
python3 bootstrap.py
|
||||
}
|
||||
set_mozilla_unified() {
|
||||
srcdir=mozilla-unified
|
||||
}
|
||||
reset_mozilla_unified() {
|
||||
echo "reset_mozilla_unified: begin."
|
||||
if [ ! -d mozilla-unified ]; then
|
||||
echo "Error: mozilla-unified folder not found. use init_mozilla_unified() to create one"
|
||||
exit 1;
|
||||
fi
|
||||
cd mozilla-unified
|
||||
|
||||
echo "Resetting mozilla-unified..."
|
||||
hg up -C
|
||||
hg purge
|
||||
echo "Mercurial pull..."
|
||||
hg pull -u
|
||||
|
||||
cd ..
|
||||
echo "reset_mozilla_unified: done."
|
||||
}
|
||||
|
||||
#
|
||||
# process commandline arguments and do something
|
||||
|
|
@ -405,6 +438,16 @@ if [[ "$*" == *set_mozilla_unified* ]]; then
|
|||
set_mozilla_unified
|
||||
done_something=1
|
||||
fi
|
||||
if [[ "$*" == *reset_mozilla_unified* ]]; then
|
||||
reset_mozilla_unified
|
||||
done_something=1
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if [[ "$*" == *clean* ]]; then
|
||||
clean
|
||||
|
|
@ -419,6 +462,9 @@ if [[ "$*" == *all* ]]; then
|
|||
artifacts_win
|
||||
done_something=1
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if [[ "$*" == *git_subs* ]]; then
|
||||
git_subs
|
||||
done_something=1
|
||||
|
|
@ -573,9 +619,10 @@ Use: ./build.sh clean | all | [other stuff...]
|
|||
|
||||
# Nightly:
|
||||
|
||||
init_mozilla_central - use bootstrap.py to grab the latest mozilla-source
|
||||
set_mozilla_central - use mozilla-source instead of $srcdir source
|
||||
|
||||
init_mozilla_unified - use bootstrap.py to grab the latest mozilla-unified.
|
||||
set_mozilla_unified - use mozilla-unified instead of $srcdir source.
|
||||
reset_mozilla_unified - clean mozilla-unified and pull latest git changes.
|
||||
|
||||
Documentation is in the build-howto.md. In a docker situation, we'd like
|
||||
to run something like:
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue