librewolf-bot/windows
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

this builds for v110.0-1

Browse source
This commit is contained in:
Bert van der Weerd 2023-02-17 13:46:39 +01:00
parent 1838a4cb18
commit 59547ac198
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
linux/Makefile
View file

@ -1,4 +1,4 @@
.PHONY : help fetch all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean docker-build docker-run docker-clean docker-prune docker-shell buildsymbols upstream-update setup-arch bootstrap-arch bootstrap-arch-do-bootstrap old-style-bootstrap-arch old-style-bootstrap-arch-do-bootstrap build-arch build-arch-do-build extract-arch clean-arch buildsymbols-arch build-symbols-arch-do-buildsymbols package-arch package-arch-do-package patch-folder-arch winsdk-arch .PHONY : help fetch all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean docker-build docker-run docker-clean docker-prune docker-shell buildsymbols upstream-update setup-arch bootstrap-arch bootstrap-arch-do-bootstrap old-style-bootstrap-arch old-style-bootstrap-arch-do-bootstrap build-arch build-arch-do-build extract-arch clean-arch buildsymbols-arch build-symbols-arch-do-buildsymbols package-arch package-arch-do-package patch-folder-arch winsdk-arch grab-build-artifact-arch artifacts-arch
version:=$(shell cat version) version:=$(shell cat version)
release:=$(shell cat release) release:=$(shell cat release)
@ -44,8 +44,15 @@ help :
@echo " build-arch - Build it." @echo " build-arch - Build it."
@echo " buildsymbols-arch - Build symbols." @echo " buildsymbols-arch - Build symbols."
@echo " package-arch - Package the target zip file." @echo " package-arch - Package the target zip file."
@echo " grab-build-artifact-arch - Grab the packaged zip file into this folder"
@echo " artifacts-arch - build the target setup.exe and portable.zip"
all :
@echo "[debug] Please don't run old-style 'all' when debugging."
${MAKE} build buildsymbols package artifacts
@echo "[debug] Please don't run old-style 'all' when debugging."
all : build buildsymbols package artifacts
# #
# Redo from scratch. --- # Redo from scratch. ---
@ -119,8 +126,6 @@ old-style-bootstrap-arch-do-bootstrap :
$$t/mach artifact toolchain --from-build sysroot-x86_64-linux-gnu && \ $$t/mach artifact toolchain --from-build sysroot-x86_64-linux-gnu && \
true ) true )
build-arch : build-arch :
[ -f "version" ] && [ -f "source_release" ] && [ -d "librewolf-$(full_version)" ] [ -f "version" ] && [ -f "source_release" ] && [ -d "librewolf-$(full_version)" ]
${MAKE} -C librewolf-$(full_version) -f ../Makefile build-arch-do-build ${MAKE} -C librewolf-$(full_version) -f ../Makefile build-arch-do-build
@ -128,15 +133,20 @@ build-arch-do-build :
./mach build ./mach build
buildsymbols-arch : buildsymbols-arch :
[ -f "version" ] && [ -f "source_release" ] && [ -d "librewolf-$(full_version)" ] [ -f "version" ] && [ -f "source_release" ] && [ -d "librewolf-$(full_version)" ]
${MAKE} -C librewolf-$(full_version) -f ../Makefile build-arch-do-build ${MAKE} -C librewolf-$(full_version) -f ../Makefile buildsymbols-arch-do-buildsymbols
buildsymbols-arch-do-buildsymbols : buildsymbols-arch-do-buildsymbols :
./mach buildsymbols ./mach buildsymbols
package-arch : package-arch :
[ -f "version" ] && [ -f "source_release" ] && [ -d "librewolf-$(full_version)" ] [ -f "version" ] && [ -f "source_release" ] && [ -d "librewolf-$(full_version)" ]
${MAKE} -C librewolf-$(full_version) -f ../Makefile build-arch-do-build ${MAKE} -C librewolf-$(full_version) -f ../Makefile package-arch-do-package
package-arch-do-package : package-arch-do-package :
@(echo 'Packaging... (output hidden)' && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null) @(echo 'Packaging... (output hidden)' && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null)
grab-build-artifact-arch :
cp -v librewolf-$(full_version)/obj-x86_64-pc-mingw32/dist/firefox-$(version)-$(source_release).en-US.win64.zip .
artifacts-arch :
${MAKE} grab-build-artifact-arch
${MAKE} -f assets/artifacts.mk artifacts
# #
# End redo --- # End redo ---
# #

8
linux/assets/mozconfig
View file

@ -1,22 +1,26 @@
# mozconfig - crosscompile from Linux to Windows # mozconfig - crosscompile from Linux to Windows
export MOZBUILD=$HOME/.mozbuild export MOZBUILD=$HOME/.mozbuild
export WINDOWSSDKDIR="$MOZBUILD/win-cross/vs/windows kits/10"
ac_add_options --target=x86_64-pc-mingw32 ac_add_options --target=x86_64-pc-mingw32
# since v110.0 - liblowercase not needed anymore? # since v110.0 - liblowercase not needed anymore?
#mk_add_options "export LD_PRELOAD=$MOZBUILD/liblowercase/liblowercase.so" #mk_add_options "export LD_PRELOAD=$MOZBUILD/liblowercase/liblowercase.so"
#mk_add_options "export LOWERCASE_DIRS=$MOZBUILD/win-cross" #mk_add_options "export LOWERCASE_DIRS=$MOZBUILD/win-cross"
# since v110.0 - extra variable?
export WINSYSROOT="$MOZBUILD/win-cross/vs"
# since v110.0 - no longer needed?
#export WINDOWSSDKDIR="$MOZBUILD/win-cross/vs/windows kits/10"
EXTRA_PATH="$MOZBUILD/win-cross/vs/vc/tools/msvc/14.29.30133/bin/hostx64/x64:" EXTRA_PATH="$MOZBUILD/win-cross/vs/vc/tools/msvc/14.29.30133/bin/hostx64/x64:"
mk_add_options "export PATH=$EXTRA_PATH$PATH" mk_add_options "export PATH=$EXTRA_PATH$PATH"
export CC="$MOZBUILD/clang/bin/clang-cl" export CC="$MOZBUILD/clang/bin/clang-cl"
export CXX="$MOZBUILD/clang/bin/clang-cl" export CXX="$MOZBUILD/clang/bin/clang-cl"
export HOST_CC="$MOZBUILD/clang/bin/clang" export HOST_CC="$MOZBUILD/clang/bin/clang"
export HOST_CXX="$MOZBUILD/clang/bin/clang++" export HOST_CXX="$MOZBUILD/clang/bin/clang++"
export WINE="$MOZBUILD/wine/bin/wine64" export WINE="$MOZBUILD/wine/bin/wine64"
export MIDL="$MOZBUILD/wine/bin/widl" export MIDL="$MOZBUILD/wine/bin/widl"
#export MIDL=midl #export MIDL=midl