minor changes
This commit is contained in:
parent
4bb268a031
commit
4cf3e8791b
2 changed files with 16 additions and 13 deletions
2
Makefile
2
Makefile
|
|
@ -1,6 +1,6 @@
|
||||||
.phony: all clean veryclean fetch extract lw_do_patches build lw_post_build package lw_artifacts
|
.phony: all clean veryclean fetch extract lw_do_patches build lw_post_build package lw_artifacts
|
||||||
|
|
||||||
BUILD=python3 ./build.py ${OPTS}
|
BUILD=python3 build.py ${OPTS}
|
||||||
|
|
||||||
all :
|
all :
|
||||||
$(BUILD) all
|
$(BUILD) all
|
||||||
|
|
|
||||||
27
build.py
27
build.py
|
|
@ -183,19 +183,22 @@ def execute_fetch():
|
||||||
exec("rm -f firefox-{}.source.tar.xz".format(pkgver))
|
exec("rm -f firefox-{}.source.tar.xz".format(pkgver))
|
||||||
exec("wget -q https://archive.mozilla.org/pub/firefox/releases/{}/source/firefox-{}.source.tar.xz".format(pkgver, pkgver))
|
exec("wget -q https://archive.mozilla.org/pub/firefox/releases/{}/source/firefox-{}.source.tar.xz".format(pkgver, pkgver))
|
||||||
elif options.src == 'nightly':
|
elif options.src == 'nightly':
|
||||||
|
if not os.path.isdir('mozilla-unified'):
|
||||||
exec("rm -f bootstrap.py")
|
exec("rm -f bootstrap.py")
|
||||||
exec("rm -rf mozilla-unified")
|
exec("rm -rf mozilla-unified")
|
||||||
exec("wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py")
|
exec("wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py")
|
||||||
exec("python3 bootstrap.py --no-interactive --application-choice=browser")
|
exec("python3 bootstrap.py --no-interactive --application-choice=browser")
|
||||||
elif options.src == 'tor-browser':
|
elif options.src == 'tor-browser':
|
||||||
|
if not os.path.isdir('tor-browser'):
|
||||||
exec("rm -rf tor-browser")
|
exec("rm -rf tor-browser")
|
||||||
exec("git clone --no-checkout --recursive https://git.torproject.org/tor-browser.git")
|
exec("git clone --no-checkout --recursive https://git.torproject.org/tor-browser.git")
|
||||||
enter_srcdir()
|
|
||||||
exec("git checkout tor-browser-89.0-10.5-1-build1")
|
|
||||||
exec("git submodule update --recursive")
|
|
||||||
patch("../patches/tb-mozconfig-win10.patch")
|
patch("../patches/tb-mozconfig-win10.patch")
|
||||||
leave_srcdir()
|
enter_srcdir()
|
||||||
|
exec("git checkout tor-browser-89.0-10.5-1-build1")
|
||||||
|
exec("git submodule update --recursive")
|
||||||
|
leave_srcdir()
|
||||||
elif options.src == 'gecko-dev':
|
elif options.src == 'gecko-dev':
|
||||||
|
if not os.path.isdir('gecko-dev'):
|
||||||
exec("rm -rf gecko-dev")
|
exec("rm -rf gecko-dev")
|
||||||
exec("git clone --depth=1 https://github.com/mozilla/gecko-dev.git")
|
exec("git clone --depth=1 https://github.com/mozilla/gecko-dev.git")
|
||||||
|
|
||||||
|
|
@ -356,7 +359,7 @@ def execute_lw_do_patches():
|
||||||
|
|
||||||
exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/tabbrowser/indicator-tab-attention.svg')
|
exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/tabbrowser/indicator-tab-attention.svg')
|
||||||
exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/tabbrowser/tab-audio-blocked.svg')
|
exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/tabbrowser/tab-audio-blocked.svg')
|
||||||
exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/tabbrowser/tab-overflow-indicator.svg')
|
exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/tabbrowser/tab-overflow-indicator.png')
|
||||||
|
|
||||||
exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/update-circle-fill-12.svg')
|
exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/update-circle-fill-12.svg')
|
||||||
exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/incontent-icons/welcome-back.svg')
|
exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/incontent-icons/welcome-back.svg')
|
||||||
|
|
@ -539,15 +542,15 @@ def execute_all():
|
||||||
execute_lw_artifacts()
|
execute_lw_artifacts()
|
||||||
|
|
||||||
def execute_clean():
|
def execute_clean():
|
||||||
exec("rm -rf firefox-{} mozilla-unified tor-browser gecko-dev".format(pkgver))
|
exec("rm -rf firefox-{}".format(pkgver))
|
||||||
exec("rm -rf librewolf firefox-{}.source.tar.xz bootstrap.py tmp.nsi tmp.exe".format(pkgver))
|
exec("rm -rf librewolf bootstrap.py tmp.nsi tmp.exe sha256sums.txt upload.txt")
|
||||||
|
|
||||||
def execute_veryclean():
|
|
||||||
execute_clean()
|
|
||||||
exec("rm -f sha256sums.txt upload.txt")
|
|
||||||
for filename in glob.glob("librewolf-*"):
|
for filename in glob.glob("librewolf-*"):
|
||||||
os.remove(filename)
|
os.remove(filename)
|
||||||
|
|
||||||
|
def execute_veryclean():
|
||||||
|
exec("rm -rf firefox-{}.source.tar.xz mozilla-unified tor-browser gecko-dev".format(pkgver))
|
||||||
|
execute_clean()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue