diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-02 19:17:39 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-02 19:17:39 -0700 |
| commit | 35124025589a39ad5e2b9f2180fe5581d08899c8 (patch) | |
| tree | b20d3f4dcf06836c95496534da36d51e9e55df89 /make-mac.mk | |
| parent | 4fe12756d440fdb4a6750ddb31d5f991eee6de5f (diff) | |
| download | infinitytier-35124025589a39ad5e2b9f2180fe5581d08899c8.tar.gz infinitytier-35124025589a39ad5e2b9f2180fe5581d08899c8.zip | |
OSX .pkg files must be signed with productsign and an installer cert.
Diffstat (limited to 'make-mac.mk')
| -rw-r--r-- | make-mac.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/make-mac.mk b/make-mac.mk index 3bb0727a..09fd1e36 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -11,13 +11,17 @@ OBJS+=osdep/OSXEthernetTap.o # Disable codesign since open source users will not have ZeroTier's certs CODESIGN=echo -CODESIGN_CERT= +PRODUCTSIGN=echo +CODESIGN_APP_CERT= +CODESIGN_INSTALLER_CERT= # For internal use only -- signs everything with ZeroTier's developer cert ifeq ($(ZT_OFFICIAL_RELEASE),1) DEFS+=-DZT_OFFICIAL_RELEASE -DZT_AUTO_UPDATE CODESIGN=codesign - CODESIGN_CERT="Developer ID Application: ZeroTier Networks LLC (8ZD9JUCZ4V)" + PRODUCTSIGN=productsign + CODESIGN_APP_CERT="Developer ID Application: ZeroTier Networks LLC (8ZD9JUCZ4V)" + CODESIGN_INSTALLER_CERT="Developer ID Installer: ZeroTier Networks LLC (8ZD9JUCZ4V)" endif ifeq ($(ZT_AUTO_UPDATE),1) @@ -53,7 +57,7 @@ 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) -f -s $(CODESIGN_APP_CERT) zerotier-one $(CODESIGN) -vvv zerotier-one selftest: $(OBJS) selftest.o @@ -63,8 +67,9 @@ selftest: $(OBJS) selftest.o # Requires Packages: http://s.sudre.free.fr/Software/Packages/about.html mac-dist-pkg: FORCE packagesbuild "ext/installfiles/mac/ZeroTier One.pkgproj" - $(CODESIGN) -f -s $(CODESIGN_CERT) "ZeroTier One.pkg" - $(CODESIGN) -vvv "ZeroTier One.pkg" + rm -f "ZeroTier One Signed.pkg" + $(PRODUCTSIGN) --sign $(CODESIGN_INSTALLER_CERT) "ZeroTier One.pkg" "ZeroTier One Signed.pkg" + if [ -f "ZeroTier One Signed.pkg" ]; then mv -f "ZeroTier One Signed.pkg" "ZeroTier One.pkg"; fi # For internal use only official: FORCE |