v.1.4.1 commit

checks all architectures (in fat files, even ones that won't be run) improved UI fixed project build issues
objective-see · Feb 22, 2018 · cf9e1cd · cf9e1cd
1 parent bdc8ec7
commit cf9e1cd
Show file tree

Hide file tree

Showing 10 changed files with 121 additions and 24 deletions.
diff --git a/Installer/Installer.xcodeproj/project.pbxproj b/Installer/Installer.xcodeproj/project.pbxproj
@@ -241,7 +241,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#for normal builds\n# just copy in app\ncp -R -f $BUILT_PRODUCTS_DIR/WhatsYourSign.app $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources/\n\n#for achiving\n#  first build finder sync in release mode (don't archive it)\n#  then archive (this) installer app\n#cp -R -f ~/objective-see/WhatsYourSign/DerivedData/WhatsYourSign/Build/Products/Release/WhatsYourSign.app ~/objective-see/WhatsYourSign/DerivedData/WhatsYourSign/Build/Intermediates.noindex/ArchiveIntermediates/Installer/BuildProductsPath/Release/WhatsYourSign_Installer.app/Contents/Resources/\n";
+			shellScript = "#for normal builds\n# just copy in app\n#cp -R -f $BUILT_PRODUCTS_DIR/WhatsYourSign.app $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources/\n\n#for achiving\n#  1) build finder sync in release mode (don't archive it)\n#  2) then archive (this) installer app\ncp -R -f $SRCROOT/../DerivedData/WhatsYourSign/Build/Products/Release/WhatsYourSign.app $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources/\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/Installer/Installer.xcodeproj/xcshareddata/xcschemes/Installer.xcscheme b/Installer/Installer.xcodeproj/xcshareddata/xcschemes/Installer.xcscheme
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0920"
+   wasCreatedForAppExtension = "YES"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "NO"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7D61ED701D984BA6007FE979"
+               BuildableName = "WhatsYourSign.app"
+               BlueprintName = "WhatsYourSign"
+               ReferencedContainer = "container:../WhatsYourSignExt/WhatsYourSign.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7D24C8641D2CDEA7009932EE"
+               BuildableName = "WhatsYourSign_Installer.app"
+               BlueprintName = "Installer"
+               ReferencedContainer = "container:Installer.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7D24C8641D2CDEA7009932EE"
+            BuildableName = "WhatsYourSign_Installer.app"
+            BlueprintName = "Installer"
+            ReferencedContainer = "container:Installer.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7D24C8641D2CDEA7009932EE"
+            BuildableName = "WhatsYourSign_Installer.app"
+            BlueprintName = "Installer"
+            ReferencedContainer = "container:Installer.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7D24C8641D2CDEA7009932EE"
+            BuildableName = "WhatsYourSign_Installer.app"
+            BlueprintName = "Installer"
+            ReferencedContainer = "container:Installer.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Installer/Installer/AboutWindowController.m b/Installer/Installer/AboutWindowController.m
@@ -40,9 +40,6 @@ -(void)windowDidLoad
     //load patrons
     self.patrons.string = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"patrons" ofType:@"txt"] encoding:NSUTF8StringEncoding error:NULL];
 
-    //make 'support us' default
-    [self.supportUs setKeyEquivalent:@"\r"];
-
     //make first responder
     // calling this without a timeout sometimes fails :/
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.01 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{

diff --git a/Installer/Installer/ConfigureWindowController.m b/Installer/Installer/ConfigureWindowController.m
@@ -27,9 +27,6 @@ -(void)awakeFromNib
     //indicate title bar is transparent (too)
     self.window.titlebarAppearsTransparent = YES;
 
-    //make install button default
-    [self.installButton setKeyEquivalent:@"\r"];
-
     //make first responder
     // calling this without a timeout sometimes fails :/
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.01 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
@@ -166,9 +163,6 @@ -(IBAction)buttonHandler:(id)sender
         //nap for UI purposes
         [NSThread sleepForTimeInterval:0.10f];
 
-        //make support button default
-        [self.supportButton setKeyEquivalent:@"\r"];
-
         //...and also make it first responder
         // calling this without a timeout sometimes fails :/
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.01 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
@@ -466,9 +460,6 @@ -(void)completeEvent:(BOOL)success event:(NSUInteger)event
         //enable
         self.uninstallButton.enabled = YES;
 
-        //make it default
-        [self.uninstallButton setKeyEquivalent:@"\r"];
-
         //...and highlighted
         [self.window makeFirstResponder:self.uninstallButton];
     }

