From 2f0fa28e5836f2ff2d2e92bf8b9ca083ec5ce7f2 Mon Sep 17 00:00:00 2001
From: Kazunari Sekigawa <kazunari.sekigawa@gmail.com>
Date: Sat, 10 Oct 2020 07:09:34 +0900
Subject: [PATCH] * Updated the build system for Mac (#645)

* Catalina env. uses Python 3.8 in MacPorts, Homebrew, and Anaconda3.
---
 macbuild/ReadMe.md                     |  46 ++--
 macbuild/Resources/script-bundle-A.zip | Bin 4361604 -> 4361659 bytes
 macbuild/Resources/script-bundle-B.zip | Bin 4371595 -> 4371668 bytes
 macbuild/Resources/script-bundle-P.zip | Bin 4396762 -> 4396838 bytes
 macbuild/build4mac.py                  | 152 ++++++++------
 macbuild/build4mac_env.py              |  38 ++--
 macbuild/build4mac_util.py             | 146 +++++++++----
 macbuild/macQAT.py                     | 278 +++++++++++++++++++++++++
 macbuild/makeDMG4mac.py                |  14 +-
 9 files changed, 521 insertions(+), 153 deletions(-)
 create mode 100755 macbuild/macQAT.py

diff --git a/macbuild/ReadMe.md b/macbuild/ReadMe.md
index 4f87e9616..09344755b 100644
--- a/macbuild/ReadMe.md
+++ b/macbuild/ReadMe.md
@@ -1,4 +1,4 @@
-Relevant KLayout version: 0.26.5
+Relevant KLayout version: 0.26.7
 
 # 1. Introduction
 This directory **`macbuild`** contains different files required for building KLayout (http://www.klayout.de/) version 0.26.1 or later for different 64-bit Mac OSXs including:
@@ -72,16 +72,16 @@ $ [python] ./build4mac.py
                         :   MP26: use Ruby 2.6 from MacPorts                             |
                         :   HB27: use Ruby 2.7 from Homebrew                             |
                         :   Ana3: use Ruby 2.5 from Anaconda3                            |
-   [-p|--python <type>] : case-insensitive type=['nil', 'Sys', 'MP37', 'HB37', 'Ana3']   | sys
+   [-p|--python <type>] : case-insensitive type=['nil', 'Sys', 'MP38', 'HB38', 'Ana3']   | sys
                         :    nil: don't bind Python                                      |
                         :    Sys: use OS-bundled Python 2.7 [ElCapitan -- Catalina]      |
-                        :   MP37: use Python 3.7 from MacPorts                           |
-                        :   HB37: use Python 3.7 from Homebrew                           |
-                        :   Ana3: use Python 3.7 from Anaconda3                          |
+                        :   MP38: use Python 3.8 from MacPorts                           |
+                        :   HB38: use Python 3.8 from Homebrew                           |
+                        :   Ana3: use Python 3.8 from Anaconda3                          |
    [-n|--noqtbinding]   : don't create Qt bindings for ruby scripts                      | disabled
    [-m|--make <option>] : option passed to 'make'                                        | '-j4'
    [-d|--debug]         : enable debug mode build                                        | disabled
-   [-c|--checkcom]      : check command-line and exit without building                   | disabled
+   [-c|--checkcom]      : check command line and exit without building                   | disabled
    [-y|--deploy]        : deploy executables and dylibs including Qt's Frameworks        | disabled
    [-Y|--DEPLOY]        : deploy executables and dylibs for those who built KLayout      | disabled
                         : from the source code and use the tools in the same machine     |
@@ -126,64 +126,64 @@ Then the directory name will be **`LW-qt5MP.pkg.macos-Catalina-release-RsysPsys`
 
 #### If you build KLayout from the source code AND use it on the same machine, "-Y" option is highly recommended. ####
 
-### 6B. Fully MacPorts-flavored build with MacPorts Ruby 2.6 and MacPorts Python 3.7
+### 6B. Fully MacPorts-flavored build with MacPorts Ruby 2.6 and MacPorts Python 3.8
 ```
 $ cd /where/'build.sh'/exists
-$ ./build4mac.py -q qt5macports -r mp26 -p mp37
+$ ./build4mac.py -q qt5macports -r mp26 -p mp38
 ```
 2. Confirm successful build (it will take about one hour depending on your machine spec).
 3. Run **`build4mac.py`** again with the same options used in 1. PLUS "-Y" to deploy executables and libraries under **`klayout.app`** bundle.<br>
    The buddy command-line tools (strm*) will also be deployed in this step.
 ```
-$ ./build4mac.py -q qt5macports -r mp26 -p mp37 -Y
+$ ./build4mac.py -q qt5macports -r mp26 -p mp38 -Y
 ```
   The application bundle **`klayout.app`** is located under:<br>
-  **`LW-qt5MP.pkg.macos-Catalina-release-Rmp26Pmp37`** directory, where
+  **`LW-qt5MP.pkg.macos-Catalina-release-Rmp26Pmp38`** directory, where
 * "LW-"        means that this is a lightweight package.
 * "qt5MP"      means that Qt5 from MacPorts is used.
-* "Rmp26Pmp37" means that Ruby is 2.6 from MacPorts; Python is 3.7 from MacPorts.
+* "Rmp26Pmp38" means that Ruby is 2.6 from MacPorts; Python is 3.8 from MacPorts.
 4. Copy/move the generated application bundle **`klayout.app`** to your **`/Applications`** directory for installation.
 
-### 6C. Fully Homebrew-flavored build with Homebrew Ruby 2.7 and Homebrew Python 3.7
+### 6C. Fully Homebrew-flavored build with Homebrew Ruby 2.7 and Homebrew Python 3.8
 ```
 $ cd /where/'build.sh'/exists
-$ ./build4mac.py -q qt5brew -r hb27 -p hb37
+$ ./build4mac.py -q qt5brew -r hb27 -p hb38
 ```
 2. Confirm successful build (it will take about one hour depending on your machine spec).
 3. Run **`build4mac.py`** again with the same options used in 1. PLUS "-Y" to deploy executables and libraries under **`klayout.app`** bundle.<br>
    The buddy command-line tools (strm*) will also be deployed in this step.
 ```
-$ ./build4mac.py -q qt5brew -r hb27 -p hb37 -Y
+$ ./build4mac.py -q qt5brew -r hb27 -p hb38 -Y
 ```
   The application bundle **`klayout.app`** is located under:<br>
-  **`LW-qt5Brew.pkg.macos-Catalina-release-Rhb27Phb37`** directory, where
+  **`LW-qt5Brew.pkg.macos-Catalina-release-Rhb27Phb38`** directory, where
 * "LW-"        means that this is a lightweight package.
 * "qt5Brew"    means that Qt5 from Homebrew is used.
-* "Rhb27Phb37" means that Ruby is 2.7 from Homebrew; Python is 3.7 from Homebrew.
+* "Rhb27Phb38" means that Ruby is 2.7 from Homebrew; Python is 3.8 from Homebrew.
 4. Copy/move the generated application bundle **`klayout.app`** to your **`/Applications`** directory for installation.
 
-### 6D. Partially Homebrew-flavored build with System Ruby and Homebrew Python 3.7
+### 6D. Partially Homebrew-flavored build with System Ruby and Homebrew Python 3.8
 ```
 $ cd /where/'build.sh'/exists
-$ ./build4mac.py -q qt5brew -r sys -p hb37
+$ ./build4mac.py -q qt5brew -r sys -p hb38
 ```
 2. Confirm successful build (it will take about one hour depending on your machine spec).
 3. Run **`build4mac.py`** again with the same options used in 1. PLUS "-y" to deploy executables and libraries (including Qt's frameworks and Python frameworks) under **`klayout.app`** bundle.<br>
    The buddy command-line tools (strm*) will also be deployed in this step.
 ```
-$ ./build4mac.py -q qt5brew -r sys -p hb37 -y
+$ ./build4mac.py -q qt5brew -r sys -p hb38 -y
 ```
   The application bundle **`klayout.app`** is located under:<br>
-  **`HW-qt5Brew.pkg.macos-Catalina-release-RsysPhb37`** directory, where
+  **`HW-qt5Brew.pkg.macos-Catalina-release-RsysPhb38`** directory, where
 * "HW-"        means that this is a heavyweight package because both Qt5 and Python are deployed.
 * "qt5Brew"    means that Qt5 from Homebrew is used.
-* "RsysPhb37"  means that Ruby is OS-bundled; Python is 3.7 from Homebrew.
+* "RsysPhb38"  means that Ruby is OS-bundled; Python is 3.8 from Homebrew.
 4. Copy/move the generated application bundle **`klayout.app`** to your **`/Applications`** directory for installation.
 ### Important ###
 So far, deployment of Homebrew Ruby is not supported. <br>
 Therefore, if you intend to use "-y" option, you need to use "-r sys" for building.
 
-### 6E. Fully Anaconda3-flavored build with Anaconda3 Ruby 2.5 and Anaconda3 Python 3.7
+### 6E. Fully Anaconda3-flavored build with Anaconda3 Ruby 2.5 and Anaconda3 Python 3.8
 ```
 $ cd /where/'build.sh'/exists
 $ ./build4mac.py -q qt5ana3 -r ana3 -p ana3
@@ -198,7 +198,7 @@ $ ./build4mac.py -q qt5ana3 -r ana3 -p ana3 -Y
   **`LW-qt5Ana3.pkg.macos-Catalina-release-Rana3Pana3`** directory, where
 * "LW-"        means that this is a lightweight package.
 * "qt5Ana3"    means that Qt5 from Anaconda3 is used.
-* "Rana3Pana3" means that Ruby (2.5) is from Anaconda3; Python (3.7) is from Anaconda3.
+* "Rana3Pana3" means that Ruby (2.5) is from Anaconda3; Python (3.8) is from Anaconda3.
 4. Copy/move the generated application bundle **`klayout.app`** to your **`/Applications`** directory for installation.
 5. You may have to set `PYTHONHOME` environment variable like:
 ```
diff --git a/macbuild/Resources/script-bundle-A.zip b/macbuild/Resources/script-bundle-A.zip
index 990050af7154626e13a66edb57c08b4958682ffa..eda075de59cdc42fd81e4695e0150993088dc706 100644
GIT binary patch
delta 4576
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

delta 4468
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

diff --git a/macbuild/Resources/script-bundle-B.zip b/macbuild/Resources/script-bundle-B.zip
index 253e8ae6b81b08a5caa9a6f953cf43e5ec06e604..0a8dfe89320848cbaafd1a81a364714eefdf938c 100644
GIT binary patch
delta 7727
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

delta 7791
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

diff --git a/macbuild/Resources/script-bundle-P.zip b/macbuild/Resources/script-bundle-P.zip
index d8b11fa063408653277ca0a070e1a1baf1aae7ed..afdc90968bc6d5447336bc14323faae4e3d1d56b 100644
GIT binary patch
delta 5671
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
UVzb^y;ZkvuEO#4?2wq?R4=iv%{Qv*}

delta 5525
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
b5cMyHE=DopML!3E7=R+p8Ph|C9vlA$cX%Qr

diff --git a/macbuild/build4mac.py b/macbuild/build4mac.py
index d5bc8732a..d9a99e74c 100755
--- a/macbuild/build4mac.py
+++ b/macbuild/build4mac.py
@@ -73,11 +73,11 @@ def SetGlobals():
   Usage += "                        :   MP26: use Ruby 2.6 from MacPorts                             | \n"
   Usage += "                        :   HB27: use Ruby 2.7 from Homebrew                             | \n"
   Usage += "                        :   Ana3: use Ruby 2.5 from Anaconda3                            | \n"
-  Usage += "   [-p|--python <type>] : case-insensitive type=['nil', 'Sys', 'MP37', 'HB37', 'Ana3']   | sys \n"
+  Usage += "   [-p|--python <type>] : case-insensitive type=['nil', 'Sys', 'MP38', 'HB38', 'Ana3']   | sys \n"
   Usage += "                        :    nil: don't bind Python                                      | \n"
   Usage += "                        :    Sys: use OS-bundled Python 2.7 [ElCapitan -- Catalina]      | \n"
-  Usage += "                        :   MP37: use Python 3.7 from MacPorts                           | \n"
-  Usage += "                        :   HB37: use Python 3.7 from Homebrew                           | \n"
+  Usage += "                        :   MP38: use Python 3.8 from MacPorts                           | \n"
+  Usage += "                        :   HB38: use Python 3.8 from Homebrew                           | \n"
   Usage += "                        :   Ana3: use Python 3.7 from Anaconda3                          | \n"
   Usage += "   [-n|--noqtbinding]   : don't create Qt bindings for ruby scripts                      | disabled \n"
   Usage += "   [-m|--make <option>] : option passed to 'make'                                        | '-j4' \n"
@@ -195,7 +195,7 @@ def ParseCommandLineArguments():
 
   p.add_option( '-p', '--python',
                 dest='type_python',
-                help="Python type=['nil', 'Sys', 'MP37', 'HB37', 'Ana3']" )
+                help="Python type=['nil', 'Sys', 'MP38', 'HB38', 'Ana3']" )
 
   p.add_option( '-n', '--noqtbinding',
                 action='store_true',
@@ -332,8 +332,8 @@ def ParseCommandLineArguments():
   candidates         = dict()
   candidates['NIL']  = 'nil'
   candidates['SYS']  = 'Sys'
-  candidates['MP37'] = 'MP37'
-  candidates['HB37'] = 'HB37'
+  candidates['MP38'] = 'MP38'
+  candidates['HB38'] = 'HB38'
   candidates['ANA3'] = 'Ana3'
   try:
     choicePython = candidates[ opt.type_python.upper() ]
@@ -355,11 +355,11 @@ def ParseCommandLineArguments():
         ModulePython = 'PythonSierra'
       elif Platform == "ElCapitan":
         ModulePython = 'PythonElCapitan'
-    elif choicePython == "MP37":
-      ModulePython = 'Python37MacPorts'
+    elif choicePython == "MP38":
+      ModulePython = 'Python38MacPorts'
       NonOSStdLang = True
-    elif choicePython == "HB37":
-      ModulePython = 'Python37Brew'
+    elif choicePython == "HB38":
+      ModulePython = 'Python38Brew'
       NonOSStdLang = True
     elif choicePython == "Ana3":
       ModulePython = 'PythonAnaconda3'
@@ -374,12 +374,12 @@ def ParseCommandLineArguments():
   # Set of modules chosen
   ModuleSet = ( choiceQt5, choiceRuby, choicePython )
 
-  NoQtBindings  = opt.no_qt_binding
-  MakeOptions   = opt.make_option
-  DebugMode     = opt.debug_build
-  CheckComOnly  = opt.check_command
-  DeploymentF   = opt.deploy_full
-  DeploymentP   = opt.deploy_partial
+  NoQtBindings = opt.no_qt_binding
+  MakeOptions  = opt.make_option
+  DebugMode    = opt.debug_build
+  CheckComOnly = opt.check_command
+  DeploymentF  = opt.deploy_full
+  DeploymentP  = opt.deploy_partial
 
   if DeploymentF and DeploymentP:
     print("")
@@ -409,9 +409,9 @@ def ParseCommandLineArguments():
       if (ModuleRuby in RubySys) and (ModulePython in PythonSys):
         PackagePrefix = "ST-"
         message      += "a standard (ST-) package including Qt5 and using OS-bundled Ruby and Python..."
-      elif ModulePython == 'Python37Brew':
+      elif ModulePython == 'Python38Brew':
         PackagePrefix = "HW-"
-        message      += "a heavyweight (HW-) package including Qt5 and Python3.7 from Homebrew..."
+        message      += "a heavyweight (HW-) package including Qt5 and Python3.8 from Homebrew..."
       else:
         PackagePrefix = "EX-"
         message      += "a package with exceptional (EX-) combinations of different modules..."
@@ -593,6 +593,7 @@ def RunMainBuildBash():
       os.remove( tarFile )
       os.chdir( "../" )
       shutil.copy2( "macbuild/macQAT.sh", MacBuildDirQAT )
+      shutil.copy2( "macbuild/macQAT.py", MacBuildDirQAT )
       print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
       print( "### <%s>: prepared the initial *.macQAT/" % myscript, file=sys.stderr )
       print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
@@ -905,10 +906,6 @@ def DeployBinariesForBundle():
       deploytool = Qt5MacPorts['deploy']
       app_bundle = "klayout.app"
       options    = macdepQtOpt + verbose
-    # To use Qt5 from Homebrew on Catalina...
-    #   in "/usr/local/opt/python/lib/"
-    #         Python.framework -> ../Frameworks/Python.framework/ <=== this symbolic was needed
-    #         pkgconfig/
     elif ModuleQt == 'Qt5Brew':
       deploytool = Qt5Brew['deploy']
       app_bundle = "klayout.app"
@@ -932,39 +929,52 @@ def DeployBinariesForBundle():
       os.chdir(ProjectDir)
       return 1
 
-    #-------------------------------------------------------------
-    # [9] Special deployment of Python3.7 from Homebrew
-    #-------------------------------------------------------------
-    deploymentPython37HB = (ModulePython == 'Python37Brew')
-    if deploymentPython37HB and NonOSStdLang:
+    #-----------------------------------------------------------------------------------------------
+    # [9] Special deployment of Python3.8 from Homebrew
+    #     To use Python3.8 from Homebrew on Catalina...
+    #       in "/usr/local/opt/python/lib/"
+    #             Python.framework -> ../Frameworks/Python.framework/ <=== this symbolic was needed
+    #             pkgconfig/
+    #-----------------------------------------------------------------------------------------------
+    deploymentPython38HB = (ModulePython == 'Python38Brew')
+    if deploymentPython38HB and NonOSStdLang:
       from build4mac_util import WalkFrameworkPaths, PerformChanges
 
-      bundlePath = AbsMacPkgDir + '/klayout.app'
-      bundleExecPathAbs = '%s/Contents/MacOS/' % bundlePath
+      pythonHBVer         = "3.8" # 'pinned' to this version as of KLayout version 0.26.7 (2020-09-13)
+      bundlePath          = AbsMacPkgDir + '/klayout.app'
+      bundleExecPathAbs   = '%s/Contents/MacOS/' % bundlePath
       pythonFrameworkPath = '%s/Contents/Frameworks/Python.framework' % bundlePath
+      testTarget          = '%s/Versions/%s/lib/python%s/test' % (pythonFrameworkPath, pythonHBVer, pythonHBVer)
+      resourceTarget1     = '%s/Versions/%s/Resources' % (pythonFrameworkPath, pythonHBVer)
+      resourceTarget2     = '%s/Resources' % pythonFrameworkPath
+      binTarget           = '%s/Versions/%s/bin' % (pythonFrameworkPath, pythonHBVer)
+      sitepackagesTarget  = '%s/Versions/%s/lib/python%s/site-packages' % (pythonFrameworkPath, pythonHBVer, pythonHBVer)
+      sitepackagesSource  = '%s/Versions/%s/lib/python%s/site-packages' % (HBPython38FrameworkPath, pythonHBVer, pythonHBVer)
 
       print( "" )
-      print( " [9] Optional deployment of Python from %s ..." % HBPython37FrameworkPath )
+      print( " [9] Optional deployment of Python from %s ..." % HBPython38FrameworkPath )
       print( "  [9.1] Copying Python Framework" )
 
-      cmd1 = "rm -rf %s" % pythonFrameworkPath
-      cmd2 = "rsync -a --safe-links %s/ %s" % (HBPython37FrameworkPath, pythonFrameworkPath)
-      cmd3 = "mkdir %s/Versions/3.7/lib/python3.7/site-packages/" % pythonFrameworkPath
-      cmd4 = "cp -RL %s/Versions/3.7/lib/python3.7/site-packages/{pip*,pkg_resources,setuptools*,wheel*} " % \
-              HBPython37FrameworkPath
-      cmd4 += "%s/Versions/3.7/lib/python3.7/site-packages/" % pythonFrameworkPath
-      cmd5 = "rm -rf %s/Versions/3.7/lib/python3.7/test" % pythonFrameworkPath
-      cmd6 = "rm -rf %s/Versions/3.7/Resources" % pythonFrameworkPath
-      cmd7 = "rm -rf %s/Versions/3.7/bin" % pythonFrameworkPath
+      cmd01 = "rm -rf %s" % pythonFrameworkPath
+      cmd02 = "rsync -a --safe-links %s/ %s" % (HBPython38FrameworkPath, pythonFrameworkPath)
+
+      cmd03 = "rm -rf %s" % testTarget
+      cmd04 = "rm -rf %s" % resourceTarget1
+      cmd05 = "unlink %s" % resourceTarget2
+      cmd06 = "rm -rf %s" % binTarget
+
+      cmd07 = "mkdir %s" % sitepackagesTarget
+      cmd08 = "cp -RL %s/{pip*,pkg_resources,setuptools*,wheel*} %s" % (sitepackagesSource, sitepackagesTarget)
 
       shell_commands = list()
-      shell_commands.append(cmd1)
-      shell_commands.append(cmd2)
-      shell_commands.append(cmd3)
-      shell_commands.append(cmd4)
-      shell_commands.append(cmd5)
-      shell_commands.append(cmd6)
-      shell_commands.append(cmd7)
+      shell_commands.append(cmd01)
+      shell_commands.append(cmd02)
+      shell_commands.append(cmd03)
+      shell_commands.append(cmd04)
+      shell_commands.append(cmd05)
+      shell_commands.append(cmd06)
+      shell_commands.append(cmd07)
+      shell_commands.append(cmd08)
 
       for command in shell_commands:
         if subprocess.call( command, shell=True ) != 0:
@@ -973,14 +983,15 @@ def DeployBinariesForBundle():
           sys.exit(1)
 
       shutil.copy2( sourceDir2 + "/start-console.py", targetDirM )
-      shutil.copy2( sourceDir2 + "/klayout_console", targetDirM )
-      os.chmod( targetDirM + "/klayout_console",      0o0755 )
+      shutil.copy2( sourceDir2 + "/klayout_console",  targetDirM )
+      os.chmod( targetDirM + "/start-console.py", 0o0755 )
+      os.chmod( targetDirM + "/klayout_console",  0o0755 )
 
       print("  [9.2] Relinking dylib dependencies inside Python.framework" )
       print("   [9.2.1] Patching Python Framework" )
       depdict = WalkFrameworkPaths( pythonFrameworkPath )
       appPythonFrameworkPath = '@executable_path/../Frameworks/Python.framework/'
-      PerformChanges(depdict, [(HBPython37FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
+      PerformChanges(depdict, [(HBPython38FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
 
       print("   [9.2.2] Patching /usr/local/opt/ libs")
       usrLocalPath = '/usr/local/opt/'
@@ -989,17 +1000,16 @@ def DeployBinariesForBundle():
       depdict = WalkFrameworkPaths(pythonFrameworkPath, search_path_filter=r'\t+/usr/local/(opt|Cellar)')
       PerformChanges(depdict, replacePairs, bundleExecPathAbs)
 
-      print("   [9.2.3] Patching openssl, gdbm, readline, sqlite, tcl-tk, xz")
+      print("   [9.2.3] Patching openssl@1.1, gdbm, readline, sqlite, xz")
       usrLocalPath = '/usr/local/opt'
       appUsrLocalPath = '@executable_path/../Frameworks/'
       replacePairs = [(usrLocalPath, appUsrLocalPath, True)]
-      replacePairs.extend([(openssl_version, '@executable_path/../Frameworks/openssl', True)
-        for openssl_version in glob.glob('/usr/local/Cellar/openssl/*')])
-      depdict = WalkFrameworkPaths([pythonFrameworkPath + '/../openssl',
+      replacePairs.extend([(openssl_version, '@executable_path/../Frameworks/openssl@1.1', True)
+        for openssl_version in glob.glob('/usr/local/Cellar/openssl@1.1/*')])
+      depdict = WalkFrameworkPaths([pythonFrameworkPath + '/../openssl@1.1',
                                     pythonFrameworkPath + '/../gdbm',
                                     pythonFrameworkPath + '/../readline',
                                     pythonFrameworkPath + '/../sqlite',
-                                    pythonFrameworkPath + '/../tcl-tk',
                                     pythonFrameworkPath + '/../xz'], search_path_filter=r'\t+/usr/local/(opt|Cellar)')
 
       PerformChanges(depdict, replacePairs, bundleExecPathAbs)
@@ -1007,21 +1017,21 @@ def DeployBinariesForBundle():
       print("  [9.3] Relinking dylib dependencies for klayout")
       klayoutPath = bundleExecPathAbs
       depdict = WalkFrameworkPaths(klayoutPath, filter_regex=r'klayout$')
-      PerformChanges(depdict, [(HBPython37FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
+      PerformChanges(depdict, [(HBPython38FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
 
       libKlayoutPath = bundleExecPathAbs + '../Frameworks'
       depdict = WalkFrameworkPaths(libKlayoutPath, filter_regex=r'libklayout')
-      PerformChanges(depdict, [(HBPython37FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
+      PerformChanges(depdict, [(HBPython38FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
 
       print("  [9.4] Patching site.py, pip/, and distutils/")
-      site_module = "%s/Versions/3.7/lib/python3.7/site.py" % pythonFrameworkPath
+      site_module = "%s/Versions/%s/lib/python%s/site.py" % (pythonFrameworkPath, pythonHBVer, pythonHBVer)
       with open(site_module, 'r') as site:
         buf = site.readlines()
       with open(site_module, 'w') as site:
         import re
         for line in buf:
           # This will fool pip into thinking it's inside a virtual environment
-          # and install new packates to the correct site-packages
+          # and install new packages to the correct site-packages
           if re.match("^PREFIXES", line) is not None:
             line = line + "sys.real_prefix = sys.prefix\n"
           # do not allow installation in the user folder.
@@ -1029,7 +1039,24 @@ def DeployBinariesForBundle():
             line = "ENABLE_USER_SITE = False\n"
           site.write(line)
 
-      pip_module = "%s/Versions/3.7/lib/python3.7/site-packages/pip/__init__.py" % pythonFrameworkPath
+      #----------------------------------------------------------------------------------
+      # Typical usage of 'pip' after installation of the DMG package
+      #
+      # $ /Applications/klayout.app/Contents/MacOS/start-console.py
+      # Warning: Populating font family aliases took 195 ms. Replace uses of missing font\
+      # family "Monospace" with one that exists to avoid this cost.
+      # Python 3.7.8 (default, Jul  4 2020, 10:17:17)
+      # [Clang 11.0.3 (clang-1103.0.32.62)] on darwin
+      # Type "help", "copyright", "credits" or "license" for more information.
+      # (KLayout Python Console)
+      # >>> import pip
+      # >>> pip.main( ['install', 'numpy'] )
+      # >>> pip.main( ['install', 'scipy'] )
+      # >>> pip.main( ['install', 'pandas'] )
+      # >>> pip.main( ['install', 'matplotlib'] )
+      #----------------------------------------------------------------------------------
+      pip_module = "%s/Versions/%s/lib/python%s/site-packages/pip/__init__.py" % \
+                   (pythonFrameworkPath, pythonHBVer, pythonHBVer)
       with open(pip_module, 'r') as pip:
         buf = pip.readlines()
       with open(pip_module, 'w') as pip:
@@ -1039,7 +1066,8 @@ def DeployBinariesForBundle():
           line = re.sub("return isolated$", "return isolated or True", line)
           pip.write(line)
 
-      distutilsconfig = "%s/Versions/3.7/lib/python3.7/distutils/distutils.cfg" % pythonFrameworkPath
+      distutilsconfig = "%s/Versions/%s/lib/python%s/distutils/distutils.cfg" % \
+                        (pythonFrameworkPath, pythonHBVer, pythonHBVer)
       with open(distutilsconfig, 'r') as file:
         buf = file.readlines()
       with open(distutilsconfig, 'w') as file:
@@ -1051,7 +1079,7 @@ def DeployBinariesForBundle():
           file.write(line)
 
     #-------------------------------------------------------------
-    # [10] Special deployment of Ruby2.6 from Homebrew?
+    # [10] Special deployment of Ruby2.7 from Homebrew?
     #-------------------------------------------------------------
     deploymentRuby26HB = (ModuleRuby == 'Ruby27Brew')
     if deploymentRuby26HB and NonOSStdLang:
@@ -1059,7 +1087,7 @@ def DeployBinariesForBundle():
       print( "" )
       print( " [10] You have reached optional deployment of Ruby from %s ..." % HBRuby27Path )
       print( "   [!!!] Sorry, the deployed package will not work properly since deployment of" )
-      print( "         Ruby2.6 from Homebrew is not yet supported." )
+      print( "         Ruby2.7 from Homebrew is not yet supported." )
       print( "         Since you have Homebrew development environment, there two options:" )
       print( "           (1) Retry to make a package with '-Y|--DEPLOY' option." )
       print( "               This will not deploy any of Qt5, Python, and Ruby from Homebrew." )
diff --git a/macbuild/build4mac_env.py b/macbuild/build4mac_env.py
index 033e574d9..b87bb8a9d 100755
--- a/macbuild/build4mac_env.py
+++ b/macbuild/build4mac_env.py
@@ -154,7 +154,7 @@ RubyDictionary  = { 'nil'           : None,
 #-----------------------------------------------------
 PythonNil = [ 'nil' ]
 PythonSys = [ 'PythonElCapitan', 'PythonSierra', 'PythonHighSierra', 'PythonMojave', 'PythonCatalina' ]
-PythonExt = [ 'Python37MacPorts', 'Python37Brew', 'PythonAnaconda3' ]
+PythonExt = [ 'Python38MacPorts', 'Python38Brew', 'PythonAnaconda3' ]
 Pythons   = PythonNil + PythonSys + PythonExt
 
 #-----------------------------------------------------
@@ -204,30 +204,30 @@ PythonCatalina  = { 'exe': '/System/Library/Frameworks/Python.framework/Versions
                     'lib': '/System/Library/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib'
                   }
 
-# Python 3.7 from MacPorts (https://www.macports.org/) *+*+*+ EXPERIMENTAL *+*+*+
-#   install with 'sudo port install python37'
-# [Key Type Name] = 'MP37'
-Python37MacPorts= { 'exe': '/opt/local/Library/Frameworks/Python.framework/Versions/3.7/bin/python3.7m',
-                    'inc': '/opt/local/Library/Frameworks/Python.framework/Versions/3.7/include/python3.7m',
-                    'lib': '/opt/local/Library/Frameworks/Python.framework/Versions/3.7/lib/libpython3.7m.dylib'
+# Python 3.8 from MacPorts (https://www.macports.org/) *+*+*+ EXPERIMENTAL *+*+*+
+#   install with 'sudo port install python38'
+# [Key Type Name] = 'MP38'
+Python38MacPorts= { 'exe': '/opt/local/Library/Frameworks/Python.framework/Versions/3.8/bin/python3.8',
+                    'inc': '/opt/local/Library/Frameworks/Python.framework/Versions/3.8/include/python3.8',
+                    'lib': '/opt/local/Library/Frameworks/Python.framework/Versions/3.8/lib/libpython3.8.dylib'
                   }
 
-# Python 3.7 from Homebrew *+*+*+ EXPERIMENTAL *+*+*+
+# Python 3.8 from Homebrew *+*+*+ EXPERIMENTAL *+*+*+
 #   install with 'brew install python'
-# [Key Type Name] = 'HB37'
-HBPython37FrameworkPath = '/usr/local/opt/python3/Frameworks/Python.framework'
-Python37Brew    = { 'exe': '%s/Versions/3.7/bin/python3.7m' % HBPython37FrameworkPath,
-                    'inc': '%s/Versions/3.7/include/python3.7m' % HBPython37FrameworkPath,
-                    'lib': '%s/Versions/3.7/lib/libpython3.7m.dylib' % HBPython37FrameworkPath
+# [Key Type Name] = 'HB38'
+HBPython38FrameworkPath = '/usr/local/opt/python3/Frameworks/Python.framework'
+Python38Brew    = { 'exe': '%s/Versions/3.8/bin/python3.8' % HBPython38FrameworkPath,
+                    'inc': '%s/Versions/3.8/include/python3.8' % HBPython38FrameworkPath,
+                    'lib': '%s/Versions/3.8/lib/libpython3.8.dylib' % HBPython38FrameworkPath
                   }
 
-# Python 3.7 bundled with anaconda3 installed under /Applications/anaconda3/ *+*+*+ EXPERIMENTAL *+*+*+
+# Python 3.8 bundled with anaconda3 installed under /Applications/anaconda3/ *+*+*+ EXPERIMENTAL *+*+*+
 # The standard installation deploys the tool under $HOME/opt/anaconda3/.
 # If so, you need to make a symbolic link: /Applications/anaconda3 ---> $HOME/opt/anaconda3/
 # [Key Type Name] = 'Ana3'
-PythonAnaconda3 = { 'exe': '/Applications/anaconda3/bin/python3.7m',
-                    'inc': '/Applications/anaconda3/include/python3.7m',
-                    'lib': '/Applications/anaconda3/lib/libpython3.7m.dylib'
+PythonAnaconda3 = { 'exe': '/Applications/anaconda3/bin/python3.8',
+                    'inc': '/Applications/anaconda3/include/python3.8',
+                    'lib': '/Applications/anaconda3/lib/libpython3.8.dylib'
                   }
 
 # Consolidated dictionary kit for Python
@@ -237,8 +237,8 @@ PythonDictionary= { 'nil'             : None,
                     'PythonHighSierra': PythonHighSierra,
                     'PythonMojave'    : PythonMojave,
                     'PythonCatalina'  : PythonCatalina,
-                    'Python37MacPorts': Python37MacPorts,
-                    'Python37Brew'    : Python37Brew,
+                    'Python38MacPorts': Python38MacPorts,
+                    'Python38Brew'    : Python38Brew,
                     'PythonAnaconda3' : PythonAnaconda3
                   }
 
diff --git a/macbuild/build4mac_util.py b/macbuild/build4mac_util.py
index ea682fe21..3c330f8fd 100755
--- a/macbuild/build4mac_util.py
+++ b/macbuild/build4mac_util.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 
-#===============================================================================
+#========================================================================================
 # File: "macbuild/build4mac_util.py"
 #
 # Here are utility functions and classes ...
@@ -9,7 +9,7 @@
 #  version 0.26.1 or later on different Apple Mac OSX platforms.
 #
 # This file is imported by 'build4mac.py' script.
-#===============================================================================
+#========================================================================================
 from __future__ import print_function  # to use print() of Python 3 in Python >= 2.7
 import sys
 import os
@@ -18,14 +18,14 @@ import string
 import subprocess
 import shutil
 
-#-------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
 ## To import global dictionaries of different modules
-#-------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
 mydir = os.path.dirname(os.path.abspath(__file__))
 sys.path.append( mydir )
 from build4mac_env  import *
 
-#------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
 ## To decompose strings obtained by 'otool -L <*.dylib>' command and to
 #  generate a dictionary of KLayout's inter-library dependency.
 #
@@ -41,7 +41,7 @@ from build4mac_env  import *
 #      :
 #
 # @return a dictionary
-#------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
 def DecomposeLibraryDependency( depstr ):
   alllines   = depstr.split('\n')
   numlines   = len(alllines)
@@ -53,13 +53,13 @@ def DecomposeLibraryDependency( depstr ):
       supporters.append(supporter)
   return { dependent: supporters }
 
-#------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
 ## To print the contents of a library dependency dictionary
 #
 # @param[in] depdic  dictionary
 # @param[in] pathdic path dictionary
 # @param[in] namedic dictionary name
-#------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
 def PrintLibraryDependencyDictionary( depdic, pathdic, namedic ):
   keys = depdic.keys()
   print("")
@@ -73,13 +73,13 @@ def PrintLibraryDependencyDictionary( depdic, pathdic, namedic ):
       if itemName != keyName and (itemName in pathdic):
         print( "    %s (%s)" % (item, pathdic[itemName]) )
 
-#------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
 ## To set and change identification name of KLayout's dylib
 #
 # @param[in] libdic  inter-library dependency dictionary
 #
 # @return 0 on success; non-zero on failure
-#------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
 def SetChangeIdentificationNameOfDyLib( libdic, pathDic ):
   cmdNameId     = XcodeToolChain['nameID']
   cmdNameChg    = XcodeToolChain['nameCH']
@@ -115,7 +115,7 @@ def SetChangeIdentificationNameOfDyLib( libdic, pathDic ):
   # for-lib
   return 0
 
-#------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
 ## To set the identification names of KLayout's libraries to an executable
 #     and make the application aware of the library locations
 #
@@ -146,7 +146,7 @@ def SetChangeIdentificationNameOfDyLib( libdic, pathDic ):
 #                                       +-- 'strmxor'
 #
 # @return 0 on success; non-zero on failure
-#------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
 def SetChangeLibIdentificationName( executable, relativedir ):
   cmdNameId  = XcodeToolChain['nameID']
   cmdNameChg = XcodeToolChain['nameCH']
@@ -181,15 +181,21 @@ def SetChangeLibIdentificationName( executable, relativedir ):
   # for-lib
   return 0
 
-def WalkLibDependencyTree( dylibPath, depth=0, filter_regex=r'\t+/usr/local/opt'):
-  NOTHINGTODO = []  # return empty list if nothing to do.
-  cmdNameId  = XcodeToolChain['nameID']
-  cmdNameChg = XcodeToolChain['nameCH']
-  otoolCm    = 'otool -L %s | grep -E "%s"' % (dylibPath, filter_regex)
-  otoolOut   = os.popen( otoolCm ).read()
-  exedepdic  = DecomposeLibraryDependency( dylibPath + ":\n" + otoolOut )
-  keys       = exedepdic.keys()
-  deplibs    = exedepdic[ list(keys)[0] ]
+#----------------------------------------------------------------------------------------
+## To make a library dependency dictionary by recursively walk down the lib hierarchy
+#
+# @param[in] dylibPath:     dylib path
+# @param[in] depth:         hierarchy depth (< 5)
+# @param[in] filter_regex:  filter regular expression
+#
+# @return a dictionary
+#----------------------------------------------------------------------------------------
+def WalkLibDependencyTree( dylibPath, depth=0, filter_regex=r'\t+/usr/local/opt' ):
+  otoolCm   = 'otool -L %s | grep -E "%s"' % (dylibPath, filter_regex)
+  otoolOut  = os.popen( otoolCm ).read()
+  exedepdic = DecomposeLibraryDependency( dylibPath + ":\n" + otoolOut )
+  keys      = exedepdic.keys()
+  deplibs   = exedepdic[ list(keys)[0] ]
 
   if depth < 5:
     if len(deplibs) > 0:
@@ -201,9 +207,19 @@ def WalkLibDependencyTree( dylibPath, depth=0, filter_regex=r'\t+/usr/local/opt'
       return deplibs
     return exedepdic
   else:
-    raise RuntimeError("Exceeded maximum recursion depth.")
+    raise RuntimeError( "Exceeded maximum recursion depth." )
 
-def WalkFrameworkPaths(frameworkPaths, filter_regex=r'\.(so|dylib)$', search_path_filter=r'\t+/usr/local/opt'):
+#----------------------------------------------------------------------------------------
+## To make a library dependency dictionary by recursively walk down the Framework
+#
+# @param[in] frameworkPaths:      Framework path
+# @param[in] filter_regex:        filter regular expression
+# @param[in] search_path_filter:  search path filter regular expression
+#
+# @return a dictionary
+#----------------------------------------------------------------------------------------
+def WalkFrameworkPaths( frameworkPaths, filter_regex=r'\.(so|dylib)$',
+                                        search_path_filter=r'\t+/usr/local/opt' ):
 
   if isinstance(frameworkPaths, str):
     frameworkPathsIter = [frameworkPaths]
@@ -225,7 +241,15 @@ def WalkFrameworkPaths(frameworkPaths, filter_regex=r'\.(so|dylib)$', search_pat
       dependency_dict[frameworkPath].append(dict_file)
   return dependency_dict
 
-def WalkDictTree(dependencyDict, visited_files):
+#----------------------------------------------------------------------------------------
+## To make a list of changed libraries
+#
+# @param[in] dependencyDict:  library dependency dictionary
+# @param[in] visited_files:   list of visited files
+#
+# @return a list
+#----------------------------------------------------------------------------------------
+def WalkDictTree( dependencyDict, visited_files ):
   libNameChanges = list()
   for lib, dependencies in dependencyDict.items():
     if lib in visited_files:
@@ -253,31 +277,69 @@ def WalkDictTree(dependencyDict, visited_files):
     visited_files.append(lib)
   return libNameChanges
 
-
-def FindFramework(path, root_path):
+#----------------------------------------------------------------------------------------
+## To find the Framework name from a library name
+#
+# @param[in] path:      path to a library
+# @param[in] root_path: root path
+#
+# @return the path to a Framework
+#----------------------------------------------------------------------------------------
+def FindFramework( path, root_path ):
   relPath = os.path.relpath(path, root_path)
-  return os.path.join(root_path, relPath.split(os.sep)[0])
-def ResolveExecutablePath(path, executable_path):
+  frmPath = os.path.join(root_path, relPath.split(os.sep)[0])
+  #print( "###", frmPath, path, root_path )
+  return frmPath
+
+#----------------------------------------------------------------------------------------
+## To resolve an executable path
+#
+# @param[in] path:            a path to resolve
+# @param[in] executable_path: an executable path
+#
+# @return the resolved path
+#----------------------------------------------------------------------------------------
+def ResolveExecutablePath( path, executable_path ):
   """ Transforms @executable_path into executable_path"""
   p = path.replace("@executable_path", "/%s/" % executable_path)
   return p
 
+#----------------------------------------------------------------------------------------
+## To detect the changed library names
+#
+# @param[in] frameworkDependencyDict: framework dependency dictionary
+#
+# @return a list of changes, each of which is stored in the form of
+#         * ('lib.dylib', ['dep1.dylib', ...])
+#           OR
+#         * ('lib.dylib',)
+#----------------------------------------------------------------------------------------
 def DetectChanges(frameworkDependencyDict):
   visited_files = list()
   libNameChanges = list()
   for framework, libraries in frameworkDependencyDict.items():
     for libraryDict in libraries:
       libNameChanges.extend(WalkDictTree(libraryDict, visited_files))
-  # Changes are stored in libNameChanges in the form of ('lib.dylib', ['dep1.dylib', ...])
-
   return libNameChanges
 
-def PerformChanges(frameworkDependencyDict, replaceFromToPairs=None, executable_path="/tmp/klayout"):
+#----------------------------------------------------------------------------------------
+## To perform the required changes
+#
+# @param[in] frameworkDependencyDict: framework dependency dictionary
+# @param[in] replaceFromToPairs:      (from, to)-pair for replacement
+# @param[in] executable_path:         executable path
+#
+# @return 0 on success; > 0 on failure
+#----------------------------------------------------------------------------------------
+def PerformChanges( frameworkDependencyDict, replaceFromToPairs=None, executable_path="/tmp/klayout" ):
   libNameChanges = DetectChanges(frameworkDependencyDict)
-  cmdNameId = XcodeToolChain['nameID']
+  #print(libNameChanges)
+  cmdNameId  = XcodeToolChain['nameID']
   cmdNameChg = XcodeToolChain['nameCH']
 
-  if replaceFromToPairs is not None:
+  if replaceFromToPairs is None:
+    return 0
+  else:
     for libNameChange in libNameChanges:
       libNameChangeIterator = iter(libNameChange)
       lib = next(libNameChangeIterator)
@@ -300,8 +362,8 @@ def PerformChanges(frameworkDependencyDict, replaceFromToPairs=None, executable_
           destFrameworkPath = ResolveExecutablePath(destFrameworkPath, executable_path)
 
           if not os.path.exists(fileName):
-            print (lib.replace(replaceFrom, replaceTo), "DOES NOT EXIST")
-            print ("COPY", frameworkPath, " -> ", destFrameworkPath)
+            print( "     NOT FOUND:", lib.replace(replaceFrom, replaceTo) )
+            print( "       COPYING:", frameworkPath, " -> ", destFrameworkPath )
             shutil.copytree(frameworkPath, destFrameworkPath)
 
           nameId = lib.replace(replaceFrom, replaceTo)
@@ -316,8 +378,8 @@ def PerformChanges(frameworkDependencyDict, replaceFromToPairs=None, executable_
 
         for dependency in dependencies:
           if dependency.find(replaceFrom) >= 0:
-            print("\tIn:", fileName)
-            print("\tRENAME", dependency, " -> ", dependency.replace(replaceFrom, replaceTo))
+            print( "       IN:", fileName )
+            print( "         RENAMING:", dependency, " -> ", dependency.replace(replaceFrom, replaceTo) )
 
             # Try changing id first
             nameId = dependency.replace(replaceFrom, replaceTo)
@@ -342,15 +404,15 @@ def PerformChanges(frameworkDependencyDict, replaceFromToPairs=None, executable_
               msg = "!!! Failed to set the new identification name to <%s> !!!"
               print( msg % fileName, file=sys.stderr )
               return 1
+    return 0
 
-
-#------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
 ## To get KLayout's version from a file; most likely from 'version.sh'
 #
 # @param[in] verfile   version file from which version is retrieved
 #
 # @return version string
-#------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
 def GetKLayoutVersionFrom( verfile='version.h' ):
   version = "?.?.?"
   try:
@@ -372,14 +434,14 @@ def GetKLayoutVersionFrom( verfile='version.h' ):
       return version
   return version
 
-#------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
 ## To generate the contents of "Info.plist" file from a template
 #
 # @param[in]  keydic    dictionary of four key words ['exe', 'icon', 'bname', 'ver']
 # @param[in]  templfile template file ("macbuild/Resources/Info.plist.template")
 #
 # @return generated strings
-#------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
 def GenerateInfoPlist( keydic, templfile ):
   val_exe   = keydic['exe']
   val_icon  = keydic['icon']
diff --git a/macbuild/macQAT.py b/macbuild/macQAT.py
new file mode 100755
index 000000000..907330f1c
--- /dev/null
+++ b/macbuild/macQAT.py
@@ -0,0 +1,278 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+#===============================================================================
+# File: "macbuild/macQAT.py"
+#
+#  The top Python script to run "ut_runner" after building KLayout
+#  (http://www.klayout.de/index.php) version 0.26.1 or later on different Apple
+#  ßMac OSX platforms.
+#
+#  This script must be copied to a "*.macQAT/" directory to run.
+#===============================================================================
+from __future__ import print_function  # to use print() of Python 3 in Python >= 2.7
+import sys
+import os
+import datetime
+from   time import sleep
+import six
+import shutil
+import glob
+import platform
+import optparse
+import subprocess
+
+#-------------------------------------------------------------------------------
+## To set global variables including present directory and platform info.
+#
+#-------------------------------------------------------------------------------
+def SetGlobals():
+  global ProjectDir         # project directory where "ut_runner" exists
+  global RunnerUsage        # True to print the usage of 'ut_runner'
+  global Run                # True to run this script
+  global ContinueOnError    # True to continue after an error
+  global TestsExcluded      # list of tests to exclude
+  global Arguments          # other arguments
+  global GitSHA1            # Git's short SHA1 value of the HEAD
+  global TimeStamp          # time stamp
+  global WorkDir            # work directory name
+  global LogFile            # log file name
+  global Usage              # string on usage
+  # auxiliary variables on platform
+  global System             # 6-tuple from platform.uname()
+  global Node               # - do -
+  global Release            # - do -
+  global Version            # - do -
+  global Machine            # - do -
+  global Processor          # - do -
+  global Bit                # machine bit-size
+
+  Usage  = "\n"
+  Usage += "----------------------------------------------------------------------------------------\n"
+  Usage += "<< Usage of 'macQAT.py' >>\n"
+  Usage += "       for running 'ut_runner' after building KLayout.\n"
+  Usage += "\n"
+  Usage += "$ [python] ./macQAT.py \n"
+  Usage += "   option & argument      : descriptions                            | default value\n"
+  Usage += "   -----------------------------------------------------------------+---------------\n"
+  Usage += "   [-u|--usage]           : print usage of 'ut_runner'and exit      | disabled \n"
+  Usage += "                                                                    | \n"
+  Usage += "   <-r|--run>             : run this script                         | disabled \n"
+  Usage += "   [-s|--stop]            : stop on error                           | disabled \n"
+  Usage += "   [-x|--exclude <tests>] : exclude test(s) such as 'pymod,pya'     | '' \n"
+  Usage += "   [-a|--args <string>]   : arguments other than '-x' and '-c'      | '' \n"
+  Usage += "   [-?|--?]               : print this usage and exit               | disabled \n"
+  Usage += "--------------------------------------------------------------------+-------------------\n"
+
+  ProjectDir      = os.getcwd()
+  RunnerUsage     = False
+  Run             = False
+  ContinueOnError = True
+  TestsExcluded   = list()
+  Arguments       = ""
+  GitSHA1         = GetGitShortSHA1()
+  TimeStamp       = GetTimeStamp()
+  WorkDir         = "QATest_%s_%s__%s" % (GitSHA1, TimeStamp, os.path.basename(ProjectDir) )
+  LogFile         = WorkDir + ".log"
+
+  (System, Node, Release, Version, Machine, Processor) = platform.uname()
+
+#-------------------------------------------------------------------------------
+## Get git's short SHA1 value of the HEAD
+#
+# @return SHA1 value string
+#-------------------------------------------------------------------------------
+def GetGitShortSHA1():
+  command = "git rev-parse --short HEAD 2>/dev/null"
+  sha1val = os.popen( command ).read().strip()
+  return sha1val
+
+#-------------------------------------------------------------------------------
+## Get the time stamp
+#
+# @return time stamp string
+#-------------------------------------------------------------------------------
+def GetTimeStamp():
+  ts = datetime.datetime.today()
+  return "%04d_%02d%02d_%02d%02d" % (ts.year, ts.month, ts.day, ts.hour, ts.minute)
+
+#-------------------------------------------------------------------------------
+## To parse the command line arguments
+#
+#-------------------------------------------------------------------------------
+def ParseCommandLineArguments():
+  global Usage
+  global RunnerUsage
+  global Run
+  global ContinueOnError
+  global TestsExcluded
+  global Arguments
+
+  p = optparse.OptionParser( usage=Usage )
+  p.add_option( '-u', '--usage',
+                action='store_true',
+                dest='runner_usage',
+                default=False,
+                help="print usage of 'ut_runner' and exit (false)" )
+
+  p.add_option( '-r', '--run',
+                action='store_true',
+                dest='runme',
+                default=False,
+                help='run this script (false)' )
+
+  p.add_option( '-s', '--stop',
+                action='store_true',
+                dest='stop_on_error',
+                default=False,
+                help='stop on error (false)' )
+
+  p.add_option( '-x', '--exclude',
+                dest='exclude_tests',
+                help="exclude test(s) such as 'pymod,pya' ('')" )
+
+  p.add_option( '-a', '--args',
+                dest='arguments',
+                help="arguments other than '-x' and '-c' ('')" )
+
+  p.add_option( '-?', '--??',
+                action='store_true',
+                dest='checkusage',
+                default=False,
+                help='check usage (false)' )
+
+  p.set_defaults( runner_usage  = False,
+                  runme         = False,
+                  stop_on_error = False,
+                  exclude_tests = "",
+                  arguments     = "",
+                  checkusage    = False )
+
+  opt, args = p.parse_args()
+  if opt.checkusage:
+    print(Usage)
+    quit()
+
+  RunnerUsage     = opt.runner_usage
+  Run             = opt.runme
+  ContinueOnError = not opt.stop_on_error
+  if not opt.exclude_tests == "":
+    TestsExcluded = [ item.strip() for item in opt.exclude_tests.split(',') ]
+  else:
+    TestsExcluded = []
+  Arguments = opt.arguments
+
+#-------------------------------------------------------------------------------
+## Hide/Show the private directory
+#
+#-------------------------------------------------------------------------------
+def HidePrivateDir():
+  if os.path.isdir( "../private" ):
+    os.rename( "../private", "../private.stash"  )
+
+def ShowPrivateDir():
+  if os.path.isdir( "../private.stash" ):
+    os.rename( "../private.stash", "../private"  )
+
+#-------------------------------------------------------------------------------
+## Export environment variables for "ut_runner"
+#
+#-------------------------------------------------------------------------------
+def ExportEnvVariables():
+  global ProjectDir
+  global WorkDir
+  global MyEnviron  # my environment variables; can be independently used later
+
+  # In older versions of subprocess module, 'env=None' argument is not provided
+  MyEnviron = os.environ.copy()
+  MyEnviron[ 'TESTSRC' ] = ".."
+  MyEnviron[ 'TESTTMP' ] = WorkDir
+  if System == "Darwin":
+    MyEnviron[ 'DYLD_LIBRARY_PATH' ] = "%s:%s/db_plugins" % (ProjectDir, ProjectDir)
+    for env in [ 'TESTSRC', 'TESTTMP', 'DYLD_LIBRARY_PATH' ]:
+      os.environ[env] = MyEnviron[env]
+  else:
+    MyEnviron[ 'LD_LIBRARY_PATH' ] = "%s:%s/db_plugins" % (ProjectDir, ProjectDir)
+    for env in [ 'TESTSRC', 'TESTTMP', 'LD_LIBRARY_PATH' ]:
+      os.environ[env] = MyEnviron[env]
+
+#-------------------------------------------------------------------------------
+## Run the tester
+#
+# @param[in] command  command string to run
+# @param[in] logfile  log file name
+#-------------------------------------------------------------------------------
+def RunTester( command, logfile="" ):
+  if six.PY3:
+    proc = subprocess.Popen( command.split(), stdout=subprocess.PIPE,   \
+                                              stderr=subprocess.STDOUT, \
+                                              universal_newlines=True )
+  else:
+    proc = subprocess.Popen( command.split(), stdout=subprocess.PIPE,   \
+                                              stderr=subprocess.STDOUT )
+
+  if not logfile == "":
+    with proc.stdout, open( logfile, 'w' ) as file:
+      for line in proc.stdout:
+        sys.stdout.write(line)
+        file.write(line)
+    proc.wait()
+  else:
+    with proc.stdout:
+      for line in proc.stdout:
+        sys.stdout.write(line)
+    proc.wait()
+
+#-------------------------------------------------------------------------------
+# Main function
+#-------------------------------------------------------------------------------
+def Main():
+  #-------------------------------------------------------
+  # [1] Initialize
+  #-------------------------------------------------------
+  SetGlobals()
+  ParseCommandLineArguments()
+  ExportEnvVariables()
+
+  #-------------------------------------------------------
+  # [2] Print the runner's usage
+  #-------------------------------------------------------
+  if RunnerUsage:
+    command = './ut_runner --help-all'
+    RunTester( command )
+    quit()
+
+  #-------------------------------------------------------
+  # [3] Run the unit tester
+  #-------------------------------------------------------
+  if not Run:
+    print( "! pass <-r|--run> option to run" )
+    print(Usage)
+    quit()
+
+  command = './ut_runner'
+  if ContinueOnError:
+    command += " -c"
+  for item in TestsExcluded:
+    command += ' -x %s' % item
+  if not Arguments == "":
+    command += " %s" % Arguments
+
+  print( "" )
+  print( "### Dumping the log to <%s>" % LogFile )
+  print( "------------------------------------------------------------" )
+  print( "  Git SHA1   = %s" % GitSHA1 )
+  print( "  Time stamp = %s" % TimeStamp )
+  print( "------------------------------------------------------------" )
+  sleep( 1.0 )
+  HidePrivateDir()
+  RunTester( command, logfile=LogFile )
+  ShowPrivateDir()
+
+#===================================================================================
+if __name__ == "__main__":
+  Main()
+
+#---------------
+# End of file
+#---------------
diff --git a/macbuild/makeDMG4mac.py b/macbuild/makeDMG4mac.py
index c2429c785..04998cb33 100755
--- a/macbuild/makeDMG4mac.py
+++ b/macbuild/makeDMG4mac.py
@@ -179,8 +179,8 @@ def SetGlobals():
 # The package directory name should look like:
 #     * ST-qt5MP.pkg.macos-Catalina-release-RsysPsys      --- (1)
 #     * LW-qt5Ana3.pkg.macos-Catalina-release-Rana3Pana3
-#     * LW-qt5Brew.pkg.macos-Catalina-release-Rhb26Phb37
-#     * LW-qt5MP.pkg.macos-Catalina-release-Rmp26Pmp37
+#     * LW-qt5Brew.pkg.macos-Catalina-release-Rhb26Phb38
+#     * LW-qt5MP.pkg.macos-Catalina-release-Rmp26Pmp38
 #
 # Generated DMG will be, for example,
 #     (1) ---> ST-klayout-0.26.1-macOS-Catalina-1-qt5MP-RsysPsys.dmg
@@ -221,9 +221,9 @@ def CheckPkgDirectory():
   #
   #     * ST-qt5MP.pkg.macos-Catalina-release-RsysPsys
   #     * LW-qt5Ana3.pkg.macos-Catalina-release-Rana3Pana3
-  #     * LW-qt5Brew.pkg.macos-Catalina-release-Rhb27Phb37
-  #     * HW-qt5Brew.pkg.macos-Catalina-release-RsysPhb37
-  #     * EX-qt5MP.pkg.macos-Catalina-release-Rmp26Pmp37
+  #     * LW-qt5Brew.pkg.macos-Catalina-release-Rhb27Phb38
+  #     * HW-qt5Brew.pkg.macos-Catalina-release-RsysPhb38
+  #     * EX-qt5MP.pkg.macos-Catalina-release-Rmp26Pmp38
   #-----------------------------------------------------------------------------
   patQRP = u'(ST|LW|HW|EX)([-])(qt5[0-9A-Za-z]+)([.]pkg[.])([A-Za-z]+[-][A-Za-z]+[-]release[-])([0-9A-Za-z]+)'
   regQRP = re.compile(patQRP)
@@ -243,12 +243,12 @@ def CheckPkgDirectory():
   LatestOSMacPorts   = Platform == LatestOS
   LatestOSMacPorts  &= PackagePrefix == "LW"
   LatestOSMacPorts  &= QtIdentification == "qt5MP"
-  LatestOSMacPorts  &= RubyPythonID == "Rmp26Pmp37"
+  LatestOSMacPorts  &= RubyPythonID == "Rmp26Pmp38"
 
   LatestOSHomebrew   = Platform == LatestOS
   LatestOSHomebrew  &= PackagePrefix == "LW"
   LatestOSHomebrew  &= QtIdentification == "qt5Brew"
-  LatestOSHomebrew  &= RubyPythonID == "Rhb27Phb37"
+  LatestOSHomebrew  &= RubyPythonID == "Rhb27Phb38"
 
   LatestOSAnaconda3  = Platform == LatestOS
   LatestOSAnaconda3 &= PackagePrefix == "LW"