Cleanup and tidying in documentation, project organization, signing and build process

Author: sveinbjornt

CHANGES.md renamed to Documentation/CHANGES.md

@@ -46,9 +46,6 @@ archives:
 	@echo "Creating source archive ${APP_SRC_ZIP_NAME}..."
 	@cd $(BUILD_DIR); zip -qy --symlinks -r "${APP_SRC_ZIP_NAME}" ".." -x \*.git\* -x \*.zip\* -x \*.DS_Store\* -x \*dsa_priv.pem\* -x \*Sparkle/dsa_priv.pem\* -x \*products/\* -x \*build/\* -x \*xcuserdata\*
 
-	@echo "Generating Sparkle DSA signature"
-	@cd $(BUILD_DIR); ruby ../sparkle/sign_update.rb $(APP_ZIP_NAME) "../sparkle/dsa_priv.pem"
-
 	@echo "Generating Sparkle EdDSA signature for archive"
 	@cd $(BUILD_DIR); ../sparkle/sign_update $(APP_ZIP_NAME)
 

License.txt renamed to Documentation/LICENSE.txt

@@ -97,12 +97,12 @@
 		F45B3F6F29A15132007D506D /* CHANGES.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGES.md; sourceTree = "<group>"; };
 		F47B45351EE74F2C00D79DFF /* Credits.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = "<group>"; };
 		F47B453F1EF82AC200D79DFF /* TODO.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = TODO.md; sourceTree = "<group>"; };
+		F47F00322DDC158D00625B42 /* Sloth.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Sloth.entitlements; sourceTree = "<group>"; };
 		F48BB5B924732C2C00B569F6 /* sloth_screenshot3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = sloth_screenshot3.jpg; sourceTree = "<group>"; };
 		F49B28AC1E858FAC00FA6716 /* sloth_screenshot2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = sloth_screenshot2.jpg; sourceTree = "<group>"; };
 		F4A8B5CD222DB5280049FA51 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
 		F4A9D5EE206A68BC0069B2B6 /* LICENSE.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
 		F4B977AF1F8EBBEB0099971E /* sloth_screenshot1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = sloth_screenshot1.jpg; sourceTree = "<group>"; };
-		F4E41CF12B06990D00F2897D /* Sloth.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Sloth.entitlements; sourceTree = "<group>"; };
 		F4ED53C21C789A0A0024540F /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
 		F4F1D8A01C7623AF00945D3E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		F4F1D9111C7CB95700945D3E /* dsa_priv.pem */ = {isa = PBXFileReference; lastKnownFileType = text; path = dsa_priv.pem; sourceTree = "<group>"; };