diff --git a/Installer/Installer/Info.plist b/Installer/Installer/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>1.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.0</string>
+	<string>1.4.1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/Installer/Installer/patrons.txt b/Installer/Installer/patrons.txt
@@ -1 +1 @@
-Lance Gaines, Ash Morgan, Nando Mendonca, Khalil Sehnaoui, Gamer_Bot
+Lance Gaines, Ash Morgan, Nando Mendonca, Khalil Sehnaoui, Jeff Golden, @b3nw, Gamer_Bot
diff --git a/WhatsYourSignExt/FinderSync/Info.plist b/WhatsYourSignExt/FinderSync/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>1.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.0</string>
+	<string>1.4.1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>

diff --git a/WhatsYourSignExt/FinderSync/Signing.m b/WhatsYourSignExt/FinderSync/Signing.m
@@ -297,7 +297,8 @@
     }
 
     //check signature
-    status = SecStaticCodeCheckValidityWithErrors(staticCode, kSecCSDoNotValidateResources, NULL, NULL);
+    // be very strict!
+    status = SecStaticCodeCheckValidityWithErrors(staticCode, kSecCSStrictValidate | kSecCSCheckAllArchitectures | kSecCSCheckNestedCode, NULL, NULL);
 
     //(re)save signature status
     signingStatus[KEY_SIGNATURE_STATUS] = [NSNumber numberWithInt:status];

diff --git a/WhatsYourSignExt/WhatsYourSign.xcodeproj/project.pbxproj b/WhatsYourSignExt/WhatsYourSign.xcodeproj/project.pbxproj
@@ -91,9 +91,9 @@
 		7D50B7101D2F69040055CC40 /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../Shared/Logging.h; sourceTree = "<group>"; };
 		7D5CACB71FE9A9F8002A367A /* ClickableTextField.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ClickableTextField.h; sourceTree = "<group>"; };
 		7D5CACB81FE9A9F8002A367A /* ClickableTextField.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ClickableTextField.m; sourceTree = "<group>"; };
-		7D5CACBC1FE9CC8B002A367A /* EntitlementsWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = EntitlementsWindowController.m; path = "/Users/patrickw/objective-see/WhatsYourSign/WhatsYourSignExt/FinderSync/EntitlementsWindowController.m"; sourceTree = "<absolute>"; };
-		7D5CACBD1FE9CC8B002A367A /* EntitlementsWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EntitlementsWindowController.h; path = "/Users/patrickw/objective-see/WhatsYourSign/WhatsYourSignExt/FinderSync/EntitlementsWindowController.h"; sourceTree = "<absolute>"; };
-		7D5CACBE1FE9CC8B002A367A /* EntitlementsWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = EntitlementsWindow.xib; path = "/Users/patrickw/objective-see/WhatsYourSign/WhatsYourSignExt/FinderSync/EntitlementsWindow.xib"; sourceTree = "<absolute>"; };
+		7D5CACBC1FE9CC8B002A367A /* EntitlementsWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EntitlementsWindowController.m; sourceTree = "<group>"; };
+		7D5CACBD1FE9CC8B002A367A /* EntitlementsWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EntitlementsWindowController.h; sourceTree = "<group>"; };
+		7D5CACBE1FE9CC8B002A367A /* EntitlementsWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EntitlementsWindow.xib; sourceTree = "<group>"; };
 		7D61ED711D984BA6007FE979 /* WhatsYourSign.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WhatsYourSign.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7D61ED731D984BA6007FE979 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		7D61ED741D984BA6007FE979 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };

diff --git a/WhatsYourSignExt/WhatsYourSignExt/Info.plist b/WhatsYourSignExt/WhatsYourSignExt/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>1.4.1</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.0</string>
+	<string>1.4.1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>