From f26a6e8cd680b8f86d89da6c726a9277a4ec5b67 Mon Sep 17 00:00:00 2001 From: Rmys Date: Mon, 12 Jul 2021 23:30:21 +0300 Subject: [PATCH] firefox-90.0 --- network/web/firefox/actions.py | 51 +++++++---------------------- network/web/firefox/files/configure | 2 +- network/web/firefox/pspec.xml | 6 ++-- 3 files changed, 15 insertions(+), 44 deletions(-) diff --git a/network/web/firefox/actions.py b/network/web/firefox/actions.py index e8fe9ee7fa..d4fe208965 100644 --- a/network/web/firefox/actions.py +++ b/network/web/firefox/actions.py @@ -4,41 +4,33 @@ # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/licenses/gpl.txt -import subprocess - from pisi.actionsapi import get from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools #WorkDir = "mozilla-release-6b51784853e47e091d213d421a19cb623af718f0" -ObjDir = "objdir" +ObjDir = "build" locales = "az bs ca da de el en-US en-GB es-AR es-CL es-ES fi fr hr hu it lt nl pl pt-BR pt-PT ro ru sr sv-SE tr uk".split() xpidir = "%s/xpi" % get.workDIR() arch = get.ARCH() ver = ".".join(get.srcVERSION().split(".")[:3]) -jobs = jobs = "-j"+ subprocess.check_output("nproc 2>/dev/null", shell=True).rstrip("\n") - shelltools.export("SHELL", "/bin/sh") shelltools.export("MACH_USE_SYSTEM_PYTHON", "1") def setup(): - - shelltools.system("echo 'Instrumenting Firefox for PGO'") - shelltools.system("cp mozconfig-inst .mozconfig") - # Google API key shelltools.echo("google_api_key", "AIzaSyBINKL31ZYd8W5byPuwTXYK6cEyoceGh6Y") pisitools.dosed(".mozconfig", "%%PWD%%", get.curDIR()) pisitools.dosed(".mozconfig", "%%FILE%%", "google_api_key") - pisitools.dosed(".mozconfig", "##JOBCOUNT##", jobs) + pisitools.dosed(".mozconfig", "##JOBCOUNT##", get.makeJOBS()) # LOCALE shelltools.system("rm -rf langpack-ff/*/browser/defaults") if not shelltools.isDirectory(xpidir): shelltools.makedirs(xpidir) for locale in locales: - shelltools.system("wget -c -P %s https://download-origin.cdn.mozilla.net/pub/firefox/releases/%s/linux-%s/xpi/%s.xpi" % (xpidir, ver, arch, locale)) + shelltools.system("wget -c -P %s http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%s/linux-%s/xpi/%s.xpi" % (xpidir, ver, arch, locale)) #shelltools.makedirs("langpack-ff/langpack-%s@firefox.mozilla.org" % locale) shelltools.makedirs("langpack-ff") #shelltools.system("unzip -uo %s/%s.xpi -d langpack-ff/langpack-%s@firefox.mozilla.org" % (xpidir, locale, locale)) @@ -47,42 +39,21 @@ def setup(): #shelltools.copy("browserconfig.properties", "langpack-ff/langpack-%s@firefox.mozilla.org/browser/chrome/%s/locale/branding/" % (locale, locale)) shelltools.copy("browserconfig.properties", "browser/branding/official/locales/") - #shelltools.makedirs(ObjDir) - #shelltools.cd(ObjDir) + shelltools.makedirs(ObjDir) + shelltools.cd(ObjDir) - #shelltools.system("../configure --prefix=/usr --libdir=/usr/lib --disable-strip --disable-install-strip") + shelltools.system("../configure --prefix=/usr --libdir=/usr/lib --disable-strip --disable-install-strip") def build(): - shelltools.system("echo 'Building instrumented browser'") - #shelltools.cd(ObjDir) - shelltools.system("./mach build") - - shelltools.system("echo 'Profiling instrumented browser...'") - shelltools.system("./mach package") - shelltools.system("LLVM_PROFDATA=llvm-profdata \ - JARLOG_FILE='%s/jarlog' \ - xvfb-run -s '-screen 0 1920x1080x24 -nolisten local' \ - ./mach python build/pgo/profileserver.py" %get.curDIR()) - - shelltools.system("echo 'Removing instrumented browser...'") - shelltools.system("./mach clobber") - - shelltools.system("echo 'Building optimized browser...'") - shelltools.system("rm .mozconfig") - shelltools.system("cp mozconfig-opt .mozconfig") - #shelltools.echo("google_api_key", "AIzaSyBINKL31ZYd8W5byPuwTXYK6cEyoceGh6Y") - pisitools.dosed(".mozconfig", "%%PWD%%", get.curDIR()) - pisitools.dosed(".mozconfig", "%%FILE%%", "google_api_key") - pisitools.dosed(".mozconfig", "##JOBCOUNT##", jobs) - #shelltools.system("../configure --prefix=/usr --libdir=/usr/lib --disable-strip --disable-install-strip") - shelltools.system("./mach build") + shelltools.cd(ObjDir) + shelltools.system("../mach build -j5") def install(): - #shelltools.cd(ObjDir) - shelltools.system("DESTDIR=%s ./mach install " % get.installDIR()) + shelltools.cd(ObjDir) + shelltools.system("DESTDIR=%s ../mach install " % get.installDIR()) - #shelltools.cd("..") + shelltools.cd("..") # Install language packs pisitools.insinto("/usr/lib/firefox/browser/extensions", "./langpack-ff/*") diff --git a/network/web/firefox/files/configure b/network/web/firefox/files/configure index 5b023ef9e6..7b238bd979 100755 --- a/network/web/firefox/files/configure +++ b/network/web/firefox/files/configure @@ -22,4 +22,4 @@ SRCDIR=$(dirname $0) TOPSRCDIR="$SRCDIR" export OLD_CONFIGURE="$SRCDIR"/old-configure -which python2.7 > /dev/null && exec python2.7 "$TOPSRCDIR/configure.py" "$@" || exec python "$TOPSRCDIR/configure.py" "$@" +which python3 > /dev/null && exec python3 "$TOPSRCDIR/configure.py" "$@" || exec python "$TOPSRCDIR/configure.py" "$@" diff --git a/network/web/firefox/pspec.xml b/network/web/firefox/pspec.xml index 06adbc6ab4..98aa3f9f2d 100644 --- a/network/web/firefox/pspec.xml +++ b/network/web/firefox/pspec.xml @@ -18,9 +18,9 @@ https://ftp.mozilla.org/pub/firefox/releases/90.0/source/firefox-90.0.source.tar.xz - - mozconfig-inst - mozconfig-opt + mozconfig + + configure pisilinux/browserconfig.properties