@@ -137,13 +137,9 @@
 		29B97314FDCFA39411CA2CEA /* Sloth */ = {
 			isa = PBXGroup;
 			children = (
-				F4E41CF12B06990D00F2897D /* Sloth.entitlements */,
 				F44FC67225AD5EA200BC72F5 /* macos.yml */,
 				F4A8B5CD222DB5280049FA51 /* Makefile */,
-				F4F1D8A01C7623AF00945D3E /* README.md */,
-				F47B453F1EF82AC200D79DFF /* TODO.md */,
-				F45B3F6F29A15132007D506D /* CHANGES.md */,
-				F4A9D5EE206A68BC0069B2B6 /* LICENSE.txt */,
+				F47F00312DDC153100625B42 /* Documentation */,
 				F435320D2558EFC800AF00BD /* Source */,
 				F438712713402CDD00B51A5E /* Resources */,
 				F4F1D9101C7CB95700945D3E /* Sparkle */,
@@ -189,6 +185,7 @@
 		F438712713402CDD00B51A5E /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				F47F00322DDC158D00625B42 /* Sloth.entitlements */,
 				F40B7D2C1C75FA05000A4616 /* Images.xcassets */,
 				F413E66E1C76842A00385DB3 /* MainMenu.xib */,
 				F442E0721EA7DB1000BAD80C /* InfoPanel.xib */,
@@ -214,6 +211,17 @@
 			name = Images;
 			sourceTree = "<group>";
 		};
+		F47F00312DDC153100625B42 /* Documentation */ = {
+			isa = PBXGroup;
+			children = (
+				F4F1D8A01C7623AF00945D3E /* README.md */,
+				F47B453F1EF82AC200D79DFF /* TODO.md */,
+				F45B3F6F29A15132007D506D /* CHANGES.md */,
+				F4A9D5EE206A68BC0069B2B6 /* LICENSE.txt */,
+			);
+			path = Documentation;
+			sourceTree = "<group>";
+		};
 		F4851D27256DA0BF0056CE9C /* Util */ = {
 			isa = PBXGroup;
 			children = (
@@ -264,7 +272,7 @@
 				F4F1D89E1C761F8F00945D3E /* Set CFBundleVersion */,
 				8D11072C0486CEB800E47090 /* Sources */,
 				F413E66C1C76631F00385DB3 /* Copy Frameworks */,
-				F49DB76F2572583F009B6257 /* Sign Autoupdate.app */,
+				F49DB76F2572583F009B6257 /* Sign All Binaries */,
 				8D11072E0486CEB800E47090 /* Frameworks */,
 			);
 			buildRules = (
@@ -322,7 +330,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		F49DB76F2572583F009B6257 /* Sign Autoupdate.app */ = {
+		F49DB76F2572583F009B6257 /* Sign All Binaries */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
@@ -332,14 +340,14 @@
 			);
 			inputPaths = (
 			);
-			name = "Sign Autoupdate.app";
+			name = "Sign All Binaries";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "exit 0\n# We need to sign Autoupdate.app within Sparkle framework for update installation to work\n# Only do this for release builds so CI testing works\n#if [ \"${CONFIGURATION}\" != \"Release\" ]; then\n#  exit 0\n#fi\n\n\nLOCATION1=\"${BUILT_PRODUCTS_DIR}/Sloth.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/MacOS/Updater\"\nLOCATION2=\"${BUILT_PRODUCTS_DIR}/Sloth.app/Contents/Frameworks/Sparkle.framework/Versions/B/Autoupdate\"\nLOCATION3=\"${BUILT_PRODUCTS_DIR}/Sloth.app/Contents/Frameworks/Sparkle.framework/Versions/B/XPCServices/Downloader.xpc/Contents/MacOS/Downloader\"\nLOCATION4=\"${BUILT_PRODUCTS_DIR}/Sloth.app/Contents/Frameworks/Sparkle.framework\"\nLOCATION5=\"${BUILT_PRODUCTS_DIR}/Sloth.app\"\n\nIDENTITY=\"16A0188A9D74911B21953A33684437F70902BC30\"\n#${EXPANDED_CODE_SIGN_IDENTITY_NAME}\n\necho $IDENTITY\n\n\ncodesign --verbose --force -o runtime --deep --sign \"$IDENTITY\" \"$LOCATION1\"\ncodesign --verbose --force -o runtime --deep --sign \"$IDENTITY\" \"$LOCATION2\"\ncodesign --verbose --force -o runtime --deep --sign \"$IDENTITY\" \"$LOCATION3\"\ncodesign --verbose --force -o runtime --deep --sign \"$IDENTITY\" \"$LOCATION4\"\ncodesign --verbose --force -o runtime --deep --sign \"$IDENTITY\" \"$LOCATION5\"\n";
+			shellScript = "#exit 0\n# We need to sign all binaries within Sparkle framework for update installation to work\n# Only do this for release builds so CI testing works\nif [ \"${CONFIGURATION}\" != \"Release\" ]; then\n  exit 0\nfi\n\n\nLOCATION1=\"${BUILT_PRODUCTS_DIR}/Sloth.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/MacOS/Updater\"\nLOCATION2=\"${BUILT_PRODUCTS_DIR}/Sloth.app/Contents/Frameworks/Sparkle.framework/Versions/B/Autoupdate\"\nLOCATION3=\"${BUILT_PRODUCTS_DIR}/Sloth.app/Contents/Frameworks/Sparkle.framework/Versions/B/XPCServices/Downloader.xpc/Contents/MacOS/Downloader\"\nLOCATION4=\"${BUILT_PRODUCTS_DIR}/Sloth.app/Contents/Frameworks/Sparkle.framework\"\nLOCATION5=\"${BUILT_PRODUCTS_DIR}/Sloth.app\"\n\nIDENTITY=\"16A0188A9D74911B21953A33684437F70902BC30\"\n#${EXPANDED_CODE_SIGN_IDENTITY_NAME}\n\necho $IDENTITY\n\n\ncodesign --verbose --force -o runtime --deep --sign \"$IDENTITY\" \"$LOCATION1\"\ncodesign --verbose --force -o runtime --deep --sign \"$IDENTITY\" \"$LOCATION2\"\ncodesign --verbose --force -o runtime --deep --sign \"$IDENTITY\" \"$LOCATION3\"\ncodesign --verbose --force -o runtime --deep --sign \"$IDENTITY\" \"$LOCATION4\"\ncodesign --verbose --force -o runtime --deep --sign \"$IDENTITY\" \"$LOCATION5\"\n";
 		};
 		F4F1D89E1C761F8F00945D3E /* Set CFBundleVersion */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -389,7 +397,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CODE_SIGN_ENTITLEMENTS = Sloth.entitlements;
+				CODE_SIGN_ENTITLEMENTS = resources/Sloth.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
@@ -430,7 +438,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CODE_SIGN_ENTITLEMENTS = Sloth.entitlements;
+				CODE_SIGN_ENTITLEMENTS = resources/Sloth.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;

README.md renamed to Documentation/README.md

@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>342</string>
+	<string>346</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

TODO.md renamed to Documentation/TODO.md

@@ -13,9 +13,10 @@
             <description><![CDATA[
                 <h2>New in Sloth 3.4</h2>
                 <ul>
-                    <li>"Copy" on app/process or file now copies both filesystem representation and string</li>
+                    <li>Copying (Cmd-C) an app/process or file now copies both filesystem representation and string to the clipboard</li>
                     <li>Faster asynchronous file info processing in Info Panel</li>
                     <li>Various minor improvements</li>
+                    <li>App is now notarized by Apple in addition to being Developer ID signed</li>
                 </ul>
             ]]></description>
         </item>