From af522591fe4326ab64538145a7fe2b1a4aeb25fa Mon Sep 17 00:00:00 2001 From: proitlab Date: Thu, 8 Jan 2026 11:44:39 +0700 Subject: [PATCH] Add mac-dist-pkg_nexus --- make-mac.mk | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/make-mac.mk b/make-mac.mk index 163f8f0..ee44d45 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -5,7 +5,8 @@ TOPDIR=$(shell pwd) INCLUDES=-I$(shell pwd)/rustybits/target -isystem $(TOPDIR)/ext -I$(TOPDIR)/ext/prometheus-cpp-lite-1.0/core/include -I$(TOPDIR)/ext-prometheus-cpp-lite-1.0/3rdparty/http-client-lite/include -I$(TOPDIR)/ext/prometheus-cpp-lite-1.0/simpleapi/include DEFS= LIBS= -ARCH_FLAGS=-arch x86_64 -arch arm64 +#ARCH_FLAGS=-arch x86_64 -arch arm64 +ARCH_FLAGS=-arch arm64 CODESIGN=echo PRODUCTSIGN=echo @@ -127,9 +128,10 @@ backone: one zeroidc: rustybits/target/libzeroidc.a rustybits/target/libzeroidc.a: FORCE - cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS) + #cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS) cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=aarch64-apple-darwin $(EXTRA_CARGO_FLAGS) - cd rustybits && lipo -create target/x86_64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a target/aarch64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a -output target/libzeroidc.a + #cd rustybits && lipo -create target/x86_64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a target/aarch64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a -output target/libzeroidc.a + cd rustybits && lipo -create target/aarch64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a -output target/libzeroidc.a central-controller: make ARCH_FLAGS="-arch x86_64" ZT_CONTROLLER=1 one @@ -171,6 +173,16 @@ mac-dist-pkg: FORCE $(NOTARIZE) submit --apple-id "dedysutanto@gmail.com" --team-id "8ZD9JUCZ4V" --wait "BackOne.pkg" echo '*** When Apple notifies that the app is notarized, run: xcrun stapler staple "BackOne.pkg"' +mac-dist-pkg_nexus: FORCE + packagesbuild "ext/installfiles/mac-nexus/Nexus.pkgproj" + rm -f "Nexus Signed.pkg" + $(PRODUCTSIGN) --sign $(CODESIGN_INSTALLER_CERT) "Nexus.pkg" "Nexus Signed.pkg" + if [ -f "Nexus Signed.pkg" ]; then mv -f "Nexus Signed.pkg" "Nexus.pkg"; fi + rm -f zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_* + cat ext/installfiles/mac-update/updater.tmpl.sh "Nexus.pkg" >zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_$(ZT_VERSION_MAJOR).$(ZT_VERSION_MINOR).$(ZT_VERSION_REV)_$(ZT_VERSION_BUILD).exe + $(NOTARIZE) submit --apple-id "dedysutanto@gmail.com" --team-id "8ZD9JUCZ4V" --wait "Nexus.pkg" + echo '*** When Apple notifies that the app is notarized, run: xcrun stapler staple "Nexus.pkg"' + # For BackOne, Inc. to build official signed packages official: FORCE cd ../BackOneUI ; make ZT_OFFICIAL_RELEASE=1