Rewrite SoftwareUpdate singleton

.github/workflows/build.yml

@@ -0,0 +1,18 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: macOS-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
+    - name: Setup
+      run: brew install boost capnp google-sparsehash multimarkdown ninja ragel
+    - name: Configure
+      run: ./configure
+    - name: Build
+      run: ninja TextMate

.gitignore

@@ -1,7 +1,3 @@
-build
 build.ninja
-cache
-Applications/TextMate/resources/DefaultBundles.tbz
+local.rave
 Frameworks/license/src/revoked_serials.cc
-*.capnp.c++
-*.capnp.h

.gitmodules

@@ -1,12 +1,6 @@
 [submodule "bin/CxxTest"]
 	path = bin/CxxTest
 	url = https://github.com/textmate/cxxtest.git
-[submodule "vendor/MASPreferences/vendor"]
-	path = vendor/MASPreferences/vendor
-	url = https://github.com/textmate/MASPreferences.git
-[submodule "vendor/MGScopeBar/vendor"]
-	path = vendor/MGScopeBar/vendor
-	url = https://github.com/textmate/MGScopeBar.git
 [submodule "Applications/TextMate/icons"]
 	path = Applications/TextMate/icons
 	url = https://github.com/textmate/document-icons.git
@@ -16,9 +10,6 @@
 [submodule "PlugIns/dialog"]
 	path = PlugIns/dialog
 	url = https://github.com/textmate/dialog.git
-[submodule "vendor/XcodeEditor/vendor"]
-	path = vendor/XcodeEditor/vendor
-	url = https://github.com/textmate/xcode-editor.git
 [submodule "vendor/Onigmo/vendor"]
 	path = vendor/Onigmo/vendor
 	url = https://github.com/textmate/Onigmo.git

.tm_properties

@@ -10,9 +10,11 @@ excludeDirectoriesInFolderSearch = '{bin/CxxTest,build,SyntaxMate.tmBundle}'
 TM_ORGANIZATION_NAME = 'MacroMates'
 
 TM_TODO_IGNORE       = '/(build|CxxTest|PlugIns|vendor)/|\.(md|html)$'
-
-TM_CXX_FLAGS         = '$TM_CXX_FLAGS    -I"$CWD/Shared/include" -I"${builddir:-$HOME/build/TextMate}/include"'
-TM_OBJCXX_FLAGS      = '$TM_OBJCXX_FLAGS -I"$CWD/Shared/include" -I"${builddir:-$HOME/build/TextMate}/include"'
+TM_BUILD_DIR         = '${builddir:-$HOME/build/${CWD/.*\///}}'
+TM_FRAMEWORKS        = 'authorization buffer BundleEditor BundleEditor BundleMenu bundles BundlesManager cf command CommitWindow crash CrashReporter document DocumentWindow editor encoding file FileBrowser Find HTMLOutput HTMLOutputWindow io layout license MenuBuilder network ns OakAppKit OakCommand OakDebug OakFilterList OakFoundation OakSystem OakTabBarView OakTextView parse plist Preferences regexp scm scope selection settings SoftwareUpdate text theme undo updater version'
+TM_FRAMEWORK_INCLUDE = '${TM_FRAMEWORKS/\w+/-I"${TM_BUILD_DIR}\/release\/_Include\/$0\/include"/g}'
+TM_CXX_FLAGS         = '$TM_CXX_FLAGS    -I"$CWD/Shared/include" ${TM_FRAMEWORK_INCLUDE}'
+TM_OBJCXX_FLAGS      = '$TM_OBJCXX_FLAGS -I"$CWD/Shared/include" ${TM_FRAMEWORK_INCLUDE}'
 
 TM_NINJA_FILE        = '${CWD}/build.ninja'
 TM_NINJA_TARGET      = 'TextMate/run'
@@ -24,9 +26,6 @@ tabSize          = 3
 softTabs         = false
 TM_C_POINTER     = "* "
 
-[ {*.,}target ]
-fileType         = 'source.tm-properties'
-
 [ *.h ]
 fileType         = 'source.objc++'
 

Applications/NewApplication/default.rave

