Merge pull request #3988 from OpenShot/mac-builder-fixes-2

Fix Mac OS Git *.log files (on Mac builder)

Author: jonoomph

installer/build-mac-dmg.sh

@@ -28,6 +28,8 @@ mv "$OS_PATH/MacOS/lib/presets" "$OS_PATH/Resources/presets"; ln -s "../../Resou
 mv "$OS_PATH/MacOS/lib/profiles" "$OS_PATH/Resources/profiles"; ln -s "../../Resources/profiles" "$OS_PATH/MacOS/lib/profiles";
 mv "$OS_PATH/MacOS/lib/resources" "$OS_PATH/Resources/resources"; ln -s "../../Resources/resources" "$OS_PATH/MacOS/lib/resources";
 mv "$OS_PATH/MacOS/lib/settings" "$OS_PATH/Resources/settings"; ln -s "../../Resources/settings" "$OS_PATH/MacOS/lib/settings";
+mv "$OS_PATH/MacOS/settings/*.log" "$OS_PATH/Resources/settings"; # Copy *.log files into settings
+rmdir "$OS_PATH/MacOS/settings/"; # remove settings dir (created by freeze, *.log files)
 mv "$OS_PATH/MacOS/lib/tests" "$OS_PATH/Resources/tests"; ln -s "../../Resources/tests" "$OS_PATH/MacOS/lib/tests";
 mv "$OS_PATH/MacOS/lib/timeline" "$OS_PATH/Resources/timeline"; ln -s "../../Resources/timeline" "$OS_PATH/MacOS/lib/timeline";
 mv "$OS_PATH/MacOS/lib/titles" "$OS_PATH/Resources/titles"; ln -s "../../Resources/titles" "$OS_PATH/MacOS/lib/titles";

installer/fix_qt5_rpath.py

@@ -59,7 +59,9 @@ def fix_rpath(PATH):
 def print_min_versions(PATH):
     """Print ALL MINIMUM and SDK VERSIONS for files in OpenShot build folder.
     This does not list all dependent libraries though, and sometimes one of those can cause issues."""
+    # Use 2 different matches, due to different output from different libraries (depending on compiler)
     REGEX_SDK_MATCH = re.compile(r'.*(LC_VERSION_MIN_MACOSX).*version (\d+\.\d+).*sdk (\d+\.\d+).*(cmd)', re.DOTALL)
+    REGEX_SDK_MATCH2 = re.compile(r'.*sdk\s(.*)\s*minos\s(.*)')
     VERSIONS = {}
 
     # Find files matching patterns
@@ -74,9 +76,17 @@ def print_min_versions(PATH):
 
            raw_output = subprocess.Popen(["oTool", "-l", file_path], stdout=subprocess.PIPE).communicate()[0].decode('utf-8')
            matches = REGEX_SDK_MATCH.findall(raw_output)
+           matches2 = REGEX_SDK_MATCH2.findall(raw_output)
+           min_version = None
+           sdk_version = None
            if matches and len(matches[0]) == 4:
                min_version = matches[0][1]
                sdk_version = matches[0][2]
+           elif matches2 and len(matches2[0]) == 2:
+               sdk_version = matches2[0][0]
+               min_version = matches2[0][1]
+
+           if min_version and sdk_version:
                print("... scanning %s for min version (min: %s, sdk: %s)" % (file_path.replace(PATH, ""),
                                                                              min_version, sdk_version))
 
@@ -86,7 +96,7 @@ def print_min_versions(PATH):
                        VERSIONS[min_version].append(file_path)
                else:
                    VERSIONS[min_version] = [file_path]
-               if min_version in ['10.14', '10.15']:
+               if min_version in ['11.0']:
                    print("ERROR!!!! Minimum OS X version not met for %s" % file_path)
 
     print("\nSummary of Minimum Mac SDKs for Dependencies:")
@@ -95,6 +105,9 @@ def print_min_versions(PATH):
         for file_path in VERSIONS[key]:
             print("  %s" % file_path)
 
+    print("\nCount of Minimum Mac SDKs for Dependencies:")
+    for key in sorted(VERSIONS.keys()):
+        print("%s (%d)" % (key, len(VERSIONS[key])))
 
 if __name__ == "__main__":
     """Run these methods manually for testing"""