add msix target

set midl envvar
fix mozconfig
2023-02-19 23:51:03 +01:00 · 2023-02-17 21:45:49 +01:00 · 2023-02-17 21:41:16 +01:00 · 2023-02-16 21:21:49 +01:00 · 2023-02-16 21:07:50 +01:00 · 2023-02-16 21:06:44 +01:00
3 changed files with 11 additions and 15 deletions
--- a/linux/.gitignore
+++ b/linux/.gitignore
@ -0,0 +1,5 @@
+librewolf-*
+/version
+/source_release
+/work
+*.zip
--- a/linux/Makefile
+++ b/linux/Makefile
@ -61,6 +61,9 @@ package : dir
 	( cd librewolf-$(full_version) && echo 'Packaging... (output hidden)' && \
 	  cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null )

+msix : dir
+	( cd librewolf-$(full_version) && MAKEAPPX=~/.mozbuild/msix-packaging/makemsix ./mach repackage msix --publisher='CN=846D51B2-15A2-4033-86D1-071B877C86A7' --identity-name='31856maltejur.LibreWolf' --publisher-display-name='maltejur' )
+
 dir : librewolf-$(full_version)
 librewolf-$(full_version) : librewolf-$(full_version).source.tar.gz
 	rm -rf $@
@ -77,7 +80,7 @@ $(mozbuild)/vs.tar.zst : # cache this file
 bootstrap : dir winsdk
 	(cd librewolf-$(full_version) && ./mach --no-interactive bootstrap --application-choice=browser)
 # Rust supports aarch64-linux-android, arm-linux-androideabi, i686-linux-android, thumbv7neon-linux-androideabi, x86_64-linux-android, x86_64-pc-windows-msvc, x86_64-unknown-linux-gnu targets.
-	~/.cargo/bin/rustup target add x86_64-pc-windows-msvc
+	rustup target add x86_64-pc-windows-msvc
 	( export t=$$(pwd)/librewolf-$(full_version) && \
 	  cd $(mozbuild) && \
 	  $$t/mach artifact toolchain --from-build linux64-binutils && \
--- a/linux/assets/mozconfig
+++ b/linux/assets/mozconfig
@ -1,22 +1,10 @@
 # mozconfig - crosscompile from Linux to Windows

 export MOZBUILD=$HOME/.mozbuild
-export WINDOWSSDKDIR="$MOZBUILD/win-cross/vs/Windows Kits/10"
 ac_add_options --target=x86_64-pc-mingw32
-mk_add_options "export LOWERCASE_DIRS=$MOZBUILD/win-cross"
-
-EXTRA_PATH="$MOZBUILD/win-cross/vs/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64:"
-mk_add_options "export PATH=$EXTRA_PATH$PATH"
-
-export CC="$MOZBUILD/clang/bin/clang-cl"
-export CXX="$MOZBUILD/clang/bin/clang-cl"
-export HOST_CC="$MOZBUILD/clang/bin/clang"
-export HOST_CXX="$MOZBUILD/clang/bin/clang++"
-
-export WINE="$MOZBUILD/wine/bin/wine64"
+ac_add_options --enable-bootstrap
+export WINSYSROOT="$MOZBUILD/win-cross/vs"
 export MIDL="$MOZBUILD/wine/bin/widl"
-#export MIDL=midl
-#export MIDL=widl

 ###
 # TODO : fixme
Author	SHA1	Message	Date
Malte Jürgens	489576ce6b	add msix target	2023-02-19 23:51:03 +01:00
Malte Jürgens	3e517ed1a7	set midl envvar	2023-02-17 21:45:49 +01:00
Malte Jürgens	85ef0281d7	fix mozconfig	2023-02-17 21:41:16 +01:00
Malte Jürgens	8b9cde7cb6	fix	2023-02-16 21:21:49 +01:00
Malte Jürgens	b559143f67	fix	2023-02-16 21:07:50 +01:00
Malte Jürgens	4f6cd571c8	fix	2023-02-16 21:06:44 +01:00
Malte Jürgens	bd26ebb85e	fix	2023-02-16 21:05:26 +01:00
Malte Jürgens	07f07ecf95	fix	2023-02-16 20:58:52 +01:00
Malte Jürgens	412c57f4c0	fix	2023-02-16 20:57:45 +01:00
Malte Jürgens	3b140cea64	fix	2023-02-16 20:56:10 +01:00
Malte Jürgens	8409cfacf4	fix	2023-02-16 20:51:09 +01:00
Malte Jürgens	73782302bb	fix	2023-02-16 20:33:26 +01:00