Browse Source

Put old school MacUI in the attic.

Adam Ierymenko 4 years ago
parent
commit
f24afca1ba
45 changed files with 2 additions and 7 deletions
  1. 0 0
      attic/macui/ZeroTier One.xcodeproj/project.pbxproj
  2. 0 0
      attic/macui/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  3. 0 0
      attic/macui/ZeroTier One.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
  4. 0 0
      attic/macui/ZeroTier One/AboutViewController.h
  5. 0 0
      attic/macui/ZeroTier One/AboutViewController.m
  6. 0 0
      attic/macui/ZeroTier One/AboutViewController.xib
  7. 0 0
      attic/macui/ZeroTier One/AppDelegate.h
  8. 0 0
      attic/macui/ZeroTier One/AppDelegate.m
  9. 0 0
      attic/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json
  10. 0 0
      attic/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png
  11. 0 0
      attic/macui/ZeroTier One/Assets.xcassets/Contents.json
  12. 0 0
      attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json
  13. 0 0
      attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/[email protected]
  14. 0 0
      attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png
  15. 0 0
      attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json
  16. 0 0
      attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png
  17. 0 0
      attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/[email protected]
  18. 0 0
      attic/macui/ZeroTier One/AuthtokenCopy.h
  19. 0 0
      attic/macui/ZeroTier One/AuthtokenCopy.m
  20. 0 0
      attic/macui/ZeroTier One/Base.lproj/MainMenu.xib
  21. 0 0
      attic/macui/ZeroTier One/Info.plist
  22. 0 0
      attic/macui/ZeroTier One/JoinNetworkViewController.h
  23. 0 0
      attic/macui/ZeroTier One/JoinNetworkViewController.m
  24. 0 0
      attic/macui/ZeroTier One/JoinNetworkViewController.xib
  25. 0 0
      attic/macui/ZeroTier One/Network.h
  26. 0 0
      attic/macui/ZeroTier One/Network.m
  27. 0 0
      attic/macui/ZeroTier One/NetworkInfoCell.h
  28. 0 0
      attic/macui/ZeroTier One/NetworkInfoCell.m
  29. 0 0
      attic/macui/ZeroTier One/NetworkMonitor.h
  30. 0 0
      attic/macui/ZeroTier One/NetworkMonitor.m
  31. 0 0
      attic/macui/ZeroTier One/NodeStatus.h
  32. 0 0
      attic/macui/ZeroTier One/NodeStatus.m
  33. 0 0
      attic/macui/ZeroTier One/PreferencesViewController.h
  34. 0 0
      attic/macui/ZeroTier One/PreferencesViewController.m
  35. 0 0
      attic/macui/ZeroTier One/PreferencesViewController.xib
  36. 0 0
      attic/macui/ZeroTier One/ServiceCom.h
  37. 0 0
      attic/macui/ZeroTier One/ServiceCom.m
  38. 0 0
      attic/macui/ZeroTier One/ShowNetworksViewController.h
  39. 0 0
      attic/macui/ZeroTier One/ShowNetworksViewController.m
  40. 0 0
      attic/macui/ZeroTier One/ShowNetworksViewController.xib
  41. 0 0
      attic/macui/ZeroTier One/ZeroTier One.entitlements
  42. 0 0
      attic/macui/ZeroTier One/ZeroTierIcon.icns
  43. 0 0
      attic/macui/ZeroTier One/about.html
  44. 0 0
      attic/macui/ZeroTier One/main.m
  45. 2 7
      make-mac.mk

+ 0 - 0
macui/ZeroTier One.xcodeproj/project.pbxproj → attic/macui/ZeroTier One.xcodeproj/project.pbxproj


+ 0 - 0
macui/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata → attic/macui/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata


+ 0 - 0
macui/ZeroTier One.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist → attic/macui/ZeroTier One.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist


+ 0 - 0
macui/ZeroTier One/AboutViewController.h → attic/macui/ZeroTier One/AboutViewController.h


+ 0 - 0
macui/ZeroTier One/AboutViewController.m → attic/macui/ZeroTier One/AboutViewController.m


+ 0 - 0
macui/ZeroTier One/AboutViewController.xib → attic/macui/ZeroTier One/AboutViewController.xib


+ 0 - 0
macui/ZeroTier One/AppDelegate.h → attic/macui/ZeroTier One/AppDelegate.h


+ 0 - 0
macui/ZeroTier One/AppDelegate.m → attic/macui/ZeroTier One/AppDelegate.m


+ 0 - 0
macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json → attic/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json


+ 0 - 0
macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png → attic/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png


+ 0 - 0
macui/ZeroTier One/Assets.xcassets/Contents.json → attic/macui/ZeroTier One/Assets.xcassets/Contents.json


+ 0 - 0
macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json → attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json


+ 0 - 0
macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/[email protected] → attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/[email protected]


+ 0 - 0
macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png → attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png


+ 0 - 0
macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json → attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json


+ 0 - 0
macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png → attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png


+ 0 - 0
macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/[email protected] → attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/[email protected]


+ 0 - 0
macui/ZeroTier One/AuthtokenCopy.h → attic/macui/ZeroTier One/AuthtokenCopy.h


