diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj
index d9730527a..4215fd227 100755
--- a/ext/installfiles/mac/ZeroTier One.pkgproj
+++ b/ext/installfiles/mac/ZeroTier One.pkgproj
@@ -37,7 +37,7 @@
GID
80
PATH
- mac-ui-macgap1-wrapper/bin/ZeroTier One.app
+ ../../../macui/build/Release/ZeroTier One.app
PATH_TYPE
1
PERMISSIONS
@@ -121,119 +121,6 @@
UID
0
-
- CHILDREN
-
-
- CHILDREN
-
- GID
- 0
- PATH
- ui/index.html
- PATH_TYPE
- 1
- PERMISSIONS
- 420
- TYPE
- 3
- UID
- 0
-
-
- CHILDREN
-
- GID
- 0
- PATH
- ui/main.js
- PATH_TYPE
- 1
- PERMISSIONS
- 420
- TYPE
- 3
- UID
- 0
-
-
- CHILDREN
-
- GID
- 0
- PATH
- ui/react.min.js
- PATH_TYPE
- 1
- PERMISSIONS
- 420
- TYPE
- 3
- UID
- 0
-
-
- CHILDREN
-
- GID
- 0
- PATH
- ui/simpleajax.min.js
- PATH_TYPE
- 1
- PERMISSIONS
- 420
- TYPE
- 3
- UID
- 0
-
-
- CHILDREN
-
- GID
- 0
- PATH
- ui/zerotier.css
- PATH_TYPE
- 1
- PERMISSIONS
- 420
- TYPE
- 3
- UID
- 0
-
-
- CHILDREN
-
- GID
- 0
- PATH
- ui/ztui.min.js
- PATH_TYPE
- 1
- PERMISSIONS
- 420
- TYPE
- 3
- UID
- 0
-
-
- GID
- 0
- PATH
- ui
- PATH_TYPE
- 0
- PERMISSIONS
- 493
- TYPE
- 2
- UID
- 0
-
CHILDREN
@@ -759,7 +646,7 @@
OVERWRITE_PERMISSIONS
VERSION
- 1.1.14
+ 1.1.17
PROJECT_COMMENTS
@@ -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 875f01e57..0fbd38173 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: