Support environment_version for macOS.

[cdist.git] / cdist

diff --git a/cdist b/cdist
index 28995f249149ca970798379092cd8bee63f77b1a..fcc34b57bfe3769dc54c9da8ff61afe1c8a90e3a 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -327,61 +327,6 @@ class TreeDirectory:
     def __exit__(self, type, value, traceback):
         os.chdir(self.cwd)
 
-#
-# Version
-#
-
-class Version:
-    def __init__(self, s):
-        self.devel = False
-
-        if s.startswith("'"):
-            s = s[1:]
-        if s.endswith("'"):
-            s = s[0:-1]
-
-        if s.endswith('devel'):
-            s = s[0:-5]
-            self.devel = True
-
-        if s.endswith('pre'):
-            s = s[0:-3]
-
-        p = s.split('.')
-        self.major = int(p[0])
-        self.minor = int(p[1])
-        if len(p) == 3:
-            self.micro = int(p[2])
-        else:
-            self.micro = 0
-
-    @classmethod
-    def from_git_tag(cls, tag):
-        bits = tag.split('-')
-        c = cls(bits[0])
-        if len(bits) > 1 and int(bits[1]) > 0:
-            c.devel = True
-        return c
-
-    def bump_minor(self):
-        self.minor += 1
-        self.micro = 0
-
-    def bump_micro(self):
-        self.micro += 1
-
-    def to_devel(self):
-        self.devel = True
-
-    def to_release(self):
-        self.devel = False
-
-    def __str__(self):
-        s = '%d.%d.%d' % (self.major, self.minor, self.micro)
-        if self.devel:
-            s += 'devel'
-
-        return s
 
 #
 # Targets
@@ -670,7 +615,7 @@ class WindowsNativeTarget(Target):
         super().__init__('windows', directory)
         self.bits = 64
 
-        self.environment_prefix = config.get('windows_native_environmnet_prefix')
+        self.environment_prefix = config.get('windows_native_environment_prefix')
 
         self.set('PATH', '%s/bin:%s' % (self.environment_prefix, os.environ['PATH']))
 
@@ -782,10 +727,12 @@ def notarize_dmg(dmg):
 
 
 class OSXTarget(Target):
-    def __init__(self, directory=None):
+    def __init__(self, directory=None, environment_version=None):
         super(OSXTarget, self).__init__('osx', directory)
         self.sdk_prefix = config.get('osx_sdk_prefix')
         self.environment_prefix = config.get('osx_environment_prefix')
+        if environment_version:
+            self.environment_prefix += '_%s' % environment_version
         self.apple_id = config.get('apple_id')
         self.apple_password = config.get('apple_password')
         self.osx_keychain_file = config.get('osx_keychain_file')
@@ -826,8 +773,8 @@ class OSXTarget(Target):
 
 
 class OSXSingleTarget(OSXTarget):
-    def __init__(self, arch, sdk, deployment, directory=None, can_notarize=True):
-        super(OSXSingleTarget, self).__init__(directory)
+    def __init__(self, arch, sdk, deployment, directory=None, can_notarize=True, environment_version=None):
+        super(OSXSingleTarget, self).__init__(directory=directory, environment_version=environment_version)
         self.arch = arch
         self.sdk = sdk
         self.deployment = deployment
@@ -836,10 +783,10 @@ class OSXSingleTarget(OSXTarget):
 
         flags = '-isysroot %s/MacOSX%s.sdk -arch %s' % (self.sdk_prefix, sdk, arch)
         if arch == 'x86_64':
-            host_enviro = '%s/x86_64/%s' % (config.get('osx_environment_prefix'), deployment)
+            host_enviro = '%s/x86_64/%s' % (self.environment_prefix, deployment)
         else:
-            host_enviro = '%s/x86_64/10.10' % config.get('osx_environment_prefix')
-        target_enviro = '%s/%s/%s' % (config.get('osx_environment_prefix'), arch, deployment)
+            host_enviro = '%s/x86_64/10.10' % self.environment_prefix
+        target_enviro = '%s/%s/%s' % (self.environment_prefix, arch, deployment)
 
         self.bin = '%s/bin' % target_enviro
 
@@ -867,12 +814,12 @@ class OSXSingleTarget(OSXTarget):
 
 
 class OSXUniversalTarget(OSXTarget):
-    def __init__(self, directory=None):
-        super(OSXUniversalTarget, self).__init__(directory)
+    def __init__(self, directory=None, environment_version=None):
+        super(OSXUniversalTarget, self).__init__(directory=directory, environment_version=environment_version)
         self.sdk = config.get('osx_sdk')
         self.sub_targets = []
         for arch, deployment in (('x86_64', config.get('osx_intel_deployment')), ('arm64', config.get('osx_arm_deployment'))):
-            target = OSXSingleTarget(arch, self.sdk, deployment, os.path.join(self.directory, arch, deployment))
+            target = OSXSingleTarget(arch, self.sdk, deployment, os.path.join(self.directory, arch, deployment), environment_version=environment_version)
             target.ccache = self.ccache
             self.sub_targets.append(target)
         self.can_notarize = True
@@ -972,11 +919,11 @@ def target_factory(args):
     elif s == 'raspbian':
         target = LinuxTarget(s, None, None, args.work)
     elif s == 'osx':
-        target = OSXUniversalTarget(args.work)
+        target = OSXUniversalTarget(args.work, environment_version=args.environment_version)
     elif s == 'osx-intel':
-        target = OSXSingleTarget('x86_64', config.get('osx_sdk'), config.get('osx_intel_deployment'), args.work)
+        target = OSXSingleTarget('x86_64', config.get('osx_sdk'), config.get('osx_intel_deployment'), args.work, environment_version=args.environment_version)
     elif s == 'osx-old':
-        target = OSXSingleTarget('x86_64', config.get('osx_sdk'), config.get('osx_old_deployment'), args.work, False)
+        target = OSXSingleTarget('x86_64', config.get('osx_sdk'), config.get('osx_old_deployment'), args.work, False, environment_version=args.environment_version)
     elif s == 'source':
         target = SourceTarget()
     elif s == 'flatpak':
@@ -1069,19 +1016,11 @@ class Tree:
                     path = path.split(' ')[1]
                     command('git -c protocol.file.allow=always submodule --quiet update %s %s' % (ref, path))
 
-        if os.path.exists('%s/wscript' % proj):
-            v = read_wscript_variable(proj, "VERSION");
-            if v is not None:
-                try:
-                    self.version = Version(v)
-                except:
-                    try:
-                        tag = command_and_read('git -C %s describe --match v* --tags' % proj)[0][1:]
-                        self.version = Version.from_git_tag(tag)
-                    except:
-                        # We'll leave version as None if we can't read it; maybe this is a bad idea
-                        # Should probably just install git on the Windows VM
-                        pass
+        head_tag = command_and_read(f'git -C {proj} tag -l --points-at HEAD')
+        if head_tag:
+            self.version = head_tag[0][1:]
+        else:
+            self.version = command_and_read(f'git -C {proj} rev-parse --short HEAD')[0]
 
         os.chdir(cwd)