From f24afca1bade3f86295a736f9d0d578e3d727df4 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 11 Aug 2021 13:19:49 -0400 Subject: [PATCH] Put old school MacUI in the attic. --- .../macui}/ZeroTier One.xcodeproj/project.pbxproj | 0 .../project.xcworkspace/contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../macui}/ZeroTier One/AboutViewController.h | 0 .../macui}/ZeroTier One/AboutViewController.m | 0 .../macui}/ZeroTier One/AboutViewController.xib | 0 {macui => attic/macui}/ZeroTier One/AppDelegate.h | 0 {macui => attic/macui}/ZeroTier One/AppDelegate.m | 0 .../AppIcon.appiconset/Contents.json | 0 .../AppIcon.appiconset/ZeroTierIcon512x512.png | Bin .../ZeroTier One/Assets.xcassets/Contents.json | 0 .../MenuBarIconMac.imageset/Contents.json | 0 .../MenuBarIconMac.imageset/MenuBar@2x.png | Bin .../MenuBarIconMac.imageset/Menubar.png | Bin .../MenuBarIconMacWhite.imageset/Contents.json | 0 .../MenuBarIconMacWhite.imageset/MenubarWhite.png | Bin .../MenubarWhite@2x.png | Bin {macui => attic/macui}/ZeroTier One/AuthtokenCopy.h | 0 {macui => attic/macui}/ZeroTier One/AuthtokenCopy.m | 0 .../macui}/ZeroTier One/Base.lproj/MainMenu.xib | 0 {macui => attic/macui}/ZeroTier One/Info.plist | 0 .../macui}/ZeroTier One/JoinNetworkViewController.h | 0 .../macui}/ZeroTier One/JoinNetworkViewController.m | 0 .../ZeroTier One/JoinNetworkViewController.xib | 0 {macui => attic/macui}/ZeroTier One/Network.h | 0 {macui => attic/macui}/ZeroTier One/Network.m | 0 .../macui}/ZeroTier One/NetworkInfoCell.h | 0 .../macui}/ZeroTier One/NetworkInfoCell.m | 0 .../macui}/ZeroTier One/NetworkMonitor.h | 0 .../macui}/ZeroTier One/NetworkMonitor.m | 0 {macui => attic/macui}/ZeroTier One/NodeStatus.h | 0 {macui => attic/macui}/ZeroTier One/NodeStatus.m | 0 .../macui}/ZeroTier One/PreferencesViewController.h | 0 .../macui}/ZeroTier One/PreferencesViewController.m | 0 .../ZeroTier One/PreferencesViewController.xib | 0 {macui => attic/macui}/ZeroTier One/ServiceCom.h | 0 {macui => attic/macui}/ZeroTier One/ServiceCom.m | 0 .../ZeroTier One/ShowNetworksViewController.h | 0 .../ZeroTier One/ShowNetworksViewController.m | 0 .../ZeroTier One/ShowNetworksViewController.xib | 0 .../macui}/ZeroTier One/ZeroTier One.entitlements | 0 .../macui}/ZeroTier One/ZeroTierIcon.icns | Bin {macui => attic/macui}/ZeroTier One/about.html | 0 {macui => attic/macui}/ZeroTier One/main.m | 0 make-mac.mk | 9 ++------- 45 files changed, 2 insertions(+), 7 deletions(-) rename {macui => attic/macui}/ZeroTier One.xcodeproj/project.pbxproj (100%) rename {macui => attic/macui}/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {macui => attic/macui}/ZeroTier One.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {macui => attic/macui}/ZeroTier One/AboutViewController.h (100%) rename {macui => attic/macui}/ZeroTier One/AboutViewController.m (100%) rename {macui => attic/macui}/ZeroTier One/AboutViewController.xib (100%) rename {macui => attic/macui}/ZeroTier One/AppDelegate.h (100%) rename {macui => attic/macui}/ZeroTier One/AppDelegate.m (100%) rename {macui => attic/macui}/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {macui => attic/macui}/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png (100%) rename {macui => attic/macui}/ZeroTier One/Assets.xcassets/Contents.json (100%) rename {macui => attic/macui}/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json (100%) rename {macui => attic/macui}/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png (100%) rename {macui => attic/macui}/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png (100%) rename {macui => attic/macui}/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json (100%) rename {macui => attic/macui}/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png (100%) rename {macui => attic/macui}/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png (100%) rename {macui => attic/macui}/ZeroTier One/AuthtokenCopy.h (100%) rename {macui => attic/macui}/ZeroTier One/AuthtokenCopy.m (100%) rename {macui => attic/macui}/ZeroTier One/Base.lproj/MainMenu.xib (100%) rename {macui => attic/macui}/ZeroTier One/Info.plist (100%) rename {macui => attic/macui}/ZeroTier One/JoinNetworkViewController.h (100%) rename {macui => attic/macui}/ZeroTier One/JoinNetworkViewController.m (100%) rename {macui => attic/macui}/ZeroTier One/JoinNetworkViewController.xib (100%) rename {macui => attic/macui}/ZeroTier One/Network.h (100%) rename {macui => attic/macui}/ZeroTier One/Network.m (100%) rename {macui => attic/macui}/ZeroTier One/NetworkInfoCell.h (100%) rename {macui => attic/macui}/ZeroTier One/NetworkInfoCell.m (100%) rename {macui => attic/macui}/ZeroTier One/NetworkMonitor.h (100%) rename {macui => attic/macui}/ZeroTier One/NetworkMonitor.m (100%) rename {macui => attic/macui}/ZeroTier One/NodeStatus.h (100%) rename {macui => attic/macui}/ZeroTier One/NodeStatus.m (100%) rename {macui => attic/macui}/ZeroTier One/PreferencesViewController.h (100%) rename {macui => attic/macui}/ZeroTier One/PreferencesViewController.m (100%) rename {macui => attic/macui}/ZeroTier One/PreferencesViewController.xib (100%) rename {macui => attic/macui}/ZeroTier One/ServiceCom.h (100%) rename {macui => attic/macui}/ZeroTier One/ServiceCom.m (100%) rename {macui => attic/macui}/ZeroTier One/ShowNetworksViewController.h (100%) rename {macui => attic/macui}/ZeroTier One/ShowNetworksViewController.m (100%) rename {macui => attic/macui}/ZeroTier One/ShowNetworksViewController.xib (100%) rename {macui => attic/macui}/ZeroTier One/ZeroTier One.entitlements (100%) rename {macui => attic/macui}/ZeroTier One/ZeroTierIcon.icns (100%) rename {macui => attic/macui}/ZeroTier One/about.html (100%) rename {macui => attic/macui}/ZeroTier One/main.m (100%) diff --git a/macui/ZeroTier One.xcodeproj/project.pbxproj b/attic/macui/ZeroTier One.xcodeproj/project.pbxproj similarity index 100% rename from macui/ZeroTier One.xcodeproj/project.pbxproj rename to attic/macui/ZeroTier One.xcodeproj/project.pbxproj diff --git a/macui/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/attic/macui/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from macui/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to attic/macui/ZeroTier One.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/macui/ZeroTier One.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/attic/macui/ZeroTier One.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from macui/ZeroTier One.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to attic/macui/ZeroTier One.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/macui/ZeroTier One/AboutViewController.h b/attic/macui/ZeroTier One/AboutViewController.h similarity index 100% rename from macui/ZeroTier One/AboutViewController.h rename to attic/macui/ZeroTier One/AboutViewController.h diff --git a/macui/ZeroTier One/AboutViewController.m b/attic/macui/ZeroTier One/AboutViewController.m similarity index 100% rename from macui/ZeroTier One/AboutViewController.m rename to attic/macui/ZeroTier One/AboutViewController.m diff --git a/macui/ZeroTier One/AboutViewController.xib b/attic/macui/ZeroTier One/AboutViewController.xib similarity index 100% rename from macui/ZeroTier One/AboutViewController.xib rename to attic/macui/ZeroTier One/AboutViewController.xib diff --git a/macui/ZeroTier One/AppDelegate.h b/attic/macui/ZeroTier One/AppDelegate.h similarity index 100% rename from macui/ZeroTier One/AppDelegate.h rename to attic/macui/ZeroTier One/AppDelegate.h diff --git a/macui/ZeroTier One/AppDelegate.m b/attic/macui/ZeroTier One/AppDelegate.m similarity index 100% rename from macui/ZeroTier One/AppDelegate.m rename to attic/macui/ZeroTier One/AppDelegate.m diff --git a/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json b/attic/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json rename to attic/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png b/attic/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png similarity index 100% rename from macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png rename to attic/macui/ZeroTier One/Assets.xcassets/AppIcon.appiconset/ZeroTierIcon512x512.png diff --git a/macui/ZeroTier One/Assets.xcassets/Contents.json b/attic/macui/ZeroTier One/Assets.xcassets/Contents.json similarity index 100% rename from macui/ZeroTier One/Assets.xcassets/Contents.json rename to attic/macui/ZeroTier One/Assets.xcassets/Contents.json diff --git a/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json b/attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json similarity index 100% rename from macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json rename to attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json diff --git a/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png b/attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png similarity index 100% rename from macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png rename to attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBar@2x.png diff --git a/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png b/attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png similarity index 100% rename from macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png rename to attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Menubar.png diff --git a/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json b/attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json similarity index 100% rename from macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json rename to attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/Contents.json diff --git a/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png b/attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png similarity index 100% rename from macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png rename to attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite.png diff --git a/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png b/attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png similarity index 100% rename from macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png rename to attic/macui/ZeroTier One/Assets.xcassets/MenuBarIconMacWhite.imageset/MenubarWhite@2x.png diff --git a/macui/ZeroTier One/AuthtokenCopy.h b/attic/macui/ZeroTier One/AuthtokenCopy.h similarity index 100% rename from macui/ZeroTier One/AuthtokenCopy.h rename to attic/macui/ZeroTier One/AuthtokenCopy.h diff --git a/macui/ZeroTier One/AuthtokenCopy.m b/attic/macui/ZeroTier One/AuthtokenCopy.m similarity index 100% rename from macui/ZeroTier One/AuthtokenCopy.m rename to attic/macui/ZeroTier One/AuthtokenCopy.m diff --git a/macui/ZeroTier One/Base.lproj/MainMenu.xib b/attic/macui/ZeroTier One/Base.lproj/MainMenu.xib similarity index 100% rename from macui/ZeroTier One/Base.lproj/MainMenu.xib rename to attic/macui/ZeroTier One/Base.lproj/MainMenu.xib diff --git a/macui/ZeroTier One/Info.plist b/attic/macui/ZeroTier One/Info.plist similarity index 100% rename from macui/ZeroTier One/Info.plist rename to attic/macui/ZeroTier One/Info.plist diff --git a/macui/ZeroTier One/JoinNetworkViewController.h b/attic/macui/ZeroTier One/JoinNetworkViewController.h similarity index 100% rename from macui/ZeroTier One/JoinNetworkViewController.h rename to attic/macui/ZeroTier One/JoinNetworkViewController.h diff --git a/macui/ZeroTier One/JoinNetworkViewController.m b/attic/macui/ZeroTier One/JoinNetworkViewController.m similarity index 100% rename from macui/ZeroTier One/JoinNetworkViewController.m rename to attic/macui/ZeroTier One/JoinNetworkViewController.m diff --git a/macui/ZeroTier One/JoinNetworkViewController.xib b/attic/macui/ZeroTier One/JoinNetworkViewController.xib similarity index 100% rename from macui/ZeroTier One/JoinNetworkViewController.xib rename to attic/macui/ZeroTier One/JoinNetworkViewController.xib diff --git a/macui/ZeroTier One/Network.h b/attic/macui/ZeroTier One/Network.h similarity index 100% rename from macui/ZeroTier One/Network.h rename to attic/macui/ZeroTier One/Network.h diff --git a/macui/ZeroTier One/Network.m b/attic/macui/ZeroTier One/Network.m similarity index 100% rename from macui/ZeroTier One/Network.m rename to attic/macui/ZeroTier One/Network.m diff --git a/macui/ZeroTier One/NetworkInfoCell.h b/attic/macui/ZeroTier One/NetworkInfoCell.h similarity index 100% rename from macui/ZeroTier One/NetworkInfoCell.h rename to attic/macui/ZeroTier One/NetworkInfoCell.h diff --git a/macui/ZeroTier One/NetworkInfoCell.m b/attic/macui/ZeroTier One/NetworkInfoCell.m similarity index 100% rename from macui/ZeroTier One/NetworkInfoCell.m rename to attic/macui/ZeroTier One/NetworkInfoCell.m diff --git a/macui/ZeroTier One/NetworkMonitor.h b/attic/macui/ZeroTier One/NetworkMonitor.h similarity index 100% rename from macui/ZeroTier One/NetworkMonitor.h rename to attic/macui/ZeroTier One/NetworkMonitor.h diff --git a/macui/ZeroTier One/NetworkMonitor.m b/attic/macui/ZeroTier One/NetworkMonitor.m similarity index 100% rename from macui/ZeroTier One/NetworkMonitor.m rename to attic/macui/ZeroTier One/NetworkMonitor.m diff --git a/macui/ZeroTier One/NodeStatus.h b/attic/macui/ZeroTier One/NodeStatus.h similarity index 100% rename from macui/ZeroTier One/NodeStatus.h rename to attic/macui/ZeroTier One/NodeStatus.h diff --git a/macui/ZeroTier One/NodeStatus.m b/attic/macui/ZeroTier One/NodeStatus.m similarity index 100% rename from macui/ZeroTier One/NodeStatus.m rename to attic/macui/ZeroTier One/NodeStatus.m diff --git a/macui/ZeroTier One/PreferencesViewController.h b/attic/macui/ZeroTier One/PreferencesViewController.h similarity index 100% rename from macui/ZeroTier One/PreferencesViewController.h rename to attic/macui/ZeroTier One/PreferencesViewController.h diff --git a/macui/ZeroTier One/PreferencesViewController.m b/attic/macui/ZeroTier One/PreferencesViewController.m similarity index 100% rename from macui/ZeroTier One/PreferencesViewController.m rename to attic/macui/ZeroTier One/PreferencesViewController.m diff --git a/macui/ZeroTier One/PreferencesViewController.xib b/attic/macui/ZeroTier One/PreferencesViewController.xib similarity index 100% rename from macui/ZeroTier One/PreferencesViewController.xib rename to attic/macui/ZeroTier One/PreferencesViewController.xib diff --git a/macui/ZeroTier One/ServiceCom.h b/attic/macui/ZeroTier One/ServiceCom.h similarity index 100% rename from macui/ZeroTier One/ServiceCom.h rename to attic/macui/ZeroTier One/ServiceCom.h diff --git a/macui/ZeroTier One/ServiceCom.m b/attic/macui/ZeroTier One/ServiceCom.m similarity index 100% rename from macui/ZeroTier One/ServiceCom.m rename to attic/macui/ZeroTier One/ServiceCom.m diff --git a/macui/ZeroTier One/ShowNetworksViewController.h b/attic/macui/ZeroTier One/ShowNetworksViewController.h similarity index 100% rename from macui/ZeroTier One/ShowNetworksViewController.h rename to attic/macui/ZeroTier One/ShowNetworksViewController.h diff --git a/macui/ZeroTier One/ShowNetworksViewController.m b/attic/macui/ZeroTier One/ShowNetworksViewController.m similarity index 100% rename from macui/ZeroTier One/ShowNetworksViewController.m rename to attic/macui/ZeroTier One/ShowNetworksViewController.m diff --git a/macui/ZeroTier One/ShowNetworksViewController.xib b/attic/macui/ZeroTier One/ShowNetworksViewController.xib similarity index 100% rename from macui/ZeroTier One/ShowNetworksViewController.xib rename to attic/macui/ZeroTier One/ShowNetworksViewController.xib diff --git a/macui/ZeroTier One/ZeroTier One.entitlements b/attic/macui/ZeroTier One/ZeroTier One.entitlements similarity index 100% rename from macui/ZeroTier One/ZeroTier One.entitlements rename to attic/macui/ZeroTier One/ZeroTier One.entitlements diff --git a/macui/ZeroTier One/ZeroTierIcon.icns b/attic/macui/ZeroTier One/ZeroTierIcon.icns similarity index 100% rename from macui/ZeroTier One/ZeroTierIcon.icns rename to attic/macui/ZeroTier One/ZeroTierIcon.icns diff --git a/macui/ZeroTier One/about.html b/attic/macui/ZeroTier One/about.html similarity index 100% rename from macui/ZeroTier One/about.html rename to attic/macui/ZeroTier One/about.html diff --git a/macui/ZeroTier One/main.m b/attic/macui/ZeroTier One/main.m similarity index 100% rename from macui/ZeroTier One/main.m rename to attic/macui/ZeroTier One/main.m diff --git a/make-mac.mk b/make-mac.mk index 423bfad09..63911eb8b 100644 --- a/make-mac.mk +++ b/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