More 32-bit removal.

[cdist.git] / cdist

diff --git a/cdist b/cdist
index f7094a076f3b2688b18581f44112bb070818ff5a..7480499c4e8fa9aed3af6dd24780aa11732278c9 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -425,7 +425,11 @@ class Target(object):
     def setup(self):
         pass
 
-    def _build_packages(self, tree, options):
+    def _cscript_package(self, tree, options):
+        """
+        Call package() in the cscript and return what it returns, except that
+        anything not in a list will be put into one.
+        """
         if len(inspect.getfullargspec(tree.cscript['package']).args) == 3:
             packages = tree.call('package', tree.version, options)
         else:
@@ -441,7 +445,7 @@ class Target(object):
     def package(self, project, checkout, output_dir, options, notarize):
         tree = self.build(project, checkout, options)
         tree.add_defaults(options)
-        p = self._build_packages(tree, options)
+        p = self._cscript_package(tree, options)
         self._copy_packages(tree, p, output_dir)
 
     def build(self, project, checkout, options):
@@ -778,6 +782,18 @@ class OSXTarget(Target):
     def unlock_keychain(self):
         self.command('security unlock-keychain -p %s %s' % (self.osx_keychain_password, self.osx_keychain_file))
 
+    def _cscript_package_and_notarize(self, tree, options, notarize):
+        """
+        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:
+            if not isinstance(x, tuple):
+                raise Error('macOS packages must be returned from cscript as tuples of (dmg-filename, bundle-id)')
+            if notarize:
+                notarize_dmg(x[0], x[1])
+        return [x[0] for x in p]
+
 
 class OSXSingleTarget(OSXTarget):
     def __init__(self, arch, sdk, directory=None):
@@ -786,8 +802,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' % config.get('osx_environment_prefix')
-        target_enviro = '%s/%s' % (config.get('osx_environment_prefix'), 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)
 
         self.bin = '%s/bin' % target_enviro
 
@@ -813,29 +829,22 @@ class OSXSingleTarget(OSXTarget):
         tree = self.build(project, checkout, options)
         tree.add_defaults(options)
         self.unlock_keychain()
-        p = self._build_packages(tree, options)
-        for x in p:
-            if not isinstance(x, tuple):
-                raise Error('macOS packages must be returned from cscript as tuples of (dmg-filename, bundle-id)')
-            if notarize:
-                notarize_dmg(x[0], x[1])
-        self._copy_packages(tree, [x[0] for x in p], output_dir)
+        p = self._cscript_package_and_notarize(tree, options, notarize)
+        self._copy_packages(tree, p, output_dir)
 
 
 class OSXUniversalTarget(OSXTarget):
     def __init__(self, archs, directory=None):
         super(OSXUniversalTarget, self).__init__(directory)
         self.archs = archs
-
-    def package(self, project, checkout, output_dir, options, notarize):
-
-        sdk = config.get('osx_sdk')
+        self.sdk = config.get('osx_sdk')
         for a in self.archs:
             if a.find('arm') != -1:
-                sdk = '11.0'
+                self.sdk = '11.0'
 
+    def package(self, project, checkout, output_dir, options, notarize):
         for a in self.archs:
-            target = OSXSingleTarget(a, sdk, os.path.join(self.directory, a))
+            target = OSXSingleTarget(a, self.sdk, os.path.join(self.directory, a))
             target.ccache = self.ccache
             tree = globals.trees.get(project, checkout, target)
             tree.build_dependencies(options)
@@ -844,8 +853,7 @@ class OSXUniversalTarget(OSXTarget):
         self.unlock_keychain()
         tree = globals.trees.get(project, checkout, self)
         with TreeDirectory(tree):
-            self._build_packages(tree, options)
-            for p in packages:
+            for p in self._cscript_package_and_notarize(tree, options, notarize):
                 copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p))))
 
 class SourceTarget(Target):
@@ -906,13 +914,10 @@ 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-32-64':
-        # Universal Intel 32/64-bit built for config's os_sdk
-        if args.command == 'build':
-            target = OSXSingleTarget('x86_64', args.work)
-        else:
-            target = OSXUniversalTarget(('i386', 'x86_64'), args.work)
-    elif s == 'osx-arm-intel-64':
+    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':