diff options
Diffstat (limited to 'make-mac.mk')
| -rw-r--r-- | make-mac.mk | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/make-mac.mk b/make-mac.mk index a41445db..7d730ae5 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -8,16 +8,14 @@ ARCH_FLAGS=-arch x86_64 include objects.mk OBJS+=osdep/OSXEthernetTap.o -#TESTNET_OBJS=testnet/SimNet.o testnet/SimNetSocketManager.o testnet/TestEthernetTap.o # Disable codesign since open source users will not have ZeroTier's certs CODESIGN=echo CODESIGN_CERT= +# For internal use only -- signs everything with ZeroTier's developer cert ifeq ($(ZT_OFFICIAL_RELEASE),1) - # For use by ZeroTier Networks -- sign with developer cert - ZT_AUTO_UPDATE=1 - DEFS+=-DZT_OFFICIAL_RELEASE + DEFS+=-DZT_OFFICIAL_RELEASE -DZT_AUTO_UPDATE CODESIGN=codesign CODESIGN_CERT="Developer ID Application: ZeroTier Networks LLC (8ZD9JUCZ4V)" endif @@ -36,6 +34,7 @@ endif # Enable SSE-optimized Salsa20 -- all Intel macs support SSE2 DEFS+=-DZT_SALSA20_SSE +# Debug mode -- dump trace output, build binary with -g ifeq ($(ZT_DEBUG),1) DEFS+=-DZT_TRACE CFLAGS=-Wall -g -pthread $(INCLUDES) $(DEFS) @@ -57,43 +56,28 @@ one: $(OBJS) one.o $(STRIP) zerotier-one ln -sf zerotier-one zerotier-idtool ln -sf zerotier-one zerotier-cli + $(CODESIGN) -f -s $(CODESIGN_CERT) zerotier-one + $(CODESIGN) -vvv zerotier-one selftest: $(OBJS) selftest.o $(CXX) $(CXXFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS) $(STRIP) zerotier-selftest -#testnet: $(TESTNET_OBJS) $(OBJS) testnet.o -# $(CXX) $(CXXFLAGS) -o zerotier-testnet testnet.o $(OBJS) $(TESTNET_OBJS) $(LIBS) -# $(STRIP) zerotier-testnet +# Requires Packages: http://s.sudre.free.fr/Software/Packages/about.html +mac-dist-pkg: FORCE + cd ext/installfiles/mac ; packagesbuild "ZeroTier One.pkgproj" + $(CODESIGN) -f -s $(CODESIGN_CERT) "ZeroTier One.pkg" + $(CODESIGN) -vvv "ZeroTier One.pkg" -# Requires that ../Qt be symlinked to the Qt root to use for UI build -#mac-ui: FORCE -# mkdir -p build-ZeroTierUI-release -# cd build-ZeroTierUI-release ; ../../Qt/bin/qmake ../ZeroTierUI/ZeroTierUI.pro ; make -j 4 -# strip "build-ZeroTierUI-release/ZeroTier One.app/Contents/MacOS/ZeroTier One" -# find "build-ZeroTierUI-release/ZeroTier One.app" -type f -name '.DS_Store' -print0 | xargs -0 rm -f -# $(CODESIGN) -f -s $(CODESIGN_CERT) "build-ZeroTierUI-release/ZeroTier One.app" -# $(CODESIGN) -vvv "build-ZeroTierUI-release/ZeroTier One.app" +# For internal use only +official: FORCE + make clean + make -j 4 ZT_OFFICIAL_RELEASE=1 + make ZT_OFFICIAL_RELEASE=1 mac-dist-pkg clean: rm -rf *.dSYM build-* *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o zerotier-one zerotier-idtool zerotier-selftest zerotier-cli ZeroTierOneInstaller-* -# For our use -- builds official signed binary, packages in installer and download DMG -official: FORCE - make -j 4 ZT_OFFICIAL_RELEASE=1 - ./buildinstaller.sh -# make mac-dmg ZT_OFFICIAL_RELEASE=1 - -#mac-dmg: FORCE -# mkdir -p build-ZeroTierOne-dmg -# cd build-ZeroTierOne-dmg ; ln -sf /Applications Applications -# cp -a "build-ZeroTierUI-release/ZeroTier One.app" build-ZeroTierOne-dmg/ -# rm -f /tmp/tmp.dmg -# hdiutil create /tmp/tmp.dmg -ov -volname "ZeroTier One" -fs HFS+ -srcfolder ./build-ZeroTierOne-dmg -# hdiutil convert /tmp/tmp.dmg -format UDZO -o "ZeroTier One.dmg" -# $(CODESIGN) -f -s $(CODESIGN_CERT) "ZeroTier One.dmg" -# rm -f /tmp/tmp.dmg - # For those building from source -- installs signed binary tap driver in system ZT home install-mac-tap: FORCE mkdir -p /Library/Application\ Support/ZeroTier/One |