+ 0 - 0
macui/ZeroTier One/AuthtokenCopy.m → attic/macui/ZeroTier One/AuthtokenCopy.m


+ 0 - 0
macui/ZeroTier One/Base.lproj/MainMenu.xib → attic/macui/ZeroTier One/Base.lproj/MainMenu.xib


+ 0 - 0
macui/ZeroTier One/Info.plist → attic/macui/ZeroTier One/Info.plist


+ 0 - 0
macui/ZeroTier One/JoinNetworkViewController.h → attic/macui/ZeroTier One/JoinNetworkViewController.h


+ 0 - 0
macui/ZeroTier One/JoinNetworkViewController.m → attic/macui/ZeroTier One/JoinNetworkViewController.m


+ 0 - 0
macui/ZeroTier One/JoinNetworkViewController.xib → attic/macui/ZeroTier One/JoinNetworkViewController.xib


+ 0 - 0
macui/ZeroTier One/Network.h → attic/macui/ZeroTier One/Network.h


+ 0 - 0
macui/ZeroTier One/Network.m → attic/macui/ZeroTier One/Network.m


+ 0 - 0
macui/ZeroTier One/NetworkInfoCell.h → attic/macui/ZeroTier One/NetworkInfoCell.h


+ 0 - 0
macui/ZeroTier One/NetworkInfoCell.m → attic/macui/ZeroTier One/NetworkInfoCell.m


+ 0 - 0
macui/ZeroTier One/NetworkMonitor.h → attic/macui/ZeroTier One/NetworkMonitor.h


+ 0 - 0
macui/ZeroTier One/NetworkMonitor.m → attic/macui/ZeroTier One/NetworkMonitor.m


+ 0 - 0
macui/ZeroTier One/NodeStatus.h → attic/macui/ZeroTier One/NodeStatus.h


+ 0 - 0
macui/ZeroTier One/NodeStatus.m → attic/macui/ZeroTier One/NodeStatus.m


+ 0 - 0
macui/ZeroTier One/PreferencesViewController.h → attic/macui/ZeroTier One/PreferencesViewController.h


+ 0 - 0
macui/ZeroTier One/PreferencesViewController.m → attic/macui/ZeroTier One/PreferencesViewController.m


+ 0 - 0
macui/ZeroTier One/PreferencesViewController.xib → attic/macui/ZeroTier One/PreferencesViewController.xib


+ 0 - 0
macui/ZeroTier One/ServiceCom.h → attic/macui/ZeroTier One/ServiceCom.h


+ 0 - 0
macui/ZeroTier One/ServiceCom.m → attic/macui/ZeroTier One/ServiceCom.m


+ 0 - 0
macui/ZeroTier One/ShowNetworksViewController.h → attic/macui/ZeroTier One/ShowNetworksViewController.h


+ 0 - 0
macui/ZeroTier One/ShowNetworksViewController.m → attic/macui/ZeroTier One/ShowNetworksViewController.m


+ 0 - 0
macui/ZeroTier One/ShowNetworksViewController.xib → attic/macui/ZeroTier One/ShowNetworksViewController.xib


+ 0 - 0
macui/ZeroTier One/ZeroTier One.entitlements → attic/macui/ZeroTier One/ZeroTier One.entitlements


+ 0 - 0
macui/ZeroTier One/ZeroTierIcon.icns → attic/macui/ZeroTier One/ZeroTierIcon.icns


+ 0 - 0
macui/ZeroTier One/about.html → attic/macui/ZeroTier One/about.html


+ 0 - 0
macui/ZeroTier One/main.m → attic/macui/ZeroTier One/main.m


+ 2 - 7
make-mac.mk

@@ -90,7 +90,7 @@ endif
 
 CXXFLAGS=$(CFLAGS) -std=c++11 -stdlib=libc++
 
-all: one macui
+all: one
 
 ext/x64-salsa2012-asm/salsa2012.o:
 	as -arch x86_64 -mmacosx-version-min=10.7 -o ext/x64-salsa2012-asm/salsa2012.o ext/x64-salsa2012-asm/salsa2012.s
@@ -124,10 +124,6 @@ libzerotiercore.a:	$(CORE_OBJS)
 
 core: libzerotiercore.a
 
-macui:	FORCE
-	cd macui && xcodebuild -target "ZeroTier One" -configuration Release
-	$(CODESIGN) -f --options=runtime -s $(CODESIGN_APP_CERT) "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
 #	$(STRIP) zerotier
@@ -153,14 +149,13 @@ mac-dist-pkg: FORCE
 official: FORCE
 	make clean
 	make ZT_OFFICIAL_RELEASE=1 -j 8 one
-	make ZT_OFFICIAL_RELEASE=1 macui
 	make ZT_OFFICIAL_RELEASE=1 mac-dist-pkg
 
 central-controller-docker: FORCE
 	docker build --no-cache -t registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP} -f ext/central-controller-docker/Dockerfile --build-arg git_branch=$(shell git name-rev --name-only HEAD) .
 
 clean:
-	rm -rf MacEthernetTapAgent *.dSYM build-* *.a *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-selftest zerotier-cli zerotier doc/node_modules macui/build zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_*
+	rm -rf MacEthernetTapAgent *.dSYM build-* *.a *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-selftest zerotier-cli zerotier doc/node_modules zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_*
 
 distclean:	clean