Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firefox-90.0

Browse Source
This commit is contained in:
Rmys
2021-07-12 23:30:21 +03:00
committed by GitHub
parent 23465f0733
commit f26a6e8cd6
3 changed files with 15 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/web/firefox/actions.py
+11 -40
View File
@@ -4,41 +4,33 @@
# Licensed under the GNU General Public License, version 3. # Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt # See the file http://www.gnu.org/licenses/gpl.txt
import subprocess
from pisi.actionsapi import get from pisi.actionsapi import get
from pisi.actionsapi import autotools from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools from pisi.actionsapi import shelltools
#WorkDir = "mozilla-release-6b51784853e47e091d213d421a19cb623af718f0" #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() 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() xpidir = "%s/xpi" % get.workDIR()
arch = get.ARCH() arch = get.ARCH()
ver = ".".join(get.srcVERSION().split(".")[:3]) 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("SHELL", "/bin/sh")
shelltools.export("MACH_USE_SYSTEM_PYTHON", "1") shelltools.export("MACH_USE_SYSTEM_PYTHON", "1")
def setup(): def setup():
shelltools.system("echo 'Instrumenting Firefox for PGO'")
shelltools.system("cp mozconfig-inst .mozconfig")
# Google API key # Google API key
shelltools.echo("google_api_key", "AIzaSyBINKL31ZYd8W5byPuwTXYK6cEyoceGh6Y") shelltools.echo("google_api_key", "AIzaSyBINKL31ZYd8W5byPuwTXYK6cEyoceGh6Y")
pisitools.dosed(".mozconfig", "%%PWD%%", get.curDIR()) pisitools.dosed(".mozconfig", "%%PWD%%", get.curDIR())
pisitools.dosed(".mozconfig", "%%FILE%%", "google_api_key") pisitools.dosed(".mozconfig", "%%FILE%%", "google_api_key")
pisitools.dosed(".mozconfig", "##JOBCOUNT##", jobs) pisitools.dosed(".mozconfig", "##JOBCOUNT##", get.makeJOBS())
# LOCALE # LOCALE
shelltools.system("rm -rf langpack-ff/*/browser/defaults") shelltools.system("rm -rf langpack-ff/*/browser/defaults")
if not shelltools.isDirectory(xpidir): shelltools.makedirs(xpidir) if not shelltools.isDirectory(xpidir): shelltools.makedirs(xpidir)
for locale in locales: 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/langpack-%s@firefox.mozilla.org" % locale)
shelltools.makedirs("langpack-ff") shelltools.makedirs("langpack-ff")
#shelltools.system("unzip -uo %s/%s.xpi -d langpack-ff/langpack-%s@firefox.mozilla.org" % (xpidir, locale, locale)) #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", "langpack-ff/langpack-%s@firefox.mozilla.org/browser/chrome/%s/locale/branding/" % (locale, locale))
shelltools.copy("browserconfig.properties", "browser/branding/official/locales/") shelltools.copy("browserconfig.properties", "browser/branding/official/locales/")
#shelltools.makedirs(ObjDir) shelltools.makedirs(ObjDir)
#shelltools.cd(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(): def build():
shelltools.system("echo 'Building instrumented browser'") shelltools.cd(ObjDir)
#shelltools.cd(ObjDir) shelltools.system("../mach build -j5")
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")
def install(): def install():
#shelltools.cd(ObjDir) shelltools.cd(ObjDir)
shelltools.system("DESTDIR=%s ./mach install " % get.installDIR()) shelltools.system("DESTDIR=%s ../mach install " % get.installDIR())
#shelltools.cd("..") shelltools.cd("..")
# Install language packs # Install language packs
pisitools.insinto("/usr/lib/firefox/browser/extensions", "./langpack-ff/*") pisitools.insinto("/usr/lib/firefox/browser/extensions", "./langpack-ff/*")
network/web/firefox/files/configure
Vendored
+1 -1
View File
@@ -22,4 +22,4 @@ SRCDIR=$(dirname $0)
TOPSRCDIR="$SRCDIR" TOPSRCDIR="$SRCDIR"
export OLD_CONFIGURE="$SRCDIR"/old-configure 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" "$@"
network/web/firefox/pspec.xml
+3 -3
View File
@@ -18,9 +18,9 @@
<Archive sha1sum="2c15dd098ac1b9fb22db8fa5047911f144996a30" type="tarxz">https://ftp.mozilla.org/pub/firefox/releases/90.0/source/firefox-90.0.source.tar.xz</Archive> <Archive sha1sum="2c15dd098ac1b9fb22db8fa5047911f144996a30" type="tarxz">https://ftp.mozilla.org/pub/firefox/releases/90.0/source/firefox-90.0.source.tar.xz</Archive>
<AdditionalFiles> <AdditionalFiles>
<!--Our main configure script. Configure paramters are stored here.--> <!--Our main configure script. Configure paramters are stored here.-->
<!-- <AdditionalFile target=".mozconfig" permission="0644">mozconfig</AdditionalFile> --> <AdditionalFile target=".mozconfig" permission="0644">mozconfig</AdditionalFile>
<AdditionalFile target="mozconfig-inst" permission="0644">mozconfig-inst</AdditionalFile> <!-- <AdditionalFile target="mozconfig-inst" permission="0644">mozconfig-inst</AdditionalFile> -->
<AdditionalFile target="mozconfig-opt" permission="0644">mozconfig-opt</AdditionalFile> <!-- <AdditionalFile target="mozconfig-opt" permission="0644">mozconfig-opt</AdditionalFile> -->
<AdditionalFile target="configure" permission="0755">configure</AdditionalFile> <AdditionalFile target="configure" permission="0755">configure</AdditionalFile>
<AdditionalFile target="browserconfig.properties" permission="0644">pisilinux/browserconfig.properties</AdditionalFile> <!--anasayfa ayarlaması--> <AdditionalFile target="browserconfig.properties" permission="0644">pisilinux/browserconfig.properties</AdditionalFile> <!--anasayfa ayarlaması-->
</AdditionalFiles> </AdditionalFiles>