@@ -0,0 +1,12 @@
+target "${dirname}" {
+	require OakFoundation OakAppKit MenuBuilder
+
+	prefix "${target}.app/Contents"
+
+	files Info.plist  "."
+	files resources/* "Resources"
+
+	sources src/*.{cc,mm}
+	executable "MacOS/${target}"
+	frameworks Cocoa
+}

Applications/NewApplication/resources/English.lproj/InfoPlist.strings

@@ -1,2 +1,3 @@
 /* Localized versions of Info.plist keys */
 
+NSHumanReadableCopyright = "© MacroMates Ltd., ${YEAR}";

Applications/NewApplication/resources/English.lproj/MainMenu.xib

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment version="1050" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
     </dependencies>
     <objects>

Applications/NewApplication/src/AppDelegate.mm

@@ -1,4 +1,5 @@
 #import "AppDelegate.h"
+#import "WindowController.h"
 #import <MenuBuilder/MenuBuilder.h>
 
 @interface AppDelegate () <NSApplicationDelegate, NSWindowDelegate>
@@ -58,11 +59,11 @@ - (void)applicationWillFinishLaunching:(NSNotification*)aNotification
 				{ /* -------- */ },
 				{ @"Find",
 					.submenu = {
-						{ @"Find…",                  @selector(performFindPanelAction:),       @"f", .tag = 1 },
-						{ @"Find and Replace…",      @selector(performFindPanelAction:),       @"f", .modifierFlags = NSEventModifierFlagCommand|NSEventModifierFlagOption, .tag = 12 },
-						{ @"Find Next",              @selector(performFindPanelAction:),       @"g", .tag = 2 },
-						{ @"Find Previous",          @selector(performFindPanelAction:),       @"G", .tag = 3 },
-						{ @"Use Selection for Find", @selector(performFindPanelAction:),       @"e", .tag = 7 },
+						{ @"Find…",                  @selector(performTextFinderAction:),      @"f",                                                                        .tag = NSTextFinderActionShowFindInterface    },
+						{ @"Find and Replace…",      @selector(performTextFinderAction:),      @"f", .modifierFlags = NSEventModifierFlagCommand|NSEventModifierFlagOption, .tag = NSTextFinderActionShowReplaceInterface },
+						{ @"Find Next",              @selector(performTextFinderAction:),      @"g",                                                                        .tag = NSTextFinderActionNextMatch            },
+						{ @"Find Previous",          @selector(performTextFinderAction:),      @"G",                                                                        .tag = NSTextFinderActionPreviousMatch        },
+						{ @"Use Selection for Find", @selector(performTextFinderAction:),      @"e",                                                                        .tag = NSTextFinderActionSetSearchString      },
 						{ @"Jump to Selection",      @selector(centerSelectionInVisibleArea:), @"j"   },
 					}
 				},
@@ -107,13 +108,13 @@ - (void)applicationWillFinishLaunching:(NSNotification*)aNotification
 			.submenu = {
 				{ @"Font",
 					.systemMenu = MBMenuTypeFont, .submenu = {
-						{ @"Show Fonts",  @selector(orderFrontFontPanel:),  @"t", .target = NSFontManager.sharedFontManager },
-						{ @"Bold",        @selector(addFontTrait:),         @"b", .target = NSFontManager.sharedFontManager, .tag = 2 },
-						{ @"Italic",      @selector(addFontTrait:),         @"i", .target = NSFontManager.sharedFontManager, .tag = 1 },
+						{ @"Show Fonts",  @selector(orderFrontFontPanel:),  @"t",                              .target = NSFontManager.sharedFontManager },
+						{ @"Bold",        @selector(addFontTrait:),         @"b", .tag = NSBoldFontMask ,      .target = NSFontManager.sharedFontManager },
+						{ @"Italic",      @selector(addFontTrait:),         @"i", .tag = NSItalicFontMask ,    .target = NSFontManager.sharedFontManager },
 						{ @"Underline",   @selector(underline:),            @"u"   },
 						{ /* -------- */ },
-						{ @"Bigger",      @selector(modifyFont:),           @"+", .target = NSFontManager.sharedFontManager, .tag = 3 },
-						{ @"Smaller",     @selector(modifyFont:),           @"-", .target = NSFontManager.sharedFontManager, .tag = 4 },
+						{ @"Bigger",      @selector(modifyFont:),           @"+", .tag = NSSizeUpFontAction,   .target = NSFontManager.sharedFontManager },
+						{ @"Smaller",     @selector(modifyFont:),           @"-", .tag = NSSizeDownFontAction, .target = NSFontManager.sharedFontManager },
 						{ /* -------- */ },
 						{ @"Kern",
 							.submenu = {
@@ -176,11 +177,13 @@ - (void)applicationWillFinishLaunching:(NSNotification*)aNotification
 		},
 		{ @"View",
 			.submenu = {
-				{ @"Show Toolbar",       @selector(toggleToolbarShown:),           @"t", .modifierFlags = NSEventModifierFlagCommand|NSEventModifierFlagOption },
-				{ @"Customize Toolbar…", @selector(runToolbarCustomizationPalette:)       },
+				{ @"Show Toolbar",         @selector(toggleToolbarShown:),           @"t", .modifierFlags = NSEventModifierFlagCommand|NSEventModifierFlagOption },
+				{ @"Customize Toolbar…",   @selector(runToolbarCustomizationPalette:)     },
 				{ /* -------- */ },
-				{ @"Show Sidebar",       @selector(toggleSourceList:),             @"s", .modifierFlags = NSEventModifierFlagCommand|NSEventModifierFlagControl },
-				{ @"Enter Full Screen",  @selector(toggleFullScreen:),             @"f", .modifierFlags = NSEventModifierFlagCommand|NSEventModifierFlagControl },
+				{ @"Show Sidebar",         @selector(toggleSourceList:),             @"s", .modifierFlags = NSEventModifierFlagCommand|NSEventModifierFlagControl },
+				{ @"Enter Full Screen",    @selector(toggleFullScreen:),             @"f", .modifierFlags = NSEventModifierFlagCommand|NSEventModifierFlagControl },
+				{ /* -------- */ },
+				{ @"Customize Touch Bar…", @selector(toggleTouchBarCustomizationPalette:) },
 			}
 		},
 		{ @"Window",
@@ -204,16 +207,7 @@ - (void)applicationWillFinishLaunching:(NSNotification*)aNotification
 
 - (void)applicationDidFinishLaunching:(NSNotification*)aNotification
 {
-	_window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 400, 400) styleMask:(NSWindowStyleMaskTitled|NSWindowStyleMaskResizable|NSWindowStyleMaskClosable|NSWindowStyleMaskMiniaturizable) backing:NSBackingStoreBuffered defer:NO];
-	_window.releasedWhenClosed = NO;
-	_window.delegate           = self;
-	_window.title              = @"New Application";
-	[_window center];
-	[_window makeKeyAndOrderFront:self];
-}
-
-- (void)windowWillClose:(NSNotification*)aNotification
-{
-	[NSApp terminate:self];
+	WindowController* windowController = [[WindowController alloc] init];
+	[windowController showWindow:self];
 }
 @end

Applications/NewApplication/src/ViewController.h

@@ -0,0 +1,2 @@
+@interface ViewController : NSViewController
+@end

Applications/NewApplication/src/ViewController.mm

@@ -0,0 +1,31 @@
+#import "ViewController.h"
+
+@interface MyView : NSView
+@end
+
+@implementation MyView
+- (instancetype)initWithFrame:(NSRect)aRect
+{
+	if(self = [super initWithFrame:aRect])
+	{
+	}
+	return self;
+}
+
+- (NSSize)intrinsicContentSize
+{
+	return NSMakeSize(100, 100);
+}
+
+- (void)drawRect:(NSRect)aRect
+{
+	NSEraseRect(aRect);
+}
+@end
+
+@implementation ViewController
+- (void)loadView
+{
+	self.view = [[MyView alloc] initWithFrame:NSZeroRect];
+}
+@end

Applications/NewApplication/src/WindowController.h

@@ -0,0 +1,2 @@
+@interface WindowController : NSWindowController
+@end

Applications/NewApplication/src/WindowController.mm

@@ -0,0 +1,64 @@
+#import "WindowController.h"
+#import "ViewController.h"
+
+@interface WindowController () <NSWindowDelegate>
+@property (nonatomic) NSWindowController* retainedSelf;
+@property (nonatomic) ViewController* northEastViewController;
+@property (nonatomic) ViewController* northWestViewController;
+@property (nonatomic) ViewController* southEastViewController;
+@property (nonatomic) ViewController* southWestViewController;
+@end
+
+@implementation WindowController
++ (void)initialize
+{
+	NSWindow.allowsAutomaticWindowTabbing = NO;
+}
+
+- (instancetype)init
+{
+	if(self = [self initWithWindow:[[NSWindow alloc] initWithContentRect:NSZeroRect styleMask:(NSWindowStyleMaskTitled|NSWindowStyleMaskResizable|NSWindowStyleMaskClosable|NSWindowStyleMaskMiniaturizable) backing:NSBackingStoreBuffered defer:NO]])
+	{
+		_retainedSelf = self;
+
+		self.northEastViewController = [[ViewController alloc] init];
+		self.northWestViewController = [[ViewController alloc] init];
+		self.southEastViewController = [[ViewController alloc] init];
+		self.southWestViewController = [[ViewController alloc] init];
+
+		NSWindow* window = self.window;
+		window.title    = NSProcessInfo.processInfo.processName;
+		window.delegate = self;
+
+		NSDictionary* views = @{
+			@"northEast": self.northEastViewController.view,
+			@"northWest": self.northWestViewController.view,
+			@"southEast": self.southEastViewController.view,
+			@"southWest": self.southWestViewController.view,
+		};
+
+		NSView* contentView = window.contentView;
+		for(NSView* view in views.allValues)
+		{
+			view.translatesAutoresizingMaskIntoConstraints = NO;
+			[contentView addSubview:view];
+		}
+
+		[contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[northEast(==northWest@55)]-[northWest]-|" options:NSLayoutFormatAlignAllTop|NSLayoutFormatAlignAllBottom metrics:nil views:views]];
+		[contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[southEast(==southWest@55)]-[southWest]-|" options:NSLayoutFormatAlignAllTop|NSLayoutFormatAlignAllBottom metrics:nil views:views]];
+		[contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-[northEast(==southEast@55)]-[southEast]-|" options:0 metrics:nil views:views]];
+
+		[window layoutIfNeeded];
+		[window center];
+
+		window.frameAutosaveName = @"Main";
+	}
+	return self;
+}
+
+- (void)windowWillClose:(NSNotification*)aNotification
+{
+	_retainedSelf = nil;
+	[NSApp performSelector:@selector(terminate:) withObject:nil afterDelay:0];
+}
+@end

Applications/PrivilegedTool/default.rave

@@ -0,0 +1,5 @@
+target "${dirname}" {
+	require authorization io text
+	sources src/*.cc
+	executable "${target}"
+}

Applications/PrivilegedTool/src/install.cc

@@ -99,11 +99,11 @@ int install_tool (std::string const& toolPath)
 
 	if(!path::make_dir(path::parent(kAuthToolPath)))
 		return EX_CANTCREAT;
-	path::remove(kAuthToolPath);
-	if(!path::copy(toolPath, kAuthToolPath))
+	unlink(kAuthToolPath);
+	if(copyfile(toolPath.c_str(), kAuthToolPath, nullptr, COPYFILE_ALL | COPYFILE_NOFOLLOW_SRC) != 0)
 		return EX_IOERR;
 	chown(kAuthToolPath, 0, 0);
-	if(path::exists(kAuthPlistPath))
+	if(access(kAuthPlistPath, F_OK) == 0)
 		launch_control("unload", kAuthPlistPath);
 	if(!path::set_content(kAuthPlistPath, plist_content()))
 		return EX_IOERR;
@@ -119,8 +119,8 @@ int uninstall_tool ()
 	if(path::exists(kAuthPlistPath))
 	{
 		launch_control("unload", kAuthPlistPath);
-		path::remove(kAuthPlistPath);
+		unlink(kAuthPlistPath);
 	}
-	path::remove(kAuthToolPath);
+	unlink(kAuthToolPath);
 	return EX_OK;
 }

Applications/PrivilegedTool/src/launchd.cc

@@ -1,39 +1,18 @@
 #include "launchd.h"
-#include <launch.h> // There is no <x-man-page://3/launch> page <rdar://7072543>
-#include <oak/debug.h>
+#include <launch.h>
 
-OAK_DEBUG_VAR(AuthServer_Launchd);
-
-int get_socket (launch_data_t dict, char const* name)
+int launchd_sockets ()
 {
-	launch_data_t array = launch_data_dict_lookup(dict, name);
+	int* fds = nullptr;
+	size_t cnt = 0;
+	int rc = launch_activate_socket("MasterSocket", &fds, &cnt);
 
-	if(array == nullptr || (launch_data_get_type(array) == LAUNCH_DATA_ARRAY && launch_data_array_get_count(array) == 0))
-	{
-		D(DBF_AuthServer_Launchd, bug("no activity for %s\n", name););
-		return -1;
-	}
+	assert(rc == 0);
+	assert(fds != nullptr);
+	assert(cnt == 1);
 
-	assert(array != nullptr && launch_data_get_type(array) == LAUNCH_DATA_ARRAY);
-	D(DBF_AuthServer_Launchd, bug("handle %zu sockets (%s)", launch_data_array_get_count(array), name););
-	launch_data_t fdData = launch_data_array_get_index(array, 0);
-	D(DBF_AuthServer_Launchd, bug("data %p", fdData););
-	assert(fdData != nullptr && launch_data_get_type(fdData) == LAUNCH_DATA_FD);
-	int fd = launch_data_get_fd(fdData);
-	D(DBF_AuthServer_Launchd, bug("fd %d", fd););
-	assert(fd >= 0);
-
-	return fd;
-}
-
-int launchd_sockets ()
-{
-	launch_data_t req = launch_data_new_string(LAUNCH_KEY_CHECKIN);
-	assert(req != nullptr);
-	launch_data_t res = launch_msg(req);
-	assert(res != nullptr && launch_data_get_type(res) == LAUNCH_DATA_DICTIONARY); // LAUNCH_DATA_ERRNO
-	launch_data_t allSockets = launch_data_dict_lookup(res, LAUNCH_JOBKEY_SOCKETS);
-	assert(allSockets != nullptr && launch_data_get_type(allSockets) == LAUNCH_DATA_DICTIONARY);
+	int res = rc == 0 && cnt == 1 ? fds[0] : -1;
+	free(fds);
 
-	return get_socket(allSockets, "MasterSocket");
+	return res;
 }