diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-12-23 15:25:04 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-12-23 15:25:04 -0800 |
| commit | 24017659df4ebad3531c722374ac2f40dc9e2928 (patch) | |
| tree | 8e8d4c5ddaf51ce25954c8ae15f95ab04932a5a0 | |
| parent | c175a5fcd702ebeb64213fbd80bcda0b37cb043e (diff) | |
| download | infinitytier-24017659df4ebad3531c722374ac2f40dc9e2928.tar.gz infinitytier-24017659df4ebad3531c722374ac2f40dc9e2928.zip | |
Update installer, etc., for Mac.
| -rwxr-xr-x | ext/installfiles/mac/ZeroTier One.pkgproj | 121 | ||||
| -rw-r--r-- | make-mac.mk | 6 |
2 files changed, 7 insertions, 120 deletions
diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj index d9730527..4215fd22 100755 --- a/ext/installfiles/mac/ZeroTier One.pkgproj +++ b/ext/installfiles/mac/ZeroTier One.pkgproj @@ -37,7 +37,7 @@ <key>GID</key> <integer>80</integer> <key>PATH</key> - <string>mac-ui-macgap1-wrapper/bin/ZeroTier One.app</string> + <string>../../../macui/build/Release/ZeroTier One.app</string> <key>PATH_TYPE</key> <integer>1</integer> <key>PERMISSIONS</key> @@ -123,119 +123,6 @@ </dict> <dict> <key>CHILDREN</key> - <array> - <dict> - <key>CHILDREN</key> - <array/> - <key>GID</key> - <integer>0</integer> - <key>PATH</key> - <string>ui/index.html</string> - <key>PATH_TYPE</key> - <integer>1</integer> - <key>PERMISSIONS</key> - <integer>420</integer> - <key>TYPE</key> - <integer>3</integer> - <key>UID</key> - <integer>0</integer> - </dict> - <dict> - <key>CHILDREN</key> - <array/> - <key>GID</key> - <integer>0</integer> - <key>PATH</key> - <string>ui/main.js</string> - <key>PATH_TYPE</key> - <integer>1</integer> - <key>PERMISSIONS</key> - <integer>420</integer> - <key>TYPE</key> - <integer>3</integer> - <key>UID</key> - <integer>0</integer> - </dict> - <dict> - <key>CHILDREN</key> - <array/> - <key>GID</key> - <integer>0</integer> - <key>PATH</key> - <string>ui/react.min.js</string> - <key>PATH_TYPE</key> - <integer>1</integer> - <key>PERMISSIONS</key> - <integer>420</integer> - <key>TYPE</key> - <integer>3</integer> - <key>UID</key> - <integer>0</integer> - </dict> - <dict> - <key>CHILDREN</key> - <array/> - <key>GID</key> - <integer>0</integer> - <key>PATH</key> - <string>ui/simpleajax.min.js</string> - <key>PATH_TYPE</key> - <integer>1</integer> - <key>PERMISSIONS</key> - <integer>420</integer> - <key>TYPE</key> - <integer>3</integer> - <key>UID</key> - <integer>0</integer> - </dict> - <dict> - <key>CHILDREN</key> - <array/> - <key>GID</key> - <integer>0</integer> - <key>PATH</key> - <string>ui/zerotier.css</string> - <key>PATH_TYPE</key> - <integer>1</integer> - <key>PERMISSIONS</key> - <integer>420</integer> - <key>TYPE</key> - <integer>3</integer> - <key>UID</key> - <integer>0</integer> - </dict> - <dict> - <key>CHILDREN</key> - <array/> - <key>GID</key> - <integer>0</integer> - <key>PATH</key> - <string>ui/ztui.min.js</string> - <key>PATH_TYPE</key> - <integer>1</integer> - <key>PERMISSIONS</key> - <integer>420</integer> - <key>TYPE</key> - <integer>3</integer> - <key>UID</key> - <integer>0</integer> - </dict> - </array> - <key>GID</key> - <integer>0</integer> - <key>PATH</key> - <string>ui</string> - <key>PATH_TYPE</key> - <integer>0</integer> - <key>PERMISSIONS</key> - <integer>493</integer> - <key>TYPE</key> - <integer>2</integer> - <key>UID</key> - <integer>0</integer> - </dict> - <dict> - <key>CHILDREN</key> <array/> <key>GID</key> <integer>0</integer> @@ -759,7 +646,7 @@ <key>OVERWRITE_PERMISSIONS</key> <false/> <key>VERSION</key> - <string>1.1.14</string> + <string>1.1.17</string> </dict> <key>PROJECT_COMMENTS</key> <dict> @@ -773,7 +660,7 @@ ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD - b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjE0MDQuNDciPgo8c3R5bGUg + b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjE1MDQuNzYiPgo8c3R5bGUg dHlwZT0idGV4dC9jc3MiPgpwLnAxIHttYXJnaW46IDAuMHB4IDAu MHB4IDAuMHB4IDAuMHB4OyBsaW5lLWhlaWdodDogMTQuMHB4OyBm b250OiAxMi4wcHggSGVsdmV0aWNhOyBjb2xvcjogIzAwMDAwMDsg @@ -782,7 +669,7 @@ b2R5Pgo8cCBjbGFzcz0icDEiPjxzcGFuIGNsYXNzPSJzMSI+WmVy b1RpZXIgT25lIC0gTmV0d29yayBWaXJ0dWFsaXphdGlvbiBFdmVy eXdoZXJlPC9zcGFuPjwvcD4KPHAgY2xhc3M9InAxIj48c3BhbiBj - bGFzcz0iczEiPihjKTIwMTEtMjAxNiBaZXJvVGllciwgSW5jLjwv + bGFzcz0iczEiPihjKTIwMTEtMjAxNyBaZXJvVGllciwgSW5jLjwv c3Bhbj48L3A+CjxwIGNsYXNzPSJwMSI+PHNwYW4gY2xhc3M9InMx Ij5jb250YWN0QHplcm90aWVyLmNvbTwvc3Bhbj48L3A+CjxwIGNs YXNzPSJwMSI+PHNwYW4gY2xhc3M9InMxIj48YnI+Cjwvc3Bhbj48 diff --git a/make-mac.mk b/make-mac.mk index 875f01e5..0fbd3817 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -69,12 +69,12 @@ one: $(OBJS) service/OneService.o one.o ln -sf zerotier-one zerotier-idtool ln -sf zerotier-one zerotier-cli $(CODESIGN) -f -s $(CODESIGN_APP_CERT) zerotier-one - $(CODESIGN) -vvv zerotier-one + #$(CODESIGN) -vvv zerotier-one macui: FORCE cd macui && xcodebuild -target "ZeroTier One" -configuration Release $(CODESIGN) -f -s $(CODESIGN_APP_CERT) "macui/build/Release/ZeroTier One.app" - $(CODESIGN) -vvv "macui/build/Release/ZeroTier One.app" + #$(CODESIGN) -vvv "macui/build/Release/ZeroTier One.app" cli: FORCE $(CXX) $(CXXFLAGS) -o zerotier cli/zerotier.cpp osdep/OSUtils.cpp node/InetAddress.cpp node/Utils.cpp node/Salsa20.cpp node/Identity.cpp node/SHA512.cpp node/C25519.cpp -lcurl @@ -94,7 +94,7 @@ mac-dist-pkg: FORCE # For ZeroTier, Inc. to build official signed packages official: FORCE make clean - make ZT_OFFICIAL_RELEASE=1 -j 4 one + make ZT_OFFICIAL_RELEASE=1 -j 4 one macui make ZT_OFFICIAL_RELEASE=1 mac-dist-pkg clean: |