Update to Sparkle on Sep 22, 2019

Author: digitalmoksha

README.md

@@ -8,7 +8,7 @@ Easily package and release updates of your RubyMotion app with Sparkle.
 
 This version uses the [ui-separation-and-xpc branch](https://github.com/sparkle-project/Sparkle/tree/ui-separation-and-xpc) to support an app that uses sandboxing.  Sparkle is in transition, and the sandbox version is slated for 2.0.
 
-_Sparkle built from ui-separation-and-xpc#b1c3b313f53c95a91c8adc07b991ff9a306e6cf8 on Dec 9th, 2018_
+_Sparkle built from https://github.com/sparkle-project/Sparkle/commit/14871e5ee9753bba3c4b0d8a87e674306d264dc5 on Sep 22nd, 2019_
 
 [Reference thread](https://github.com/sparkle-project/Sparkle/issues/363)
 

lib/motion/project/project.rb

@@ -53,7 +53,7 @@ def codesign_with_sparkle(config, platform)
 
           Dir.glob("#{xpc_path}/*.xpc").each do |path|
             App.info 'Codesign', path
-            results = `#{App.config.sparkle.sparkle_vendor_path}/codesign_xpc "#{App.config.codesign_certificate}" "#{File.expand_path(path)}" 2>&1`
+            results = `#{App.config.sparkle.sparkle_vendor_path}/codesign_embedded_executable "#{App.config.codesign_certificate}" "#{File.expand_path(path)}" 2>&1`
           end
         end
       end

vendor/README.md

@@ -1,23 +1,33 @@
 ## Building the Sparkle.zip
 
+The `vendor` directory should contain
+
+```
+vendor
+  codesign_embedded_executable
+  generate_appcast
+  README.md
+  Sparkle.zip
+```
+
 The structure of `Sparkle.zip` is:
 
 ```
 Sparkle
-  codesign_xpc
   Sparkle.framework
   XPCServices
+    org.sparkle-project.Downloader.xpc    (not usually needed)
     org.sparkle-project.InstallerConnection.xpc
     org.sparkle-project.InstallerLauncher.xpc
     org.sparkle-project.InstallerStatus.xpc
 ```
 
 In order to get xpc services to be signed and work properly, they need to be copied into an `XPCServices` folder in `MyApp.app/Contents`
 
-The `codesign_xpc` can properly sign these files once they have been copied into place.
+The `codesign_embedded_executable` can properly sign these files once they have been copied into place.
 
 1. Fetch the `ui-separation-and-xpc` branch
-2. Copy the `bin/codesign_xpc` into the `Sparkle` folder
+2. Copy the `bin/codesign_embedded_executable` into the `vendor` folder
 3. Run `make release` and change to the output folder
 4. Copy the `Sparkle.framework` into the `Sparkle` folder
 5. Copy each of the above xpc files into the `XPCServices` folder

vendor/Sparkle.zip

@@ -10,7 +10,7 @@ def sanitize(argument):
     return ('"' + argument + '"' if ' ' in argument else argument)
 
 def _codesign_service(identity, path, entitlements_path=None):
-    command = ["codesign", "-fs", identity, path] + ([] if entitlements_path is None else ["--entitlements", entitlements_path])
+    command = ["codesign", "-o", "runtime", "-fs", identity, path] + ([] if entitlements_path is None else ["--entitlements", entitlements_path])
     log_message(" ".join(map(sanitize, command)))
 
     process = subprocess.Popen(command, stdout=subprocess.PIPE)
@@ -32,15 +32,15 @@ def codesign_service(service_name, identity, path, entitlements_path=None):
 
 if __name__ == "__main__":
     if len(sys.argv) < 3:
-        log_message("Usage:\n\t%s code-signing-identity xpc-service xpc-service2 ..." % (sys.argv[0]))
+        log_message("Usage:\n\t%s code-signing-identity executable1 executable1 ..." % (sys.argv[0]))
         log_message("Example:\n\t%s \"Developer ID Application\" ./XPCServices/*.xpc" % (sys.argv[0]))
         sys.exit(1)
 
     signing_identity = sys.argv[1]
-    xpc_services = sys.argv[2:]
+    executables = sys.argv[2:]
 
-    for xpc_service in xpc_services:
-        parent, child = os.path.split(xpc_service)
+    for executable in executables:
+        parent, child = os.path.split(executable)
         service_name = os.path.splitext(child)[0]
         entitlements_path = os.path.join(parent, service_name + ".entitlements")
-        codesign_service(service_name, signing_identity, xpc_service, None if not os.path.exists(entitlements_path) else entitlements_path)
+        codesign_service(service_name, signing_identity, executable, None if not os.path.exists(entitlements_path) else entitlements_path)