Adapt for changes to environment structure.

[cdist.git] / cdist

diff --git a/cdist b/cdist
index 7480499c4e8fa9aed3af6dd24780aa11732278c9..c0ff509e6bb6abe521f8d1303d351bb7eb45c511 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -111,7 +111,8 @@ class Config:
                          Option('git_reference'),
                          Option('osx_environment_prefix'),
                          Option('osx_sdk_prefix'),
-                         Option('osx_sdk'),
+                         Option('osx_intel_sdk'),
+                         Option('osx_arm_sdk'),
                          Option('osx_keychain_file'),
                          Option('osx_keychain_password'),
                          Option('apple_id'),
@@ -746,6 +747,7 @@ def notarize_dmg(dmg, bundle_id):
 
     request_uuid = string_after(p, "RequestUUID")
     if request_uuid is None:
+        print("Response: %s" % p)
         raise Error('No RequestUUID found in response from Apple')
 
     for i in range(0, 30):
@@ -784,7 +786,7 @@ class OSXTarget(Target):
 
     def _cscript_package_and_notarize(self, tree, options, notarize):
         """
-        Call package() in the cscript and notarize the .dmgs that are returned, if notarize = True
+        Call package() in the cscript and notarize the .dmgs that are returned, if notarize == True
         """
         p = self._cscript_package(tree, options)
         for x in p:
@@ -802,8 +804,8 @@ class OSXSingleTarget(OSXTarget):
         self.sdk = sdk
 
         flags = '-isysroot %s/MacOSX%s.sdk -arch %s' % (self.sdk_prefix, sdk, arch)
-        host_enviro = '%s/x86_64/10.9' % config.get('osx_environment_prefix')
-        target_enviro = '%s/%s/%s' % (config.get('osx_environment_prefix'), arch, sdk)
+        host_enviro = '%s/x86_64' % config.get('osx_environment_prefix')
+        target_enviro = '%s/%s' % (config.get('osx_environment_prefix'), arch)
 
         self.bin = '%s/bin' % target_enviro
 
@@ -834,17 +836,14 @@ class OSXSingleTarget(OSXTarget):
 
 
 class OSXUniversalTarget(OSXTarget):
-    def __init__(self, archs, directory=None):
+    def __init__(self, directory=None):
         super(OSXUniversalTarget, self).__init__(directory)
-        self.archs = archs
-        self.sdk = config.get('osx_sdk')
-        for a in self.archs:
-            if a.find('arm') != -1:
-                self.sdk = '11.0'
+        self.intel_sdk = config.get('osx_intel_sdk')
+        self.arm_sdk = config.get('osx_arm_sdk')
 
     def package(self, project, checkout, output_dir, options, notarize):
-        for a in self.archs:
-            target = OSXSingleTarget(a, self.sdk, os.path.join(self.directory, a))
+        for arch, sdk in (('x86_64', self.intel_sdk), ('arm64', self.arm_sdk)):
+            target = OSXSingleTarget(arch, sdk, os.path.join(self.directory, arch))
             target.ccache = self.ccache
             tree = globals.trees.get(project, checkout, target)
             tree.build_dependencies(options)
@@ -883,7 +882,7 @@ class SourceTarget(Target):
 #    or centos-version-{32,64}
 #    or fedora-version-{32,64}
 #    or mageia-version-{32,64}
-#    or osx-{intel,arm}
+#    or osx
 #    or source
 #    or flatpak
 #    or appimage
@@ -914,14 +913,8 @@ def target_factory(args):
         target = LinuxTarget(p[0], None, int(p[1]), args.work)
     elif s == 'raspbian':
         target = LinuxTarget(s, None, None, args.work)
-    elif s == 'osx-intel':
-        # Intel 64-bit built for config's os_sdk
-        target = OSXSingleTarget('x86_64', config.get('osx_sdk'), args.work)
-    elif s == 'osx-arm-intel':
-        # Universal arm64 and Intel 64-bit built for SDK 11.0
-        target = OSXUniversalTarget(('arm64', 'x86_64'), args.work)
-    elif s == 'osx-arm64':
-        target = OSXSingleTarget('arm64', '11.0', args.work)
+    elif s == 'osx':
+        target = OSXUniversalTarget(args.work)
     elif s == 'source':
         target = SourceTarget()
     elif s == 'flatpak':