diff --git a/.gitignore b/.gitignore
index 42c4a5cb5..29f6d0f19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,8 @@ build-*
 bin-*
 mkqtdecl.tmp
 testtmp
+*build.macos*
+*bin.macos*
 
 # private data
 private
@@ -54,3 +56,12 @@ src/klayout.pro.user
 *.egg-info/
 build/
 dist/
+
+
+# IDEs
+.vscode
+
+
+# Macos artifacts
+*.dmg
+*.dmg.md5
diff --git a/Makefile b/Makefile
index a8e1d727b..b96f80895 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@
 GITCOMMIT := $(shell git rev-parse --short HEAD)
 KLAYOUT_VERSION := $(shell source version.sh && echo $$KLAYOUT_VERSION)
 ifndef PYTHON_VERSION
-    PYTHON_VERSION := B37
+    PYTHON_VERSION := HB38
 endif
 ifndef MACOS_VERSION
-	MACOS_VERSION := HighSierra
+	MACOS_VERSION := Catalina
 endif
 
 .ONESHELL:
@@ -15,11 +15,11 @@ default: help
 
 help:
 	@echo "For Mac OS only"
-	@echo "make build PYTHON_VERSION=B37"
-	@echo "make deploy PYTHON_VERSION=B37"
+	@echo "make build PYTHON_VERSION=HB38"
+	@echo "make deploy PYTHON_VERSION=HB38"
 	@echo "make test MACOS_VERSION=HighSierra"
-	@echo "Valid Mac OS Versions: [Yosemite, ElCapitan, Sierra, HighSierra]"
-	@echo "Valid Python Version: [nil, Sys, B37]"
+	@echo "Valid Mac OS Versions: [Yosemite, ElCapitan, Sierra, HighSierra, Mojave, Catalina]"
+	@echo "Valid Python Version: [nil, Sys, HB38]"
 
 build:
 	@echo "Building for Mac $(GITCOMMIT)"
@@ -29,11 +29,11 @@ build:
 deploy:
 	@echo "Deploying 4 Mac $(GITCOMMIT)"
 	./build4mac.py -p $(PYTHON_VERSION) -q Qt5Brew -y
-	
+
 test:
 	@echo "Testing 4 Mac $(GITCOMMIT)"
-	qt5.pkg.macos-$(MACOS_VERSION)-release/klayout.app/Contents/MacOS/klayout -b -r test-pylib-script.py; \
-	cd qt5.build.macos-$(MACOS_VERSION)-release; \
+	PIP_REQUIRE_VIRTUALENV="false" HW-qt5Brew.pkg.macos-$(MACOS_VERSION)-release-RsysPhb38/klayout.app/Contents/MacOS/klayout -b -r test-pylib-script.py; \
+	cd qt5Brew.build.macos-$(MACOS_VERSION)-release-RsysPhb38; \
 	ln -s klayout.app/Contents/MacOS/klayout klayout; \
 	export TESTTMP=testtmp; \
 	export TESTSRC=..; \
@@ -41,18 +41,24 @@ test:
 	./ut_runner -h || true; \
 	cd ..
 
+dmg-template:
+	mkdir -p testtemplate/klayout.app
+	./makeDMG4mac.py -p testtemplate -m -z -t klayoutDMGTemplate.dmg
+	cp -a klayoutDMGTemplate.dmg* macbuild/Resources/
+	rm -Rf testtemplate
+
 dropbox-deploy:
 	@echo "Preparing for dropbox deployment $(MACOS_VERSION) $(GITCOMMIT)"
-	mkdir -p deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION); \
-	pwd; \
-	ls -lah; \
-	touch build.txt; \
-	cp build.txt deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).log.txt; \
-	hdiutil convert macbuild/Resources/klayoutDMGTemplate.dmg -format UDRW -o work-KLayout.dmg; \
-	hdiutil resize -size 500m work-KLayout.dmg; \
-	hdiutil attach work-KLayout.dmg -readwrite -noverify -quiet -mountpoint tempKLayout -noautoopen; \
-	cp -a qt5.pkg.macos-$(MACOS_VERSION)-release/ tempKLayout/; \
-	hdiutil detach tempKLayout; \
-	hdiutil convert work-KLayout.dmg -format UDZO -imagekey zlib-level=9 -o deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg; \
-	md5 -q deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg > deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg.md5; \
+	mkdir -p deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)
+	pwd
+	ls -lah
+	touch build.txt
+	cp build.txt deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).log.txt
+	hdiutil convert macbuild/Resources/klayoutDMGTemplate.dmg -ov -format UDRW -o work-KLayout.dmg
+	hdiutil resize -size 500m work-KLayout.dmg
+	hdiutil attach -readwrite -noverify -quiet -mountpoint tempKLayout -noautoopen work-KLayout.dmg
+	cp -a HW-qt5Brew.pkg.macos-$(MACOS_VERSION)-release-RsysPhb38/ tempKLayout/
+	hdiutil detach tempKLayout
+	hdiutil convert work-KLayout.dmg -ov -format UDZO -imagekey zlib-level=9 -o deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg
+	md5 -q deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg > deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg.md5
 	rm work-KLayout.dmg
diff --git a/build.sh b/build.sh
index 6c6150e8f..676d8aa99 100755
--- a/build.sh
+++ b/build.sh
@@ -532,6 +532,11 @@ if [ "$BIN" = "" ]; then
   BIN=$CURR_DIR/bin-$CONFIG
 fi
 
+if [ "$QMAKE_CCACHE" = 1 ]; then
+  echo "    Compilation caching is activated."
+else
+  echo "    Compilation caching is deactivated!"
+fi
 echo "    Installation target: $BIN"
 echo "    Build directory: $BUILD"
 
diff --git a/macbuild/.gitignore b/macbuild/.gitignore
index 0d20b6487..4081080e3 100644
--- a/macbuild/.gitignore
+++ b/macbuild/.gitignore
@@ -1 +1,2 @@
 *.pyc
+KLayoutDMG.applescript
diff --git a/macbuild/Resources/klayoutDMGTemplate.dmg b/macbuild/Resources/klayoutDMGTemplate.dmg
index 8ad28f4ad..65ca57755 100644
Binary files a/macbuild/Resources/klayoutDMGTemplate.dmg and b/macbuild/Resources/klayoutDMGTemplate.dmg differ
diff --git a/macbuild/Resources/template-KLayoutDMG.applescript b/macbuild/Resources/template-KLayoutDMG.applescript
index 78d5b00d7..c27b6c10c 100644
--- a/macbuild/Resources/template-KLayoutDMG.applescript
+++ b/macbuild/Resources/template-KLayoutDMG.applescript
@@ -26,6 +26,12 @@
 -------------------------------------------------------------------------------------------------
 on run (volumeName) -- most likely, the volume name is "KLayout"
     tell application "Finder"
+        repeat 20 times
+            if (exists (disk (volumeName as string))) then
+                exit repeat
+            end if
+            delay 1
+        end repeat
         tell disk (volumeName as string)
             -- [1] Open the volume
             open
diff --git a/macbuild/build4mac.py b/macbuild/build4mac.py
index d9a99e74c..9657b9f94 100755
--- a/macbuild/build4mac.py
+++ b/macbuild/build4mac.py
@@ -27,550 +27,661 @@ from build4mac_util import *
 #-------------------------------------------------------------------------------
 ## To set global variables including present directory and platform info.
 #-------------------------------------------------------------------------------
-def SetGlobals():
-  global ProjectDir         # project directory where "build.sh" exists
-  global Usage              # string on usage
-  global BuildBash          # the main build Bash script
-  global Platform           # platform
-  global ModuleQt           # Qt module to be used
-  global ModuleRuby         # Ruby module to be used
-  global ModulePython       # Python module to be used
-  global NonOSStdLang       # True if non-OS-standard language is chosen
-  global NoQtBindings       # True if not creating Qt bindings for Ruby scripts
-  global MakeOptions        # options passed to `make`
-  global DebugMode          # True if debug mode build
-  global CheckComOnly       # True if only for checking the command line parameters to "build.sh"
-  global DeploymentF        # True if fully (including Qt's Frameworks) deploy the binaries for bundles
-  global DeploymentP        # True if partially deploy the binaries excluding Qt's Frameworks
-  global PackagePrefix      # the package prefix: 'ST-', 'LW-', 'HW-', or 'EX-'
-  global DeployVerbose      # -verbose=<0-3> level passed to 'macdeployqt' tool
-  global Version            # KLayout's version
-  global ModuleSet          # (Qt, Ruby, Python)-tuple
-  # 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
+def get_default_config():
+    """
+    Returns a dictionary containing the default configuration for the macOS build.
+    """
+    # global ProjectDir         # project directory where "build.sh" exists
+    # global Usage              # string on usage
+    # global BuildBash          # the main build Bash script
+    # global Platform           # platform
+    # global ModuleQt           # Qt module to be used
+    # global ModuleRuby         # Ruby module to be used
+    # global ModulePython       # Python module to be used
+    # global NonOSStdLang       # True if non-OS-standard language is chosen
+    # global NoQtBindings       # True if not creating Qt bindings for Ruby scripts
+    # global MakeOptions        # options passed to `make`
+    # global DebugMode          # True if debug mode build
+    # global CheckComOnly       # True if only for checking the command line parameters to "build.sh"
+    # global DeploymentF        # True if fully (including Qt's Frameworks) deploy the binaries for bundles
+    # global DeploymentP        # True if partially deploy the binaries excluding Qt's Frameworks
+    # global PackagePrefix      # the package prefix: 'ST-', 'LW-', 'HW-', or 'EX-'
+    # global DeployVerbose      # -verbose=<0-3> level passed to 'macdeployqt' tool
+    # global Version            # KLayout's version
+    # global ModuleSet          # (Qt, Ruby, Python)-tuple
+    # # 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 -
 
-  Usage  = "\n"
-  Usage += "---------------------------------------------------------------------------------------------------------\n"
-  Usage += "<< Usage of 'build4mac.py' >>\n"
-  Usage += "       for building KLayout 0.26.1 or later on different Apple Mac OSX platforms.\n"
-  Usage += "\n"
-  Usage += "$ [python] ./build4mac.py \n"
-  Usage += "   option & argument    : descriptions (refer to 'macbuild/build4mac_env.py' for details)| default value\n"
-  Usage += "   --------------------------------------------------------------------------------------+---------------\n"
-  Usage += "   [-q|--qt <type>]     : case-insensitive type=['Qt5MacPorts', 'Qt5Brew', 'Qt5Ana3']    | qt5macports \n"
-  Usage += "                        :   Qt5MacPorts: use Qt5 from MacPorts                           | \n"
-  Usage += "                        :       Qt5Brew: use Qt5 from Homebrew                           | \n"
-  Usage += "                        :       Qt5Ana3: use Qt5 from Anaconda3                          | \n"
-  Usage += "   [-r|--ruby <type>]   : case-insensitive type=['nil', 'Sys', 'MP26', 'HB27', 'Ana3']   | sys \n"
-  Usage += "                        :    nil: don't bind Ruby                                        | \n"
-  Usage += "                        :    Sys: use OS-bundled Ruby [2.0 - 2.6] depending on OS        | \n"
-  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', 'MP38', 'HB38', 'Ana3']   | sys \n"
-  Usage += "                        :    nil: don't bind Python                                      | \n"
-  Usage += "                        :    Sys: use OS-bundled Python 2.7 [ElCapitan -- Catalina]      | \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"
-  Usage += "   [-d|--debug]         : enable debug mode build                                        | disabled \n"
-  Usage += "   [-c|--checkcom]      : check command line and exit without building                   | disabled \n"
-  Usage += "   [-y|--deploy]        : deploy executables and dylibs including Qt's Frameworks        | disabled \n"
-  Usage += "   [-Y|--DEPLOY]        : deploy executables and dylibs for those who built KLayout      | disabled \n"
-  Usage += "                        : from the source code and use the tools in the same machine     | \n"
-  Usage += "                        : ! After confirmation of successful build of 'klayout.app',     | \n"
-  Usage += "                        :   rerun this script with BOTH:                                 | \n"
-  Usage += "                        :     1) the same options used for building AND                  | \n"
-  Usage += "                        :     2) <-y|--deploy> OR <-Y|--DEPLOY>                          | \n"
-  Usage += "                        :   optionally with [-v|--verbose <0-3>]                         | \n"
-  Usage += "   [-v|--verbose <0-3>] : verbose level of `macdeployqt' (effective with -y only)        | 1 \n"
-  Usage += "                        : 0 = no output, 1 = error/warning (default),                    | \n"
-  Usage += "                        : 2 = normal,    3 = debug                                       | \n"
-  Usage += "   [-?|--?]             : print this usage and exit                                      | disabled \n"
-  Usage += "-----------------------------------------------------------------------------------------+---------------\n"
+    Usage  = "\n"
+    Usage += "---------------------------------------------------------------------------------------------------------\n"
+    Usage += "<< Usage of 'build4mac.py' >>\n"
+    Usage += "       for building KLayout 0.26.1 or later on different Apple Mac OSX platforms.\n"
+    Usage += "\n"
+    Usage += "$ [python] ./build4mac.py \n"
+    Usage += "   option & argument    : descriptions (refer to 'macbuild/build4mac_env.py' for details)| default value\n"
+    Usage += "   --------------------------------------------------------------------------------------+---------------\n"
+    Usage += "   [-q|--qt <type>]     : case-insensitive type=['Qt5MacPorts', 'Qt5Brew', 'Qt5Ana3']    | qt5macports \n"
+    Usage += "                        :   Qt5MacPorts: use Qt5 from MacPorts                           | \n"
+    Usage += "                        :       Qt5Brew: use Qt5 from Homebrew                           | \n"
+    Usage += "                        :       Qt5Ana3: use Qt5 from Anaconda3                          | \n"
+    Usage += "   [-r|--ruby <type>]   : case-insensitive type=['nil', 'Sys', 'MP26', 'HB27', 'Ana3']   | sys \n"
+    Usage += "                        :    nil: don't bind Ruby                                        | \n"
+    Usage += "                        :    Sys: use OS-bundled Ruby [2.0 - 2.6] depending on OS        | \n"
+    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', 'MP38', 'HB38', 'Ana3']   | sys \n"
+    Usage += "                        :    nil: don't bind Python                                      | \n"
+    Usage += "                        :    Sys: use OS-bundled Python 2.7 [ElCapitan -- Catalina]      | \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"
+    Usage += "   [-d|--debug]         : enable debug mode build                                        | disabled \n"
+    Usage += "   [-c|--checkcom]      : check command line and exit without building                   | disabled \n"
+    Usage += "   [-y|--deploy]        : deploy executables and dylibs including Qt's Frameworks        | disabled \n"
+    Usage += "   [-Y|--DEPLOY]        : deploy executables and dylibs for those who built KLayout      | disabled \n"
+    Usage += "                        : from the source code and use the tools in the same machine     | \n"
+    Usage += "                        : ! After confirmation of successful build of 'klayout.app',     | \n"
+    Usage += "                        :   rerun this script with BOTH:                                 | \n"
+    Usage += "                        :     1) the same options used for building AND                  | \n"
+    Usage += "                        :     2) <-y|--deploy> OR <-Y|--DEPLOY>                          | \n"
+    Usage += "                        :   optionally with [-v|--verbose <0-3>]                         | \n"
+    Usage += "   [-v|--verbose <0-3>] : verbose level of `macdeployqt' (effective with -y only)        | 1 \n"
+    Usage += "                        : 0 = no output, 1 = error/warning (default),                    | \n"
+    Usage += "                        : 2 = normal,    3 = debug                                       | \n"
+    Usage += "   [-?|--?]             : print this usage and exit                                      | disabled \n"
+    Usage += "-----------------------------------------------------------------------------------------+---------------\n"
 
-  ProjectDir = os.getcwd()
-  BuildBash  = "./build.sh"
-  (System, Node, Release, Version, Machine, Processor) = platform.uname()
+    ProjectDir = os.getcwd()
+    BuildBash  = "./build.sh"
+    (System, Node, Release, MacVersion, Machine, Processor) = platform.uname()
 
-  if not System == "Darwin":
-    print("")
-    print( "!!! Sorry. Your system <%s> looks like non-Mac" % System, file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    if not System == "Darwin":
+        print("")
+        print( "!!! Sorry. Your system <%s> looks like non-Mac" % System, file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  release = int( Release.split(".")[0] ) # take the first of ['19', '0', '0']
-  if   release == 19:
-    Platform = "Catalina"
-  elif release == 18:
-    Platform = "Mojave"
-  elif release == 17:
-    Platform = "HighSierra"
-  elif release == 16:
-    Platform = "Sierra"
-  elif release == 15:
-    Platform = "ElCapitan"
-  else:
-    Platform = ""
-    print("")
-    print( "!!! Sorry. Unsupported major OS release <%d>" % release, file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    release = int( Release.split(".")[0] ) # take the first of ['19', '0', '0']
+    if   release == 20:
+        Platform = "BigSur"
+    elif release == 19:
+        Platform = "Catalina"
+    elif release == 18:
+        Platform = "Mojave"
+    elif release == 17:
+        Platform = "HighSierra"
+    elif release == 16:
+        Platform = "Sierra"
+    elif release == 15:
+        Platform = "ElCapitan"
+    else:
+        Platform = ""
+        print("")
+        print( "!!! Sorry. Unsupported major OS release <%d>" % release, file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  if not Machine == "x86_64":
-    print("")
-    print( "!!! Sorry. Only x86_64 architecture machine is supported but found <%s>" % Machine, file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    if not Machine == "x86_64":
+        print("")
+        print( "!!! Sorry. Only x86_64 architecture machine is supported but found <%s>" % Machine, file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  # Set the default modules
-  ModuleQt = "Qt5MacPorts"
-  if   Platform == "Catalina":
-    ModuleRuby   = "RubyCatalina"
-    ModulePython = "PythonCatalina"
-  elif Platform == "Mojave":
-    ModuleRuby   = "RubyMojave"
-    ModulePython = "PythonMojave"
-  elif Platform == "HighSierra":
-    ModuleRuby   = "RubyHighSierra"
-    ModulePython = "PythonHighSierra"
-  elif Platform == "Sierra":
-    ModuleRuby   = "RubySierra"
-    ModulePython = "PythonSierra"
-  elif Platform == "ElCapitan":
-    ModuleRuby   = "RubyElCapitan"
-    ModulePython = "PythonElCapitan"
-  else:
-    ModuleRuby   = "nil"
-    ModulePython = "nil"
+    # Set the default modules
+    ModuleQt = "Qt5MacPorts"
+    if   Platform == "Catalina":
+        ModuleRuby   = "RubyCatalina"
+        ModulePython = "PythonCatalina"
+    elif Platform == "Mojave":
+        ModuleRuby   = "RubyMojave"
+        ModulePython = "PythonMojave"
+    elif Platform == "HighSierra":
+        ModuleRuby   = "RubyHighSierra"
+        ModulePython = "PythonHighSierra"
+    elif Platform == "Sierra":
+        ModuleRuby   = "RubySierra"
+        ModulePython = "PythonSierra"
+    elif Platform == "ElCapitan":
+        ModuleRuby   = "RubyElCapitan"
+        ModulePython = "PythonElCapitan"
+    else:
+        ModuleRuby   = "nil"
+        ModulePython = "nil"
 
-  NonOSStdLang  = False
-  NoQtBindings  = False
-  MakeOptions   = "-j4"
-  DebugMode     = False
-  CheckComOnly  = False
-  DeploymentF   = False
-  DeploymentP   = False
-  PackagePrefix = ""
-  DeployVerbose = 1
-  Version       = GetKLayoutVersionFrom( "./version.sh" )
-  ModuleSet     = ( 'qt5MP', 'Sys', 'Sys' )
+    NonOSStdLang  = False
+    NoQtBindings  = False
+    MakeOptions   = "-j4"
+    DebugMode     = False
+    CheckComOnly  = False
+    DeploymentF   = False
+    DeploymentP   = False
+    PackagePrefix = ""
+    DeployVerbose = 1
+    Version       = GetKLayoutVersionFrom( "./version.sh" )
+    ModuleSet     = ( 'qt5MP', 'Sys', 'Sys' )
+
+    config = dict()
+
+    config['ProjectDir'] = ProjectDir             # project directory where "build.sh" exists
+    config['Usage'] = Usage                       # string on usage
+    config['BuildBash'] = BuildBash               # the main build Bash script
+    config['Platform'] = Platform                 # platform
+    config['ModuleQt'] = ModuleQt                 # Qt module to be used
+    config['ModuleRuby'] = ModuleRuby             # Ruby module to be used
+    config['ModulePython'] = ModulePython         # Python module to be used
+    config['NonOSStdLang'] = NonOSStdLang         # True if non-OS-standard language is chosen
+    config['NoQtBindings'] = NoQtBindings         # True if not creating Qt bindings for Ruby scripts
+    config['MakeOptions'] = MakeOptions           # options passed to `make`
+    config['DebugMode'] = DebugMode               # True if debug mode build
+    config['CheckComOnly'] = CheckComOnly         # True if only for checking the command line parameters to "build.sh"
+    config['DeploymentF'] = DeploymentF           # True if fully (including Qt's Frameworks) deploy the binaries for bundles
+    config['DeploymentP'] = DeploymentP           # True if partially deploy the binaries excluding Qt's Frameworks
+    config['PackagePrefix'] = PackagePrefix       # the package prefix: 'ST-', 'LW-', 'HW-', or 'EX-'
+    config['DeployVerbose'] = DeployVerbose       # -verbose=<0-3> level passed to 'macdeployqt' tool
+    config['Version'] = Version                   # KLayout's version
+    config['ModuleSet'] = ModuleSet               # (Qt, Ruby, Python)-tuple
+    # auxiliary variables on platform
+    config['System'] = System                     # 6-tuple from platform.uname()
+    config['Node'] = Node                         # - do -
+    config['Release'] = Release                   # - do -
+    config['MacVersion'] = MacVersion             # - do -
+    config['Machine'] = Machine                   # - do -
+    config['Processor'] = Processor               # - do -
+    return config
 
 #------------------------------------------------------------------------------
 ## To get command line parameters
 #------------------------------------------------------------------------------
-def ParseCommandLineArguments():
-  global Usage
-  global Platform
-  global ModuleQt
-  global ModuleRuby
-  global ModulePython
-  global NonOSStdLang
-  global NoQtBindings
-  global MakeOptions
-  global DebugMode
-  global CheckComOnly
-  global DeploymentF
-  global DeploymentP
-  global PackagePrefix
-  global DeployVerbose
-  global ModuleSet
+def parse_cli_args(config):
+    Usage         = config['Usage']          #
+    Platform      = config['Platform']       #
+    Release       = config['Release']        #
+    Machine       = config['Machine']        #
+    ModuleQt      = config['ModuleQt']       #
+    ModuleRuby    = config['ModuleRuby']     #
+    ModulePython  = config['ModulePython']   #
+    NonOSStdLang  = config['NonOSStdLang']   #
+    NoQtBindings  = config['NoQtBindings']   #
+    MakeOptions   = config['MakeOptions']    #
+    DebugMode     = config['DebugMode']      #
+    CheckComOnly  = config['CheckComOnly']   #
+    DeploymentF   = config['DeploymentF']    #
+    DeploymentP   = config['DeploymentP']    #
+    PackagePrefix = config['PackagePrefix']  #
+    DeployVerbose = config['DeployVerbose']  #
+    ModuleSet     = config['ModuleSet']      #
 
-  p = optparse.OptionParser( usage=Usage )
-  p.add_option( '-q', '--qt',
-                dest='type_qt',
-                help="Qt type=['Qt5MacPorts', 'Qt5Brew', 'Qt5Ana3']" )
+    p = optparse.OptionParser( usage=Usage )
+    p.add_option( '-q', '--qt',
+                                dest='type_qt',
+                                help="Qt type=['Qt5MacPorts', 'Qt5Brew', 'Qt5Ana3']" )
 
-  p.add_option( '-r', '--ruby',
-                dest='type_ruby',
-                help="Ruby type=['nil', 'Sys', 'MP26', 'HB27', 'Ana3']" )
+    p.add_option( '-r', '--ruby',
+                                dest='type_ruby',
+                                help="Ruby type=['nil', 'Sys', 'MP26', 'HB27', 'Ana3']" )
 
-  p.add_option( '-p', '--python',
-                dest='type_python',
-                help="Python type=['nil', 'Sys', 'MP38', 'HB38', 'Ana3']" )
+    p.add_option( '-p', '--python',
+                                dest='type_python',
+                                help="Python type=['nil', 'Sys', 'MP38', 'HB38', 'Ana3']" )
 
-  p.add_option( '-n', '--noqtbinding',
-                action='store_true',
-                dest='no_qt_binding',
-                default=False,
-                help="do not create Qt bindings for Ruby scripts" )
+    p.add_option( '-n', '--noqtbinding',
+                                action='store_true',
+                                dest='no_qt_binding',
+                                default=False,
+                                help="do not create Qt bindings for Ruby scripts" )
 
-  p.add_option( '-m', '--make',
-                dest='make_option',
-                help="options passed to `make`" )
+    p.add_option( '-m', '--make',
+                                dest='make_option',
+                                help="options passed to `make`" )
 
-  p.add_option( '-d', '--debug',
-                action='store_true',
-                dest='debug_build',
-                default=False,
-                help="enable debug mode build" )
+    p.add_option( '-d', '--debug',
+                                action='store_true',
+                                dest='debug_build',
+                                default=False,
+                                help="enable debug mode build" )
 
-  p.add_option( '-c', '--checkcom',
-                action='store_true',
-                dest='check_command',
-                default=False,
-                help="check command line and exit without building" )
+    p.add_option( '-c', '--checkcom',
+                                action='store_true',
+                                dest='check_command',
+                                default=False,
+                                help="check command line and exit without building" )
 
-  p.add_option( '-y', '--deploy',
-                action='store_true',
-                dest='deploy_full',
-                default=False,
-                help="fully deploy built binaries" )
+    p.add_option( '-y', '--deploy',
+                                action='store_true',
+                                dest='deploy_full',
+                                default=False,
+                                help="fully deploy built binaries" )
 
-  p.add_option( '-Y', '--DEPLOY',
-                action='store_true',
-                dest='deploy_partial',
-                default=False,
-                help="deploy built binaries when non-OS-standard script language is chosen" )
+    p.add_option( '-Y', '--DEPLOY',
+                                action='store_true',
+                                dest='deploy_partial',
+                                default=False,
+                                help="deploy built binaries when non-OS-standard script language is chosen" )
 
-  p.add_option( '-v', '--verbose',
-                dest='deploy_verbose',
-                help="verbose level of `macdeployqt` tool" )
+    p.add_option( '-v', '--verbose',
+                                dest='deploy_verbose',
+                                help="verbose level of `macdeployqt` tool" )
 
-  p.add_option( '-?', '--??',
-                action='store_true',
-                dest='checkusage',
-                default=False,
-                help='check usage' )
+    p.add_option( '-?', '--??',
+                                action='store_true',
+                                dest='checkusage',
+                                default=False,
+                                help='check usage' )
 
-  p.set_defaults( type_qt        = "qt5macports",
-                  type_ruby      = "sys",
-                  type_python    = "sys",
-                  no_qt_binding  = False,
-                  make_option    = "-j4",
-                  debug_build    = False,
-                  check_command  = False,
-                  deploy_full    = False,
-                  deploy_partial = False,
-                  deploy_verbose = "1",
-                  checkusage     = False )
+    p.set_defaults( type_qt        = "qt5macports",
+                                    type_ruby      = "sys",
+                                    type_python    = "sys",
+                                    no_qt_binding  = False,
+                                    make_option    = "-j4",
+                                    debug_build    = False,
+                                    check_command  = False,
+                                    deploy_full    = False,
+                                    deploy_partial = False,
+                                    deploy_verbose = "1",
+                                    checkusage     = False )
 
-  opt, args = p.parse_args()
-  if (opt.checkusage):
-    print(Usage)
-    sys.exit(0)
+    opt, args = p.parse_args()
+    if (opt.checkusage):
+        print(Usage)
+        sys.exit(0)
 
-  # Determine the Qt type
-  candidates                = dict()
-  candidates['QT5MACPORTS'] = 'Qt5MacPorts'
-  candidates['QT5BREW']     = 'Qt5Brew'
-  candidates['QT5ANA3']     = 'Qt5Ana3'
-  try:
-    ModuleQt = candidates[ opt.type_qt.upper() ]
-  except KeyError:
-    ModuleQt = ''
-    pass
-  if ModuleQt == '':
-    print("")
-    print( "!!! Unknown Qt type <%s>. Case-insensitive candidates: %s" % \
-            (opt.type_qt, list(candidates.keys())), file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
-  elif ModuleQt == "Qt5MacPorts":
-    choiceQt5 = 'qt5MP'
-  elif ModuleQt == "Qt5Brew":
-    choiceQt5 = 'qt5Brew'
-  elif ModuleQt == "Qt5Ana3":
-    choiceQt5 = 'qt5Ana3'
+    # Determine the Qt type
+    candidates                = dict()
+    candidates['QT5MACPORTS'] = 'Qt5MacPorts'
+    candidates['QT5BREW']     = 'Qt5Brew'
+    candidates['QT5ANA3']     = 'Qt5Ana3'
+    try:
+        ModuleQt = candidates[ opt.type_qt.upper() ]
+    except KeyError:
+        ModuleQt = ''
+        pass
+    if ModuleQt == '':
+        print("")
+        print( "!!! Unknown Qt type <%s>. Case-insensitive candidates: %s" % \
+                        (opt.type_qt, list(candidates.keys())), file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
+    elif ModuleQt == "Qt5MacPorts":
+        choiceQt5 = 'qt5MP'
+    elif ModuleQt == "Qt5Brew":
+        choiceQt5 = 'qt5Brew'
+    elif ModuleQt == "Qt5Ana3":
+        choiceQt5 = 'qt5Ana3'
 
-  # By default, OS-standard (-bundled) script languages (Ruby and Python) are used
-  NonOSStdLang = False
+    # By default, OS-standard (-bundled) script languages (Ruby and Python) are used
+    NonOSStdLang = False
 
-  # Determine the Ruby type
-  candidates         = dict()
-  candidates['NIL']  = 'nil'
-  candidates['SYS']  = 'Sys'
-  candidates['MP26'] = 'MP26'
-  candidates['HB27'] = 'HB27'
-  candidates['ANA3'] = 'Ana3'
-  try:
-    choiceRuby = candidates[ opt.type_ruby.upper() ]
-  except KeyError:
-    ModuleRuby = ''
-    pass
-  else:
-    ModuleRuby = ''
-    if choiceRuby == "nil":
-      ModuleRuby = 'nil'
-    elif choiceRuby == "Sys":
-      choiceRuby = "Sys"
-      if Platform == "Catalina":
-        ModuleRuby = 'RubyCatalina'
-      elif Platform == "Mojave":
-        ModuleRuby = 'RubyMojave'
-      elif Platform == "HighSierra":
-        ModuleRuby = 'RubyHighSierra'
-      elif Platform == "Sierra":
-        ModuleRuby = 'RubySierra'
-      elif Platform == "ElCapitan":
-        ModuleRuby = 'RubyElCapitan'
-    elif choiceRuby == "MP26":
-      ModuleRuby   = 'Ruby26MacPorts'
-      NonOSStdLang = True
-    elif choiceRuby == "HB27":
-      ModuleRuby   = 'Ruby27Brew'
-      NonOSStdLang = True
-    elif choiceRuby == "Ana3":
-      ModuleRuby   = 'RubyAnaconda3'
-      NonOSStdLang = True
-  if ModuleRuby == '':
-    print("")
-    print( "!!! Unknown Ruby type <%s>. Case-insensitive candidates: %s" % \
-            (opt.type_ruby, list(candidates.keys())), file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    # Determine the Ruby type
+    candidates         = dict()
+    candidates['NIL']  = 'nil'
+    candidates['SYS']  = 'Sys'
+    candidates['MP26'] = 'MP26'
+    candidates['HB27'] = 'HB27'
+    candidates['ANA3'] = 'Ana3'
+    try:
+        choiceRuby = candidates[ opt.type_ruby.upper() ]
+    except KeyError:
+        ModuleRuby = ''
+        pass
+    else:
+        ModuleRuby = ''
+        if choiceRuby == "nil":
+            ModuleRuby = 'nil'
+        elif choiceRuby == "Sys":
+            choiceRuby = "Sys"
+            if Platform == "Catalina":
+                ModuleRuby = 'RubyCatalina'
+            elif Platform == "Mojave":
+                ModuleRuby = 'RubyMojave'
+            elif Platform == "HighSierra":
+                ModuleRuby = 'RubyHighSierra'
+            elif Platform == "Sierra":
+                ModuleRuby = 'RubySierra'
+            elif Platform == "ElCapitan":
+                ModuleRuby = 'RubyElCapitan'
+        elif choiceRuby == "MP26":
+            ModuleRuby   = 'Ruby26MacPorts'
+            NonOSStdLang = True
+        elif choiceRuby == "HB27":
+            ModuleRuby   = 'Ruby27Brew'
+            NonOSStdLang = True
+        elif choiceRuby == "Ana3":
+            ModuleRuby   = 'RubyAnaconda3'
+            NonOSStdLang = True
+    if ModuleRuby == '':
+        print("")
+        print( "!!! Unknown Ruby type <%s>. Case-insensitive candidates: %s" % \
+                        (opt.type_ruby, list(candidates.keys())), file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  # Determine the Python type
-  candidates         = dict()
-  candidates['NIL']  = 'nil'
-  candidates['SYS']  = 'Sys'
-  candidates['MP38'] = 'MP38'
-  candidates['HB38'] = 'HB38'
-  candidates['ANA3'] = 'Ana3'
-  try:
-    choicePython = candidates[ opt.type_python.upper() ]
-  except KeyError:
-    ModulePython = ''
-    pass
-  else:
-    ModulePython = ''
-    if choicePython ==  "nil":
-      ModulePython = 'nil'
-    elif choicePython == "Sys":
-      if Platform == "Catalina":
-        ModulePython = 'PythonCatalina'
-      elif Platform == "Mojave":
-        ModulePython = 'PythonMojave'
-      elif Platform == "HighSierra":
-        ModulePython = 'PythonHighSierra'
-      elif Platform == "Sierra":
-        ModulePython = 'PythonSierra'
-      elif Platform == "ElCapitan":
-        ModulePython = 'PythonElCapitan'
-    elif choicePython == "MP38":
-      ModulePython = 'Python38MacPorts'
-      NonOSStdLang = True
-    elif choicePython == "HB38":
-      ModulePython = 'Python38Brew'
-      NonOSStdLang = True
-    elif choicePython == "Ana3":
-      ModulePython = 'PythonAnaconda3'
-      NonOSStdLang = True
-  if ModulePython == '':
-    print("")
-    print( "!!! Unknown Python type <%s>. Case-insensitive candidates: %s" % \
-            (opt.type_python, list(candidates.keys())), file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    # Determine the Python type
+    candidates         = dict()
+    candidates['NIL']  = 'nil'
+    candidates['SYS']  = 'Sys'
+    candidates['MP38'] = 'MP38'
+    candidates['HB38'] = 'HB38'
+    candidates['ANA3'] = 'Ana3'
+    try:
+        choicePython = candidates[ opt.type_python.upper() ]
+    except KeyError:
+        ModulePython = ''
+        pass
+    else:
+        ModulePython = ''
+        if choicePython ==  "nil":
+            ModulePython = 'nil'
+        elif choicePython == "Sys":
+            if Platform == "Catalina":
+                ModulePython = 'PythonCatalina'
+            elif Platform == "Mojave":
+                ModulePython = 'PythonMojave'
+            elif Platform == "HighSierra":
+                ModulePython = 'PythonHighSierra'
+            elif Platform == "Sierra":
+                ModulePython = 'PythonSierra'
+            elif Platform == "ElCapitan":
+                ModulePython = 'PythonElCapitan'
+        elif choicePython == "MP38":
+            ModulePython = 'Python38MacPorts'
+            NonOSStdLang = True
+        elif choicePython == "HB38":
+            ModulePython = 'Python38Brew'
+            NonOSStdLang = True
+        elif choicePython == "Ana3":
+            ModulePython = 'PythonAnaconda3'
+            NonOSStdLang = True
+    if ModulePython == '':
+        print("")
+        print( "!!! Unknown Python type <%s>. Case-insensitive candidates: %s" % \
+                        (opt.type_python, list(candidates.keys())), file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  # Set of modules chosen
-  ModuleSet = ( choiceQt5, choiceRuby, choicePython )
+    # 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("")
-    print( "!!! Choose either [-y|--deploy] or [-Y|--DEPLOY]", file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    if DeploymentF and DeploymentP:
+        print("")
+        print( "!!! Choose either [-y|--deploy] or [-Y|--DEPLOY]", file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  DeployVerbose = int(opt.deploy_verbose)
-  if not DeployVerbose in [0, 1, 2, 3]:
-    print("")
-    print( "!!! Unsupported verbose level passed to `macdeployqt` tool", file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    DeployVerbose = int(opt.deploy_verbose)
+    if not DeployVerbose in [0, 1, 2, 3]:
+        print("")
+        print( "!!! Unsupported verbose level passed to `macdeployqt` tool", file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  if not DeploymentF and not DeploymentP:
-    target  = "%s %s %s" % (Platform, Release, Machine)
-    modules = "Qt=%s, Ruby=%s, Python=%s" % (ModuleQt, ModuleRuby, ModulePython)
-    message = "### You are going to build KLayout\n    for  <%s>\n    with <%s>...\n"
-    print("")
-    print( message % (target, modules) )
-  else:
-    message = "### You are going to make "
-    if DeploymentP:
-      PackagePrefix = "LW-"
-      message      += "a llightweight (LW-) package excluding Qt5, Ruby, and Python..."
-    elif DeploymentF:
-      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 == 'Python38Brew':
-        PackagePrefix = "HW-"
-        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..."
-    print( "" )
-    print( message )
-    print( "" )
-    if CheckComOnly:
-      sys.exit(0)
+    if not DeploymentF and not DeploymentP:
+        target  = "%s %s %s" % (Platform, Release, Machine)
+        modules = "Qt=%s, Ruby=%s, Python=%s" % (ModuleQt, ModuleRuby, ModulePython)
+        message = "### You are going to build KLayout\n    for  <%s>\n    with <%s>...\n"
+        print("")
+        print( message % (target, modules) )
+    else:
+        message = "### You are going to make "
+        if DeploymentP:
+            PackagePrefix = "LW-"
+            message      += "a lightweight (LW-) package excluding Qt5, Ruby, and Python..."
+        elif DeploymentF:
+            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 == 'Python38Brew':
+                PackagePrefix = "HW-"
+                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..."
+        print( "" )
+        print( message )
+        print( "" )
+        if CheckComOnly:
+            sys.exit(0)
+
+    config['Usage']         = Usage         #
+    config['Platform']      = Platform      #
+    config['ModuleQt']      = ModuleQt      #
+    config['ModuleRuby']    = ModuleRuby    #
+    config['ModulePython']  = ModulePython  #
+    config['NonOSStdLang']  = NonOSStdLang  #
+    config['NoQtBindings']  = NoQtBindings  #
+    config['MakeOptions']   = MakeOptions   #
+    config['DebugMode']     = DebugMode     #
+    config['CheckComOnly']  = CheckComOnly  #
+    config['DeploymentF']   = DeploymentF   #
+    config['DeploymentP']   = DeploymentP   #
+    config['PackagePrefix'] = PackagePrefix #
+    config['DeployVerbose'] = DeployVerbose #
+    config['ModuleSet']     = ModuleSet     #
+
+    return config
 
 #------------------------------------------------------------------------------
 ## To run the main Bash script "build.sh" with appropriate options
 #
 # @return 0 on success; non-zero on failure
 #------------------------------------------------------------------------------
-def RunMainBuildBash():
-  global ProjectDir
-  global Platform
-  global BuildBash
-  global ModuleQt
-  global ModuleRuby
-  global ModulePython
-  global ModuleSet
-  global NoQtBindings
-  global MakeOptions
-  global DebugMode
-  global CheckComOnly
-  global DeploymentF
-  global DeploymentP
-  global PackagePrefix
-  global MacPkgDir          # relative path to package directory
-  global MacBinDir          # relative path to binary directory
-  global MacBuildDir        # relative path to build directory
-  global MacBuildDirQAT     # relative path to build directory for QATest
-  global MacBuildLog        # relative path to build log file
-  global AbsMacPkgDir       # absolute path to package directory
-  global AbsMacBinDir       # absolute path to binary directory
-  global AbsMacBuildDir     # absolute path to build directory
-  global AbsMacBuildDirQAT  # absolute path to build directory for QATest
-  global AbsMacBuildLog     # absolute path to build log file
+def get_build_parameters(config):
+    ProjectDir    = config['ProjectDir']     #
+    Platform      = config['Platform']       #
+    BuildBash     = config['BuildBash']      #
+    ModuleQt      = config['ModuleQt']       #
+    ModuleRuby    = config['ModuleRuby']     #
+    ModulePython  = config['ModulePython']   #
+    ModuleSet     = config['ModuleSet']      #
+    NoQtBindings  = config['NoQtBindings']   #
+    MakeOptions   = config['MakeOptions']    #
+    DebugMode     = config['DebugMode']      #
+    CheckComOnly  = config['CheckComOnly']   #
+    DeploymentF   = config['DeploymentF']    #
+    DeploymentP   = config['DeploymentP']    #
+    PackagePrefix = config['PackagePrefix']  #
 
-  #-----------------------------------------------------
-  # [1] Set parameters passed to the main Bash script
-  #-----------------------------------------------------
-  parameters = ""
+    #-----------------------------------------------------
+    # [1] Set parameters passed to the main Bash script
+    #-----------------------------------------------------
+    parameters = dict()
 
-  # (A) debug or release
-  if DebugMode:
-    mode        = "debug"
-    parameters += "  -debug"
-  else:
-    mode        = "release"
-    parameters += "  -release"
+    parameters['build_cmd'] = BuildBash
+    parameters['check_cmd_only'] = CheckComOnly
 
-  # (B) Modules
-  (qt, ruby, python) = ModuleSet  # ( 'qt5MP', 'Sys', 'Sys' )
-  ruby_python = "R%sP%s" % ( ruby.lower(), python.lower() )
-
-  # (C) Target directories and files
-  MacPkgDir         = "./%s%s.pkg.macos-%s-%s-%s"      % (PackagePrefix, qt, Platform, mode, ruby_python)
-  MacBinDir         = "./%s.bin.macos-%s-%s-%s"        % (               qt, Platform, mode, ruby_python)
-  MacBuildDir       = "./%s.build.macos-%s-%s-%s"      % (               qt, Platform, mode, ruby_python)
-  MacBuildLog       = "./%s.build.macos-%s-%s-%s.log"  % (               qt, Platform, mode, ruby_python)
-  AbsMacPkgDir      = "%s/%s%s.pkg.macos-%s-%s-%s"     % (ProjectDir, PackagePrefix, qt, Platform, mode, ruby_python)
-  AbsMacBinDir      = "%s/%s.bin.macos-%s-%s-%s"       % (ProjectDir,                qt, Platform, mode, ruby_python)
-  AbsMacBuildDir    = "%s/%s.build.macos-%s-%s-%s"     % (ProjectDir,                qt, Platform, mode, ruby_python)
-  AbsMacBuildLog    = "%s/%s.build.macos-%s-%s-%s.log" % (ProjectDir,                qt, Platform, mode, ruby_python)
-  MacBuildDirQAT    = MacBuildDir    + ".macQAT"
-  AbsMacBuildDirQAT = AbsMacBuildDir + ".macQAT"
-
-  # (D) Qt5
-  if ModuleQt == 'Qt5MacPorts':
-    parameters    += " \\\n  -qt5"
-    parameters    += " \\\n  -qmake  %s" % Qt5MacPorts['qmake']
-    parameters    += " \\\n  -bin    %s" % MacBinDir
-    parameters    += " \\\n  -build  %s" % MacBuildDir
-  elif ModuleQt == 'Qt5Brew':
-    parameters    += " \\\n  -qt5"
-    parameters    += " \\\n  -qmake  %s" % Qt5Brew['qmake']
-    parameters    += " \\\n  -bin    %s" % MacBinDir
-    parameters    += " \\\n  -build  %s" % MacBuildDir
-  elif ModuleQt == 'Qt5Ana3':
-    parameters    += " \\\n  -qt5"
-    parameters    += " \\\n  -qmake  %s" % Qt5Ana3['qmake']
-    parameters    += " \\\n  -bin    %s" % MacBinDir
-    parameters    += " \\\n  -build  %s" % MacBuildDir
-  parameters += " \\\n  -rpath    %s" % "@executable_path/../Frameworks"
-
-  # (E) want Qt bindings with Ruby scripts?
-  if NoQtBindings:
-    parameters += " \\\n  -without-qtbinding"
-  else:
-    parameters += " \\\n  -with-qtbinding"
-
-  # (F) options to `make` tool
-  if not MakeOptions == "":
-    parameters += " \\\n  -option %s" % MakeOptions
-
-  # (G) about Ruby
-  if ModuleRuby == "nil":
-    parameters += " \\\n  -noruby"
-  else:
-    parameters += " \\\n  -ruby   %s" % RubyDictionary[ModuleRuby]['exe']
-    parameters += " \\\n  -rbinc  %s" % RubyDictionary[ModuleRuby]['inc']
-    parameters += " \\\n  -rblib  %s" % RubyDictionary[ModuleRuby]['lib']
-
-  # (H) about Python
-  if ModulePython == "nil":
-    parameters += " \\\n  -nopython"
-  else:
-    parameters += " \\\n  -python %s" % PythonDictionary[ModulePython]['exe']
-    parameters += " \\\n  -pyinc  %s" % PythonDictionary[ModulePython]['inc']
-    parameters += " \\\n  -pylib  %s" % PythonDictionary[ModulePython]['lib']
-
-  #-----------------------------------------------------
-  # [2] Make the consolidated command line
-  #-----------------------------------------------------
-  command  = "time"
-  command += " \\\n  %s" % BuildBash
-  command += parameters
-  command += "  2>&1 | tee %s" % MacBuildLog
-  if CheckComOnly:
-    print(command)
-    sys.exit(0)
-
-  #-----------------------------------------------------
-  # [3] Invoke the main Bash script; takes time:-)
-  #-----------------------------------------------------
-  if DeploymentF:
-    return 0
-  elif DeploymentP:
-    return 0
-  else:
-    myscript = "build4mac.py"
-    if subprocess.call( command, shell=True ) != 0:
-      print( "", file=sys.stderr )
-      print( "-------------------------------------------------------------", file=sys.stderr )
-      print( "!!! <%s>: failed to build KLayout" % myscript, file=sys.stderr )
-      print( "-------------------------------------------------------------", file=sys.stderr )
-      print( "", file=sys.stderr )
-      return 1
+    # (A) debug or release
+    parameters['debug_mode'] = DebugMode  # True if debug, False if release
+    if parameters["debug_mode"]:
+        mode        = "debug"
     else:
-      print( "", file=sys.stderr )
-      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
-      print( "### <%s>: successfully built KLayout" % myscript, file=sys.stderr )
-      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
-      print( "", file=sys.stderr )
+        mode        = "release"
 
-      #------------------------------------------------------------------------
-      # [4] Prepare "*.macQAT/" directory for the QATest.
-      #     Binaries under "*.macQAT/" such as *.dylib will be touched later.
-      #------------------------------------------------------------------------
-      print( "### Preparing <%s>" % MacBuildDirQAT )
-      if os.path.isdir( MacBuildDirQAT ):
+    # (B) Modules
+    (qt, ruby, python) = ModuleSet  # ( 'qt5MP', 'Sys', 'Sys' )
+    ruby_python = "R%sP%s" % ( ruby.lower(), python.lower() )
+
+    # (C) Target directories and files
+    MacPkgDir         = "%s%s.pkg.macos-%s-%s-%s"        % (PackagePrefix, qt, Platform, mode, ruby_python)
+    MacBinDir         = "%s.bin.macos-%s-%s-%s"          % (               qt, Platform, mode, ruby_python)
+    MacBuildDir       = "%s.build.macos-%s-%s-%s"        % (               qt, Platform, mode, ruby_python)
+    MacBuildLog       = "%s.build.macos-%s-%s-%s.log"    % (               qt, Platform, mode, ruby_python)
+    # AbsMacPkgDir      = "%s/%s%s.pkg.macos-%s-%s-%s"     % (ProjectDir, PackagePrefix, qt, Platform, mode, ruby_python)
+    # AbsMacBinDir      = "%s/%s.bin.macos-%s-%s-%s"       % (ProjectDir,                qt, Platform, mode, ruby_python)
+    # AbsMacBuildDir    = "%s/%s.build.macos-%s-%s-%s"     % (ProjectDir,                qt, Platform, mode, ruby_python)
+    # AbsMacBuildLog    = "%s/%s.build.macos-%s-%s-%s.log" % (ProjectDir,                qt, Platform, mode, ruby_python)
+    # AbsMacPkgDir      = "%s/%s"                          % (ProjectDir, MacPkgDir)
+    # AbsMacBinDir      = "%s/%s"                          % (ProjectDir, MacBinDir)
+    # AbsMacBuildDir    = "%s/%s"                          % (ProjectDir, MacBuildDir)
+    # AbsMacBuildLog    = "%s/%s"                          % (ProjectDir, MacBuildLog)
+
+    MacBuildDirQAT    = MacBuildDir    + ".macQAT"
+    parameters['logfile'] = MacBuildLog
+
+    # (D) Qt5
+    if ModuleQt == 'Qt5MacPorts':
+        parameters['qmake'] = Qt5MacPorts['qmake']
+        parameters['deploy_tool'] = Qt5MacPorts['deploy']
+    elif ModuleQt == 'Qt5Brew':
+        parameters['qmake'] = Qt5Brew['qmake']
+        parameters['deploy_tool'] = Qt5Brew['deploy']
+    elif ModuleQt == 'Qt5Ana3':
+        parameters['qmake'] = Qt5Ana3['qmake']
+        parameters['deploy_tool'] = Qt5Ana3['deploy']
+
+    parameters['bin'] = MacBinDir
+    parameters['build'] = MacBuildDir
+    parameters['rpath'] = "@executable_path/../Frameworks"
+
+    # (E) want Qt bindings with Ruby scripts?
+    parameters['no_qt_bindings'] = NoQtBindings
+
+    # (F) options to `make` tool
+    if not MakeOptions == "":
+        parameters['make_options'] = MakeOptions
+
+    # (G) about Ruby
+    if ModuleRuby != "nil":
+        parameters['ruby'] = RubyDictionary[ModuleRuby]['exe']
+        parameters['rbinc'] = RubyDictionary[ModuleRuby]['inc']
+        parameters['rblib'] = RubyDictionary[ModuleRuby]['lib']
+        if 'inc2' in RubyDictionary[ModuleRuby]:
+            parameters['rbinc2'] = RubyDictionary[ModuleRuby]['inc2']
+
+    # (H) about Python
+    if ModulePython != "nil":
+        parameters['python'] = PythonDictionary[ModulePython]['exe']
+        parameters['pyinc'] = PythonDictionary[ModulePython]['inc']
+        parameters['pylib'] = PythonDictionary[ModulePython]['lib']
+
+    config['MacPkgDir']         = MacPkgDir          # relative path to package directory
+    config['MacBinDir']         = MacBinDir          # relative path to binary directory
+    config['MacBuildDir']       = MacBuildDir        # relative path to build directory
+    config['MacBuildDirQAT']    = MacBuildDirQAT     # relative path to build directory for QATest
+    config['MacBuildLog']       = MacBuildLog        # relative path to build log file
+    # config['AbsMacPkgDir']      = AbsMacPkgDir       # absolute path to package directory
+    # config['AbsMacBinDir']      = AbsMacBinDir       # absolute path to binary directory
+    # config['AbsMacBuildDir']    = AbsMacBuildDir     # absolute path to build directory
+    # config['AbsMacBuildDirQAT'] = AbsMacBuildDirQAT  # absolute path to build directory for QATest
+    # config['AbsMacBuildLog']    = AbsMacBuildLog     # absolute path to build log file
+
+    # Extra parameteres needed for deployment
+    parameters['project_dir'] = ProjectDir
+
+    return parameters
+
+def run_build_command(parameters):
+
+    #-----------------------------------------------------
+    # [1] Set parameters passed to the main Bash script
+    #-----------------------------------------------------
+
+    cmd_args = ""
+
+    # (A) debug or release
+    if parameters["debug_mode"]:
+        mode        = "debug"
+        cmd_args += "  -debug"
+    else:
+        mode        = "release"
+        cmd_args += "  -release"
+
+    # (C) Target directories and files
+    MacBuildDirQAT    = parameters['build']    + ".macQAT"
+
+    # (D) Qt5
+    cmd_args    += " \\\n  -qt5"
+    cmd_args    += " \\\n  -qmake  %s" % parameters['qmake']
+    cmd_args    += " \\\n  -bin    %s" % parameters['bin']
+    cmd_args    += " \\\n  -build  %s" % parameters['build']
+    cmd_args += " \\\n  -rpath    %s" % parameters['rpath']
+
+    # (E) want Qt bindings with Ruby scripts?
+    if parameters['no_qt_bindings']:
+        cmd_args += " \\\n  -without-qtbinding"
+    else:
+        cmd_args += " \\\n  -with-qtbinding"
+
+    # (F) options to `make` tool
+    if 'make_options' in parameters:
+        cmd_args += " \\\n  -option %s" % parameters['make_options']
+
+    # (G) about Ruby
+    if 'ruby' in parameters:
+        cmd_args += " \\\n  -ruby   %s" % parameters['ruby']
+        cmd_args += " \\\n  -rbinc  %s" % parameters['rbinc']
+        cmd_args += " \\\n  -rblib  %s" % parameters['rblib']
+        if 'rbinc2' in parameters:
+            cmd_args += " \\\n  -rbinc2  %s" % parameters['rbinc2']
+    else:
+        cmd_args += " \\\n  -noruby"
+
+    # (H) about Python
+    if 'python' in parameters:
+        cmd_args += " \\\n  -python %s" % parameters['python']
+        cmd_args += " \\\n  -pyinc  %s" % parameters['pyinc']
+        cmd_args += " \\\n  -pylib  %s" % parameters['pylib']
+    else:
+        cmd_args += " \\\n  -nopython"
+
+    #-----------------------------------------------------
+    # [2] Make the consolidated command line
+    #-----------------------------------------------------
+    command  = "time"
+    command += " \\\n  %s" % parameters['build_cmd']
+    command += cmd_args
+    command += "  2>&1 | tee %s; \\\n" % parameters['logfile']
+    command += "test ${PIPESTATUS[0]} -eq 0"  # tee always exits with 0
+
+    if parameters['check_cmd_only']:
+        print(command)
+        sys.exit(0)
+
+    #-----------------------------------------------------
+    # [3] Invoke the main Bash script; takes time:-)
+    #-----------------------------------------------------
+
+    myscript = os.path.basename(__file__)
+    ret = subprocess.call( command, shell=True )
+    if ret != 0:
+        print( "", file=sys.stderr )
+        print( "-------------------------------------------------------------", file=sys.stderr )
+        print( "!!! <%s>: failed to build KLayout" % myscript, file=sys.stderr )
+        print( "-------------------------------------------------------------", file=sys.stderr )
+        print( "", file=sys.stderr )
+        return 1
+
+    print( "", file=sys.stderr )
+    print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+    print( "### <%s>: successfully built KLayout" % myscript, file=sys.stderr )
+    print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+    print( "", file=sys.stderr )
+
+    #------------------------------------------------------------------------
+    # [4] Prepare "*.macQAT/" directory for the QATest.
+    #     Binaries under "*.macQAT/" such as *.dylib will be touched later.
+    #------------------------------------------------------------------------
+    print( "### Preparing <%s>" % MacBuildDirQAT )
+    if os.path.isdir( MacBuildDirQAT ):
         shutil.rmtree( MacBuildDirQAT )
 
-      os.chdir( MacBuildDir )
-      tarFile = "../macQATest.tar"
-      tarCmdC = "tar cf %s ." % tarFile
-      if subprocess.call( tarCmdC, shell=True ) != 0:
+    os.chdir( parameters['build'] )
+    tarFile = "../macQATest.tar"
+    tarCmdC = "tar cf %s ." % tarFile
+    if subprocess.call( tarCmdC, shell=True ) != 0:
         print( "", file=sys.stderr )
         print( "-------------------------------------------------------------", file=sys.stderr )
         print( "!!! <%s>: failed to create <%s>" % (myscript, tarFile), file=sys.stderr )
@@ -578,11 +689,11 @@ def RunMainBuildBash():
         print( "", file=sys.stderr )
         return 1
 
-      os.chdir( "../" )
-      os.mkdir( MacBuildDirQAT )
-      os.chdir( MacBuildDirQAT )
-      tarCmdX = "tar xf %s" % tarFile
-      if subprocess.call( tarCmdX, shell=True ) != 0:
+    os.chdir( "../" )
+    os.mkdir( MacBuildDirQAT )
+    os.chdir( MacBuildDirQAT )
+    tarCmdX = "tar xf %s" % tarFile
+    if subprocess.call( tarCmdX, shell=True ) != 0:
         print( "", file=sys.stderr )
         print( "-------------------------------------------------------------", file=sys.stderr )
         print( "!!! <%s>: failed to unpack <%s>" % (myscript, tarFile), file=sys.stderr )
@@ -590,15 +701,15 @@ def RunMainBuildBash():
         print( "", file=sys.stderr )
         return 1
 
-      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 )
-      print( "", file=sys.stderr )
-      return 0
+    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 )
+    print( "", file=sys.stderr )
+    return 0
 
 #------------------------------------------------------------------------------
 ## For making a bundle (klayout.app), deploy built binaries and libraries
@@ -608,528 +719,525 @@ def RunMainBuildBash():
 #
 # @return 0 on success; non-zero on failure
 #------------------------------------------------------------------------------
-def DeployBinariesForBundle():
-  global ProjectDir
-  global ModuleQt
-  global NonOSStdLang
-  global DeploymentF
-  global DeploymentP
-  global MacPkgDir
-  global MacBinDir
-  global MacBuildDir
-  global MacBuildDirQAT
-  global MacBuildLog
-  global AbsMacPkgDir
-  global AbsMacBinDir
-  global AbsMacBuildDir
-  global AbsMacBuildDirQAT
-  global AbsMacBuildLog
-  global Version
-  global DeployVerbose
+def DeployBinariesForBundle(config, parameters):
+    NonOSStdLang   = config['NonOSStdLang']
+    DeploymentF    = config['DeploymentF']
+    DeploymentP    = config['DeploymentP']
+    MacPkgDir      = config['MacPkgDir']
+    Version        = config['Version']
+    DeployVerbose  = config['DeployVerbose']
+    ModuleRuby     = config['ModuleRuby']
+    ModulePython   = config['ModulePython']
 
-  print("")
-  print( "##### Started deploying libraries and executables for <klayout.app> #####" )
-  print( " [1] Checking the status of working directory ..." )
-  #-------------------------------------------------------------
-  # [1] Check the status of working directory
-  #-------------------------------------------------------------
-  os.chdir(ProjectDir)
-  if not DeploymentF and not DeploymentP:
-    return 1
-  if DeploymentF and NonOSStdLang:
-    print( "     WARNING!!! You chose <-y|--deploy> while using non-OS-standard script language.", file=sys.stderr )
-    print( "         Consider using <-Y|--DEPLOY> instead", file=sys.stderr )
-    #return 1
-  if not os.path.isfile(MacBuildLog):
-    print( "!!! Build log file <%s> does not present !!!" % MacBuildLog, file=sys.stderr )
-    return 1
-  if not os.path.isdir(MacBuildDir):
-    print( "!!! Build directory <%s> does not present !!!" % MacBuildDir, file=sys.stderr )
-    return 1
-  if not os.path.isdir(MacBinDir):
-    print( "!!! Binary directory <%s> does not present !!!" % MacBinDir, file=sys.stderr )
-    return 1
+    ProjectDir  = parameters['project_dir']
+    MacBinDir   = parameters['bin']
+    MacBuildDir = parameters['build']
+    MacBuildLog = parameters['logfile']
 
+    AbsMacPkgDir     = "%s/%s" % (ProjectDir, MacPkgDir)
+    AbsMacBinDir     = "%s/%s" % (ProjectDir, MacBinDir)
+    AbsMacBuildDir   = "%s/%s" % (ProjectDir, MacBuildDir)
+    AbsMacBuildLog   = "%s/%s" % (ProjectDir, MacBuildLog)
 
-  print( " [2] Creating a new empty directory <%s> for deployment ..." % MacPkgDir )
-  #-------------------------------------------------------------
-  # [2] Create a new empty directory for deploying binaries
-  #-------------------------------------------------------------
-  os.chdir(ProjectDir)
-  if os.path.isfile(MacPkgDir):
-    os.remove(MacPkgDir)
-  if os.path.isdir(MacPkgDir):
-    shutil.rmtree(MacPkgDir)
-  os.mkdir(MacPkgDir)
-
-
-  print( " [3] Creating the standard directory structure for 'klayout.app' bundle ..." )
-  #-----------------------------------------------------------------
-  # [3] Create the directory skeleton for "klayout.app" bundle
-  #     and command line buddy tools such as "strm2cif".
-  #     They are stored in the directory structure below.
-  #
-  #    klayout.app/+
-  #                +-- Contents/+
-  #                             +-- Info.plist
-  #                             +-- PkgInfo
-  #                             +-- Resources/+
-  #                             |             +-- 'klayout.icns'
-  #                             +-- Frameworks/+
-  #                             |              +-- '*.framework'
-  #                             |              +-- '*.dylib'
-  #                             |              +-- 'db_plugins' --slink--> ../MacOS/db_plugins/
-  #                             +-- MacOS/+
-  #                             |         +-- 'klayout'
-  #                             |         +-- db_plugins/
-  #                             |         +-- lay_plugins/
-  #                             +-- Buddy/+
-  #                                       +-- 'strm2cif'
-  #                                       +-- 'strm2dxf'
-  #                                       :
-  #                                       +-- 'strmxor'
-  #-----------------------------------------------------------------
-  targetDir0 = "%s/klayout.app/Contents" % AbsMacPkgDir
-  targetDirR = targetDir0 + "/Resources"
-  targetDirF = targetDir0 + "/Frameworks"
-  targetDirM = targetDir0 + "/MacOS"
-  targetDirB = targetDir0 + "/Buddy"
-  os.makedirs(targetDirR)
-  os.makedirs(targetDirF)
-  os.makedirs(targetDirM)
-  os.makedirs(targetDirB)
-
-
-  print( " [4] Copying KLayout's dynamic link libraries to 'Frameworks' ..." )
-  #-------------------------------------------------------------------------------
-  # [4] Copy KLayout's dynamic link libraries to "Frameworks/" and create
-  #     the library dependency dictionary.
-  #     <<< Do this job in "Frameworks/" >>>
-  #
-  # Note:
-  #     KLayout's dynamic link library is built as below:
-  #       (1) libklayout_lay.0.26.1.dylib
-  #       (2) libklayout_lay.0.26.dylib -> libklayout_lay.0.26.1.dylib
-  #       (3) libklayout_lay.0.dylib -> libklayout_lay.0.26.1.dylib
-  #       (4) libklayout_lay.dylib -> libklayout_lay.0.26.1.dylib
-  #     where,
-  #       (1) is an ordinary file with full version number 'major.minor.teeny'
-  #           between "library_name."='libklayout_lay.' and '.dylib'
-  #       (2) is a symbolic link with 'major.minor' version number
-  #       (3) is a symbolic link with 'major' version number
-  #       (4) is a symbolic link without version number number
-  #
-  #     The dynamic linker tries to find a library name in style (3) as shown
-  #     in the example below.
-  #
-  # Example:
-  #   MacBookPro2(1)$ otool -L klayout
-  #   klayout:
-  #       :
-  #       :
-  #     libklayout_tl.0.dylib (compatibility version 0.26.0, current version 0.26.1)
-  #     libklayout_gsi.0.dylib (compatibility version 0.26.0, current version 0.26.1)
-  #     libklayout_db.0.dylib (compatibility version 0.26.0, current version 0.26.1)
-  #       :
-  #-------------------------------------------------------------------------------
-  os.chdir( targetDirF )
-  dynamicLinkLibs = glob.glob( os.path.join( AbsMacBinDir, "*.dylib" ) )
-  depDicOrdinary  = {} # inter-library dependency dictionary
-  pathDic = {} # paths to insert for each library
-  for item in dynamicLinkLibs:
-    if os.path.isfile(item) and not os.path.islink(item):
-      #-------------------------------------------------------------------
-      # (A) Copy an ordinary *.dylib file here by changing the name
-      #     to style (3) and set its mode to 0755 (sanity check).
-      #-------------------------------------------------------------------
-      fullName = os.path.basename(item).split('.')
-      # e.g. [ 'libklayout_lay', '0', '26', '1', 'dylib' ]
-      nameStyle3 = fullName[0] + "." + fullName[1] + ".dylib"
-      shutil.copy2( item, nameStyle3 )
-      os.chmod( nameStyle3, 0o0755 )
-      #-------------------------------------------------------------------
-      # (B) Then get inter-library dependencies
-      #     Note that will pull all dependencies and sort them out later
-      #     dropping those which don't have a path entry
-      #-------------------------------------------------------------------
-      otoolCm   = "otool -L %s | grep dylib" % nameStyle3
-      otoolOut  = os.popen( otoolCm ).read()
-      dependDic = DecomposeLibraryDependency(otoolOut)
-      depDicOrdinary.update(dependDic)
-      #-------------------------------------------------------------------
-      # (C) This library goes into Frameworks, hence record it's path there
-      #-------------------------------------------------------------------
-      pathDic[nameStyle3] = "@executable_path/../Frameworks/" + nameStyle3
-
-  os.chdir(ProjectDir)
-  #-------------------------------------------------------------------
-  # Copy the contents of the plugin directories to a place next to
-  # the application binary
-  #-------------------------------------------------------------------
-  for piDir in [ "db_plugins", "lay_plugins" ]:
-    os.makedirs( os.path.join( targetDirM, piDir ))
-    dynamicLinkLibs = glob.glob( os.path.join( MacBinDir, piDir, "*.dylib" ) )
-    for item in dynamicLinkLibs:
-      if os.path.isfile(item) and not os.path.islink(item):
-        #-------------------------------------------------------------------
-        # (A) Copy an ordinary *.dylib file here by changing the name
-        #     to style (3) and set its mode to 0755 (sanity check).
-        #-------------------------------------------------------------------
-        fullName = os.path.basename(item).split('.')
-        # e.g. [ 'libklayout_lay', '0', '26', '1', 'dylib' ]
-        nameStyle3 = fullName[0] + "." + fullName[1] + ".dylib"
-        destPath = os.path.join( targetDirM, piDir, nameStyle3 )
-        shutil.copy2( item, destPath )
-        os.chmod( destPath, 0o0755 )
-        #-------------------------------------------------------------------
-        # (B) Then get inter-library dependencies
-        #     Note that will pull all dependencies and sort them out later
-        #     dropping those which don't have a path entry
-        #-------------------------------------------------------------------
-        otoolCm   = "otool -L %s | grep 'dylib'" % destPath
-        otoolOut  = os.popen( otoolCm ).read()
-        dependDic = DecomposeLibraryDependency(otoolOut)
-        depDicOrdinary.update(dependDic)
-        #-------------------------------------------------------------------
-        # (C) This library goes into the plugin dir
-        #-------------------------------------------------------------------
-        pathDic[nameStyle3] = "@executable_path/" + piDir + "/" + nameStyle3
-
-  '''
-  PrintLibraryDependencyDictionary( depDicOrdinary, pathDic, "Style (3)" )
-  exit()
-  '''
-
-  #----------------------------------------------------------------------------------
-  # (D) Make a symbolic link
-  #        'db_plugins' --slink--> ../MacOS/db_plugins/
-  #     under Frameworks/, which is required for the command line Buddy tools.
-  #
-  #     Ref. https://github.com/KLayout/klayout/issues/460#issuecomment-571803458
-  #
-  #             :
-  #             +-- Frameworks/+
-  #             |              +-- '*.framework'
-  #             |              +-- '*.dylib'
-  #             |              +-- 'db_plugins' --slink--> ../MacOS/db_plugins/
-  #             +-- MacOS/+
-  #             |         +-- 'klayout'
-  #             |         +-- db_plugins/
-  #             |         +-- lay_plugins/
-  #             :
-  #----------------------------------------------------------------------------------
-  os.chdir( targetDirF )
-  os.symlink( "../MacOS/db_plugins/", "./db_plugins" )
-
-
-  print( " [5] Setting and changing the identification names among KLayout's libraries ..." )
-  #-------------------------------------------------------------
-  # [5] Set the identification names for KLayout's libraries
-  #     and make the library aware of the locations of libraries
-  #     on which it depends; that is, inter-library dependency
-  #-------------------------------------------------------------
-  ret = SetChangeIdentificationNameOfDyLib( depDicOrdinary, pathDic )
-  if not ret == 0:
-    msg = "!!! Failed to set and change to new identification names !!!"
-    print(msg)
-    return 1
-
-
-  print( " [6] Copying built executables and resource files ..." )
-  #-------------------------------------------------------------
-  # [6] Copy some known files in source directories to
-  #     relevant target directories
-  #-------------------------------------------------------------
-  os.chdir(ProjectDir)
-  sourceDir0 = "%s/klayout.app/Contents" % MacBinDir
-  sourceDir1 = sourceDir0 + "/MacOS"
-  sourceDir2 = "%s/macbuild/Resources" % ProjectDir
-  sourceDir3 = "%s" % MacBinDir
-
-  tmpfileM = ProjectDir + "/macbuild/Resources/Info.plist.template"
-  keydicM  = { 'exe': 'klayout', 'icon': 'klayout.icns', 'bname': 'klayout', 'ver': Version }
-  plistM   = GenerateInfoPlist( keydicM, tmpfileM )
-  file     = open( targetDir0 + "/Info.plist", "w" )
-  file.write(plistM)
-  file.close()
-
-  shutil.copy2( sourceDir0 + "/PkgInfo",      targetDir0 ) # this file is not mandatory
-  shutil.copy2( sourceDir1 + "/klayout",      targetDirM )
-  shutil.copy2( sourceDir2 + "/klayout.icns", targetDirR )
-
-
-  os.chmod( targetDir0 + "/PkgInfo",      0o0644 )
-  os.chmod( targetDir0 + "/Info.plist",   0o0644 )
-  os.chmod( targetDirM + "/klayout",      0o0755 )
-  os.chmod( targetDirR + "/klayout.icns", 0o0644 )
-
-  buddies = glob.glob( sourceDir3 + "/strm*" )
-  for item in buddies:
-    shutil.copy2( item, targetDirB )
-    buddy = os.path.basename(item)
-    os.chmod( targetDirB + "/" + buddy, 0o0755 )
-
-
-  print( " [7] Setting and changing the identification names of KLayout's libraries in each executable ..." )
-  #-------------------------------------------------------------
-  # [7] Set and change the library identification name(s) of
-  #     different executables
-  #-------------------------------------------------------------
-  os.chdir(ProjectDir)
-  os.chdir(MacPkgDir)
-  klayoutexec = "klayout.app/Contents/MacOS/klayout"
-  ret = SetChangeLibIdentificationName( klayoutexec, "../Frameworks" )
-  if not ret == 0:
+    print("")
+    print( "##### Started deploying libraries and executables for <klayout.app> #####" )
+    print( " [1] Checking the status of working directory ..." )
+    #-------------------------------------------------------------
+    # [1] Check the status of working directory
+    #-------------------------------------------------------------
     os.chdir(ProjectDir)
-    msg = "!!! Failed to set/change library identification name for <%s> !!!"
-    print( msg % klayoutexec, file=sys.stderr )
-    return 1
+    if not DeploymentF and not DeploymentP:
+        return 1
+    if DeploymentF and NonOSStdLang:
+        print( "     WARNING!!! You chose <-y|--deploy> while using non-OS-standard script language.", file=sys.stderr )
+        print( "         Consider using <-Y|--DEPLOY> instead", file=sys.stderr )
+        #return 1
+    if not os.path.isfile(MacBuildLog):
+        print( "!!! Build log file <%s> is not present !!!" % MacBuildLog, file=sys.stderr )
+        return 1
+    if not os.path.isdir(MacBuildDir):
+        print( "!!! Build directory <%s> is not present !!!" % MacBuildDir, file=sys.stderr )
+        return 1
+    if not os.path.isdir(MacBinDir):
+        print( "!!! Binary directory <%s> is not present !!!" % MacBinDir, file=sys.stderr )
+        return 1
 
-  buddies     = glob.glob( "klayout.app/Contents/Buddy/strm*" )
-  macdepQtOpt = ""
-  for buddy in buddies:
-    macdepQtOpt += " -executable=%s" % buddy
-    ret = SetChangeLibIdentificationName( buddy, "../Frameworks" )
+
+    print( " [2] Creating a new empty directory <%s> for deployment ..." % MacPkgDir )
+    #-------------------------------------------------------------
+    # [2] Create a new empty directory for deploying binaries
+    #-------------------------------------------------------------
+    os.chdir(ProjectDir)
+    if os.path.isfile(MacPkgDir):
+        os.remove(MacPkgDir)
+    if os.path.isdir(MacPkgDir):
+        shutil.rmtree(MacPkgDir)
+    os.mkdir(MacPkgDir)
+
+
+    print( " [3] Creating the standard directory structure for 'klayout.app' bundle ..." )
+    #-----------------------------------------------------------------
+    # [3] Create the directory skeleton for "klayout.app" bundle
+    #     and command line buddy tools such as "strm2cif".
+    #     They are stored in the directory structure below.
+    #
+    #    klayout.app/+
+    #                +-- Contents/+
+    #                             +-- Info.plist
+    #                             +-- PkgInfo
+    #                             +-- Resources/+
+    #                             |             +-- 'klayout.icns'
+    #                             +-- Frameworks/+
+    #                             |              +-- '*.framework'
+    #                             |              +-- '*.dylib'
+    #                             |              +-- 'db_plugins' --slink--> ../MacOS/db_plugins/
+    #                             +-- MacOS/+
+    #                             |         +-- 'klayout'
+    #                             |         +-- db_plugins/
+    #                             |         +-- lay_plugins/
+    #                             +-- Buddy/+
+    #                                       +-- 'strm2cif'
+    #                                       +-- 'strm2dxf'
+    #                                       :
+    #                                       +-- 'strmxor'
+    #-----------------------------------------------------------------
+    targetDir0 = "%s/klayout.app/Contents" % AbsMacPkgDir
+    targetDirR = targetDir0 + "/Resources"
+    targetDirF = targetDir0 + "/Frameworks"
+    targetDirM = targetDir0 + "/MacOS"
+    targetDirB = targetDir0 + "/Buddy"
+    os.makedirs(targetDirR)
+    os.makedirs(targetDirF)
+    os.makedirs(targetDirM)
+    os.makedirs(targetDirB)
+
+
+    print( " [4] Copying KLayout's dynamic link libraries to 'Frameworks' ..." )
+    #-------------------------------------------------------------------------------
+    # [4] Copy KLayout's dynamic link libraries to "Frameworks/" and create
+    #     the library dependency dictionary.
+    #     <<< Do this job in "Frameworks/" >>>
+    #
+    # Note:
+    #     KLayout's dynamic link library is built as below:
+    #       (1) libklayout_lay.0.26.1.dylib
+    #       (2) libklayout_lay.0.26.dylib -> libklayout_lay.0.26.1.dylib
+    #       (3) libklayout_lay.0.dylib -> libklayout_lay.0.26.1.dylib
+    #       (4) libklayout_lay.dylib -> libklayout_lay.0.26.1.dylib
+    #     where,
+    #       (1) is an ordinary file with full version number 'major.minor.teeny'
+    #           between "library_name."='libklayout_lay.' and '.dylib'
+    #       (2) is a symbolic link with 'major.minor' version number
+    #       (3) is a symbolic link with 'major' version number
+    #       (4) is a symbolic link without version number number
+    #
+    #     The dynamic linker tries to find a library name in style (3) as shown
+    #     in the example below.
+    #
+    # Example:
+    #   MacBookPro2(1)$ otool -L klayout
+    #   klayout:
+    #       :
+    #       :
+    #     libklayout_tl.0.dylib (compatibility version 0.26.0, current version 0.26.1)
+    #     libklayout_gsi.0.dylib (compatibility version 0.26.0, current version 0.26.1)
+    #     libklayout_db.0.dylib (compatibility version 0.26.0, current version 0.26.1)
+    #       :
+    #-------------------------------------------------------------------------------
+    os.chdir( targetDirF )
+    dynamicLinkLibs = glob.glob( os.path.join( AbsMacBinDir, "*.dylib" ) )
+    depDicOrdinary  = {} # inter-library dependency dictionary
+    pathDic = {} # paths to insert for each library
+    for item in dynamicLinkLibs:
+        if os.path.isfile(item) and not os.path.islink(item):
+            #-------------------------------------------------------------------
+            # (A) Copy an ordinary *.dylib file here by changing the name
+            #     to style (3) and set its mode to 0755 (sanity check).
+            #-------------------------------------------------------------------
+            fullName = os.path.basename(item).split('.')
+            # e.g. [ 'libklayout_lay', '0', '26', '1', 'dylib' ]
+            nameStyle3 = fullName[0] + "." + fullName[1] + ".dylib"
+            shutil.copy2( item, nameStyle3 )
+            os.chmod( nameStyle3, 0o0755 )
+            #-------------------------------------------------------------------
+            # (B) Then get inter-library dependencies
+            #     Note that will pull all dependencies and sort them out later
+            #     dropping those which don't have a path entry
+            #-------------------------------------------------------------------
+            otoolCm   = "otool -L %s | grep dylib" % nameStyle3
+            otoolOut  = os.popen( otoolCm ).read()
+            dependDic = DecomposeLibraryDependency(otoolOut)
+            depDicOrdinary.update(dependDic)
+            #-------------------------------------------------------------------
+            # (C) This library goes into Frameworks, hence record it's path there
+            #-------------------------------------------------------------------
+            pathDic[nameStyle3] = "@executable_path/../Frameworks/" + nameStyle3
+
+    os.chdir(ProjectDir)
+    #-------------------------------------------------------------------
+    # Copy the contents of the plugin directories to a place next to
+    # the application binary
+    #-------------------------------------------------------------------
+    for piDir in [ "db_plugins", "lay_plugins" ]:
+        os.makedirs( os.path.join( targetDirM, piDir ))
+        dynamicLinkLibs = glob.glob( os.path.join( MacBinDir, piDir, "*.dylib" ) )
+        for item in dynamicLinkLibs:
+            if os.path.isfile(item) and not os.path.islink(item):
+                #-------------------------------------------------------------------
+                # (A) Copy an ordinary *.dylib file here by changing the name
+                #     to style (3) and set its mode to 0755 (sanity check).
+                #-------------------------------------------------------------------
+                fullName = os.path.basename(item).split('.')
+                # e.g. [ 'libklayout_lay', '0', '26', '1', 'dylib' ]
+                nameStyle3 = fullName[0] + "." + fullName[1] + ".dylib"
+                destPath = os.path.join( targetDirM, piDir, nameStyle3 )
+                shutil.copy2( item, destPath )
+                os.chmod( destPath, 0o0755 )
+                #-------------------------------------------------------------------
+                # (B) Then get inter-library dependencies
+                #     Note that will pull all dependencies and sort them out later
+                #     dropping those which don't have a path entry
+                #-------------------------------------------------------------------
+                otoolCm   = "otool -L %s | grep 'dylib'" % destPath
+                otoolOut  = os.popen( otoolCm ).read()
+                dependDic = DecomposeLibraryDependency(otoolOut)
+                depDicOrdinary.update(dependDic)
+                #-------------------------------------------------------------------
+                # (C) This library goes into the plugin dir
+                #-------------------------------------------------------------------
+                pathDic[nameStyle3] = "@executable_path/" + piDir + "/" + nameStyle3
+
+    '''
+    PrintLibraryDependencyDictionary( depDicOrdinary, pathDic, "Style (3)" )
+    exit()
+    '''
+
+    #----------------------------------------------------------------------------------
+    # (D) Make a symbolic link
+    #        'db_plugins' --slink--> ../MacOS/db_plugins/
+    #     under Frameworks/, which is required for the command line Buddy tools.
+    #
+    #     Ref. https://github.com/KLayout/klayout/issues/460#issuecomment-571803458
+    #
+    #             :
+    #             +-- Frameworks/+
+    #             |              +-- '*.framework'
+    #             |              +-- '*.dylib'
+    #             |              +-- 'db_plugins' --slink--> ../MacOS/db_plugins/
+    #             +-- MacOS/+
+    #             |         +-- 'klayout'
+    #             |         +-- db_plugins/
+    #             |         +-- lay_plugins/
+    #             :
+    #----------------------------------------------------------------------------------
+    os.chdir( targetDirF )
+    os.symlink( "../MacOS/db_plugins/", "./db_plugins" )
+
+
+    print( " [5] Setting and changing the identification names among KLayout's libraries ..." )
+    #-------------------------------------------------------------
+    # [5] Set the identification names for KLayout's libraries
+    #     and make the library aware of the locations of libraries
+    #     on which it depends; that is, inter-library dependency
+    #-------------------------------------------------------------
+    ret = SetChangeIdentificationNameOfDyLib( depDicOrdinary, pathDic )
     if not ret == 0:
-      os.chdir(ProjectDir)
-      msg = "!!! Failed to set/change library identification name for <%s> !!!"
-      print( msg % buddy, file=sys.stderr )
-      return 1
+        msg = "!!! Failed to set and change to new identification names !!!"
+        print(msg)
+        return 1
 
-  if DeploymentF:
-    print( " [8] Finally, deploying Qt's Frameworks ..." )
+
+    print( " [6] Copying built executables and resource files ..." )
     #-------------------------------------------------------------
-    # [8] Deploy Qt Frameworks
+    # [6] Copy some known files in source directories to
+    #     relevant target directories
     #-------------------------------------------------------------
-    verbose = " -verbose=%d" % DeployVerbose
-    if ModuleQt == 'Qt5MacPorts':
-      deploytool = Qt5MacPorts['deploy']
-      app_bundle = "klayout.app"
-      options    = macdepQtOpt + verbose
-    elif ModuleQt == 'Qt5Brew':
-      deploytool = Qt5Brew['deploy']
-      app_bundle = "klayout.app"
-      options    = macdepQtOpt + verbose
-    elif ModuleQt == 'Qt5Ana3':
-      deploytool = Qt5Ana3['deploy']
-      app_bundle = "klayout.app"
-      options    = macdepQtOpt + verbose
+    os.chdir(ProjectDir)
+    sourceDir0 = "%s/klayout.app/Contents" % MacBinDir
+    sourceDir1 = sourceDir0 + "/MacOS"
+    sourceDir2 = "%s/macbuild/Resources" % ProjectDir
+    sourceDir3 = "%s" % MacBinDir
 
-    # Without the following, the plugin cocoa would not be found properly.
-    shutil.copy2( sourceDir2 + "/qt.conf", targetDirM )
-    os.chmod( targetDirM + "/qt.conf",      0o0644 )
+    tmpfileM = ProjectDir + "/macbuild/Resources/Info.plist.template"
+    keydicM  = { 'exe': 'klayout', 'icon': 'klayout.icns', 'bname': 'klayout', 'ver': Version }
+    plistM   = GenerateInfoPlist( keydicM, tmpfileM )
+    file     = open( targetDir0 + "/Info.plist", "w" )
+    file.write(plistM)
+    file.close()
 
+    shutil.copy2( sourceDir0 + "/PkgInfo",      targetDir0 ) # this file is not mandatory
+    shutil.copy2( sourceDir1 + "/klayout",      targetDirM )
+    shutil.copy2( sourceDir2 + "/klayout.icns", targetDirR )
+
+
+    os.chmod( targetDir0 + "/PkgInfo",      0o0644 )
+    os.chmod( targetDir0 + "/Info.plist",   0o0644 )
+    os.chmod( targetDirM + "/klayout",      0o0755 )
+    os.chmod( targetDirR + "/klayout.icns", 0o0644 )
+
+    buddies = glob.glob( sourceDir3 + "/strm*" )
+    for item in buddies:
+        shutil.copy2( item, targetDirB )
+        buddy = os.path.basename(item)
+        os.chmod( targetDirB + "/" + buddy, 0o0755 )
+
+
+    print( " [7] Setting and changing the identification names of KLayout's libraries in each executable ..." )
+    #-------------------------------------------------------------
+    # [7] Set and change the library identification name(s) of
+    #     different executables
+    #-------------------------------------------------------------
     os.chdir(ProjectDir)
     os.chdir(MacPkgDir)
-    command = "%s %s %s" % ( deploytool, app_bundle, options )
-    if subprocess.call( command, shell=True ) != 0:
-      msg = "!!! Failed to deploy applications on OSX/macOS !!!"
-      print( msg, file=sys.stderr )
-      print("")
-      os.chdir(ProjectDir)
-      return 1
+    klayoutexec = "klayout.app/Contents/MacOS/klayout"
+    ret = SetChangeLibIdentificationName( klayoutexec, "../Frameworks" )
+    if not ret == 0:
+        os.chdir(ProjectDir)
+        msg = "!!! Failed to set/change library identification name for <%s> !!!"
+        print( msg % klayoutexec, file=sys.stderr )
+        return 1
 
-    #-----------------------------------------------------------------------------------------------
-    # [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
+    buddies     = glob.glob( "klayout.app/Contents/Buddy/strm*" )
+    macdepQtOpt = ""
+    for buddy in buddies:
+        macdepQtOpt += " -executable=%s" % buddy
+        ret = SetChangeLibIdentificationName( buddy, "../Frameworks" )
+        if not ret == 0:
+            os.chdir(ProjectDir)
+            msg = "!!! Failed to set/change library identification name for <%s> !!!"
+            print( msg % buddy, file=sys.stderr )
+            return 1
 
-      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)
+    if DeploymentF:
+        print( " [8] Finally, deploying Qt's Frameworks ..." )
+        #-------------------------------------------------------------
+        # [8] Deploy Qt Frameworks
+        #-------------------------------------------------------------
+        verbose = " -verbose=%d" % DeployVerbose
+        app_bundle = "klayout.app"
+        options = macdepQtOpt + verbose
+        deploytool = parameters['deploy_tool']
 
-      print( "" )
-      print( " [9] Optional deployment of Python from %s ..." % HBPython38FrameworkPath )
-      print( "  [9.1] Copying Python Framework" )
+        # Without the following, the plugin cocoa would not be found properly.
+        shutil.copy2( sourceDir2 + "/qt.conf", targetDirM )
+        os.chmod( targetDirM + "/qt.conf",      0o0644 )
 
-      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(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:
+        os.chdir(ProjectDir)
+        os.chdir(MacPkgDir)
+        command = "%s %s %s" % ( deploytool, app_bundle, options )
         if subprocess.call( command, shell=True ) != 0:
-          msg = "command failed: %s"
-          print( msg % command, file=sys.stderr )
-          sys.exit(1)
+            msg = "!!! Failed to deploy applications on OSX/macOS !!!"
+            print( msg, file=sys.stderr )
+            print("")
+            os.chdir(ProjectDir)
+            return 1
 
-      shutil.copy2( sourceDir2 + "/start-console.py", targetDirM )
-      shutil.copy2( sourceDir2 + "/klayout_console",  targetDirM )
-      os.chmod( targetDirM + "/start-console.py", 0o0755 )
-      os.chmod( targetDirM + "/klayout_console",  0o0755 )
+        #-----------------------------------------------------------------------------------------------
+        # [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
 
-      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, [(HBPython38FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
+            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("   [9.2.2] Patching /usr/local/opt/ libs")
-      usrLocalPath = '/usr/local/opt/'
-      appUsrLocalPath = '@executable_path/../Frameworks/'
-      replacePairs = [(usrLocalPath, appUsrLocalPath, True)]
-      depdict = WalkFrameworkPaths(pythonFrameworkPath, search_path_filter=r'\t+/usr/local/(opt|Cellar)')
-      PerformChanges(depdict, replacePairs, bundleExecPathAbs)
+            print( "" )
+            print( " [9] Optional deployment of Python from %s ..." % HBPython38FrameworkPath )
+            print( "  [9.1] Copying Python Framework" )
 
-      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@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 + '/../xz'], search_path_filter=r'\t+/usr/local/(opt|Cellar)')
+            cmd01 = "rm -rf %s" % pythonFrameworkPath
+            cmd02 = "rsync -a --safe-links %s/ %s" % (HBPython38FrameworkPath, pythonFrameworkPath)
 
-      PerformChanges(depdict, replacePairs, bundleExecPathAbs)
+            cmd03 = "rm -rf %s" % testTarget
+            cmd04 = "rm -rf %s" % resourceTarget1
+            cmd05 = "unlink %s" % resourceTarget2
+            cmd06 = "rm -rf %s" % binTarget
 
-      print("  [9.3] Relinking dylib dependencies for klayout")
-      klayoutPath = bundleExecPathAbs
-      depdict = WalkFrameworkPaths(klayoutPath, filter_regex=r'klayout$')
-      PerformChanges(depdict, [(HBPython38FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
+            cmd07 = "mkdir %s" % sitepackagesTarget
+            cmd08 = "cp -RL %s/{pip*,pkg_resources,setuptools*,wheel*} %s" % (sitepackagesSource, sitepackagesTarget)
 
-      libKlayoutPath = bundleExecPathAbs + '../Frameworks'
-      depdict = WalkFrameworkPaths(libKlayoutPath, filter_regex=r'libklayout')
-      PerformChanges(depdict, [(HBPython38FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
+            shell_commands = list()
+            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)
 
-      print("  [9.4] Patching site.py, pip/, and distutils/")
-      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 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.
-          if re.match("^ENABLE_USER_SITE", line) is not None:
-            line = "ENABLE_USER_SITE = False\n"
-          site.write(line)
+            for command in shell_commands:
+                if subprocess.call( command, shell=True ) != 0:
+                    msg = "command failed: %s"
+                    print( msg % command, file=sys.stderr )
+                    sys.exit(1)
 
-      #----------------------------------------------------------------------------------
-      # 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:
-        import re
-        for line in buf:
-          # this will reject user's configuration of pip, forcing the isolated mode
-          line = re.sub("return isolated$", "return isolated or True", line)
-          pip.write(line)
+            shutil.copy2( sourceDir2 + "/start-console.py", targetDirM )
+            shutil.copy2( sourceDir2 + "/klayout_console",  targetDirM )
+            os.chmod( targetDirM + "/start-console.py", 0o0755 )
+            os.chmod( targetDirM + "/klayout_console",  0o0755 )
 
-      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:
-        import re
-        for line in buf:
-          # This will cause all packages to be installed to sys.prefix
-          if re.match('prefix=', line) is not None:
-            continue
-          file.write(line)
+            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, [(HBPython38FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
 
-    #-------------------------------------------------------------
-    # [10] Special deployment of Ruby2.7 from Homebrew?
-    #-------------------------------------------------------------
-    deploymentRuby26HB = (ModuleRuby == 'Ruby27Brew')
-    if deploymentRuby26HB and NonOSStdLang:
+            print("   [9.2.2] Patching /usr/local/opt/ libs")
+            usrLocalPath = '/usr/local/opt/'
+            appUsrLocalPath = '@executable_path/../Frameworks/'
+            replacePairs = [(usrLocalPath, appUsrLocalPath, True)]
+            depdict = WalkFrameworkPaths(pythonFrameworkPath, search_path_filter=r'\t+/usr/local/(opt|Cellar)')
+            PerformChanges(depdict, replacePairs, bundleExecPathAbs)
 
-      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.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." )
-      print( "               Instead, the package will directly use those Frameworks and libraries" )
-      print( "               in your Homebrew environment." )
-      print( "           (2) Rebuild KLayout with '-r|--ruby <nil|Sys>' option depending on your preference." )
-      print( "" )
+            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@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 + '/../xz'], search_path_filter=r'\t+/usr/local/(opt|Cellar)')
 
-  else:
-    print( " [8] Skipped deploying Qt's Frameworks and optional Python/Ruby Frameworks..." )
-  print( "##### Finished deploying libraries and executables for <klayout.app> #####" )
-  print("")
-  os.chdir(ProjectDir)
-  return 0
+            PerformChanges(depdict, replacePairs, bundleExecPathAbs)
+
+            print("  [9.3] Relinking dylib dependencies for klayout")
+            klayoutPath = bundleExecPathAbs
+            depdict = WalkFrameworkPaths(klayoutPath, filter_regex=r'klayout$')
+            PerformChanges(depdict, [(HBPython38FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
+
+            libKlayoutPath = bundleExecPathAbs + '../Frameworks'
+            depdict = WalkFrameworkPaths(libKlayoutPath, filter_regex=r'libklayout')
+            PerformChanges(depdict, [(HBPython38FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
+
+            print("  [9.4] Patching site.py, pip/, and distutils/")
+            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 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.
+                    if re.match("^ENABLE_USER_SITE", line) is not None:
+                        line = "ENABLE_USER_SITE = False\n"
+                    site.write(line)
+
+            #----------------------------------------------------------------------------------
+            # 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:
+                import re
+                for line in buf:
+                    # this will reject user's configuration of pip, forcing the isolated mode
+                    line = re.sub("return isolated$", "return isolated or True", line)
+                    pip.write(line)
+
+            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:
+                import re
+                for line in buf:
+                    # This will cause all packages to be installed to sys.prefix
+                    if re.match('prefix=', line) is not None:
+                        continue
+                    file.write(line)
+
+        #-------------------------------------------------------------
+        # [10] Special deployment of Ruby2.7 from Homebrew?
+        #-------------------------------------------------------------
+        deploymentRuby26HB = (ModuleRuby == 'Ruby27Brew')
+        if deploymentRuby26HB and NonOSStdLang:
+
+            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.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." )
+            print( "               Instead, the package will directly use those Frameworks and libraries" )
+            print( "               in your Homebrew environment." )
+            print( "           (2) Rebuild KLayout with '-r|--ruby <nil|Sys>' option depending on your preference." )
+            print( "" )
+
+    else:
+        print( " [8] Skipped deploying Qt's Frameworks and optional Python/Ruby Frameworks..." )
+    print( "##### Finished deploying libraries and executables for <klayout.app> #####" )
+    print("")
+    os.chdir(ProjectDir)
+    return 0
 
 #------------------------------------------------------------------------------
 ## The main function
 #------------------------------------------------------------------------------
 def main():
-  SetGlobals()
-  ParseCommandLineArguments()
+    import pprint
+    pp = pprint.PrettyPrinter(indent=4)
+    config = get_default_config()
+    parse_cli_args(config)
+    #----------------------------------------------------------
+    # [The main build stage]
+    #----------------------------------------------------------
+    parameters = get_build_parameters(config)
+    pp.pprint(parameters)
 
-  #----------------------------------------------------------
-  # [The main build stage]
-  #----------------------------------------------------------
-  ret = RunMainBuildBash()
-  if not DeploymentF and not DeploymentP:
-    if not ret == 0:
-      sys.exit(1)
-  else:
-    #----------------------------------------------------------
-    # [The deployment stage]
-    #   Deployment of dynamic link libraries, executables and
-    #   resources to make the main "klayout.app" bundle
-    #----------------------------------------------------------
-    ret = DeployBinariesForBundle()
-    if not ret == 0:
-      sys.exit(1)
+    if not config['DeploymentF'] and not config['DeploymentP']:
+        ret = run_build_command(parameters)
+        pp.pprint(config)
+        if not ret == 0:
+            sys.exit(1)
+    else:
+        #----------------------------------------------------------
+        # [The deployment stage]
+        #   Deployment of dynamic link libraries, executables and
+        #   resources to make the main "klayout.app" bundle
+        #----------------------------------------------------------
+        ret = DeployBinariesForBundle(config, parameters)
+        if not ret == 0:
+            sys.exit(1)
 
 #===================================================================================
 if __name__ == "__main__":
-  main()
+    main()
 
 #---------------
 # End of file
diff --git a/macbuild/build4mac_env.py b/macbuild/build4mac_env.py
index b87bb8a9d..89b9f7690 100755
--- a/macbuild/build4mac_env.py
+++ b/macbuild/build4mac_env.py
@@ -104,9 +104,10 @@ RubyMojave      = { 'exe': '/System/Library/Frameworks/Ruby.framework/Versions/2
 #   !!! Catalina does not allow to hack the "/System" directory; it's READ ONLY even for the super user!
 #       Hence, we need to refer to the Ruby header file in "Xcode.app" directly.
 # [Key Type Name] = 'Sys'
-CatalinaSDK = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk"
+CatalinaSDK = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk"
 RubyCatalina    = { 'exe': '/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/bin/ruby',
                     'inc': '%s/System/Library/Frameworks/Ruby.framework/Headers' % CatalinaSDK,
+                    'inc2': '%s/System/Library/Frameworks/Ruby.framework/Headers/ruby' % CatalinaSDK,
                     'lib': '/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/lib/libruby.dylib'
                   }
 
@@ -221,6 +222,21 @@ Python38Brew    = { 'exe': '%s/Versions/3.8/bin/python3.8' % HBPython38Framework
                     'lib': '%s/Versions/3.8/lib/libpython3.8.dylib' % HBPython38FrameworkPath
                   }
 
+# # Latest Python from Homebrew *+*+*+ EXPERIMENTAL *+*+*+
+# #   install with 'brew install python'
+# # [Key Type Name] = 'HBAuto'
+
+# import glob
+# # In my system, there are four candidates: (python, python3, python@3, python@3.8)
+# # Hard to tell which is going to be available to the user. Picking the last one
+# HBAutoFrameworkPath = glob.glob("/usr/local/opt/python*/Frameworks/Python.framework/")[-1]
+# # expand 3* into _py_version, there should be only one, but I am taking no chances.
+# HBAutoFrameworkVersionPath, _py_version = os.path.split(glob.glob("%s/Versions/3*" % HBAutoFrameworkPath)[0])
+# PythonAutoBrew = {  'exe': '%s/bin/python%s' % (HBAutoFrameworkVersionPath, _py_version),
+#                     'inc': '%s/include/python%s' % (HBAutoFrameworkVersionPath, _py_version),
+#                     'lib': glob.glob("%s/lib/*.dylib" % HBAutoFrameworkVersionPath)[0]
+#                   }
+
 # 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/
diff --git a/macbuild/build4mac_util.py b/macbuild/build4mac_util.py
index 3c330f8fd..0c6d0d5cc 100755
--- a/macbuild/build4mac_util.py
+++ b/macbuild/build4mac_util.py
@@ -43,15 +43,15 @@ from build4mac_env  import *
 # @return a dictionary
 #----------------------------------------------------------------------------------------
 def DecomposeLibraryDependency( depstr ):
-  alllines   = depstr.split('\n')
-  numlines   = len(alllines)
-  dependent  = alllines[0].split(':')[0].strip()
-  supporters = []
-  for line in alllines[1:]:
-    supporter = line.strip().split(' ')[0].strip()
-    if not supporter == '':
-      supporters.append(supporter)
-  return { dependent: supporters }
+    alllines   = depstr.split('\n')
+    numlines   = len(alllines)
+    dependent  = alllines[0].split(':')[0].strip()
+    supporters = []
+    for line in alllines[1:]:
+        supporter = line.strip().split(' ')[0].strip()
+        if not supporter == '':
+            supporters.append(supporter)
+    return { dependent: supporters }
 
 #----------------------------------------------------------------------------------------
 ## To print the contents of a library dependency dictionary
@@ -61,17 +61,17 @@ def DecomposeLibraryDependency( depstr ):
 # @param[in] namedic dictionary name
 #----------------------------------------------------------------------------------------
 def PrintLibraryDependencyDictionary( depdic, pathdic, namedic ):
-  keys = depdic.keys()
-  print("")
-  print("##### Contents of <%s> #####:" % namedic )
-  for key in keys:
-    supporters = depdic[key]
-    keyName = os.path.basename(key)
-    print( " %s: (%s)" % (key, pathdic[keyName]) )
-    for item in supporters:
-      itemName = os.path.basename(item)
-      if itemName != keyName and (itemName in pathdic):
-        print( "    %s (%s)" % (item, pathdic[itemName]) )
+    keys = depdic.keys()
+    print("")
+    print("##### Contents of <%s> #####:" % namedic )
+    for key in keys:
+        supporters = depdic[key]
+        keyName = os.path.basename(key)
+        print( " %s: (%s)" % (key, pathdic[keyName]) )
+        for item in supporters:
+            itemName = os.path.basename(item)
+            if itemName != keyName and (itemName in pathdic):
+                print( "    %s (%s)" % (item, pathdic[itemName]) )
 
 #----------------------------------------------------------------------------------------
 ## To set and change identification name of KLayout's dylib
@@ -81,39 +81,39 @@ def PrintLibraryDependencyDictionary( depdic, pathdic, namedic ):
 # @return 0 on success; non-zero on failure
 #----------------------------------------------------------------------------------------
 def SetChangeIdentificationNameOfDyLib( libdic, pathDic ):
-  cmdNameId     = XcodeToolChain['nameID']
-  cmdNameChg    = XcodeToolChain['nameCH']
-  dependentLibs = libdic.keys()
+    cmdNameId     = XcodeToolChain['nameID']
+    cmdNameChg    = XcodeToolChain['nameCH']
+    dependentLibs = libdic.keys()
 
-  for lib in dependentLibs:
-    #-----------------------------------------------------------
-    # [1] Set the identification name of each dependent library
-    #-----------------------------------------------------------
-    nameOld = "%s" % lib
-    libName = os.path.basename(lib)
-    nameNew = pathDic[libName]
-    command = "%s %s %s" % ( cmdNameId, nameNew, nameOld )
-    if subprocess.call( command, shell=True ) != 0:
-      msg = "!!! Failed to set the new identification name to <%s> !!!"
-      print( msg % lib, file=sys.stderr )
-      return 1
-
-    #-------------------------------------------------------------------------
-    # [2] Make the library aware of the new identifications of all supporters
-    #-------------------------------------------------------------------------
-    supporters = libdic[lib]
-    for sup in supporters:
-      supName = os.path.basename(sup)
-      if libName != supName and (supName in pathDic):
-        nameOld = "%s" % sup
-        nameNew = pathDic[supName]
-        command = "%s %s %s %s" % ( cmdNameChg, nameOld, nameNew, lib )
+    for lib in dependentLibs:
+        #-----------------------------------------------------------
+        # [1] Set the identification name of each dependent library
+        #-----------------------------------------------------------
+        nameOld = "%s" % lib
+        libName = os.path.basename(lib)
+        nameNew = pathDic[libName]
+        command = "%s %s %s" % ( cmdNameId, nameNew, nameOld )
         if subprocess.call( command, shell=True ) != 0:
-          msg = "!!! Failed to make the library aware of the new identification name <%s> of supporter <%s> !!!"
-          print( msg % (nameNew, sup), file=sys.stderr )
-          return 1
-  # for-lib
-  return 0
+            msg = "!!! Failed to set the new identification name to <%s> !!!"
+            print( msg % lib, file=sys.stderr )
+            return 1
+
+        #-------------------------------------------------------------------------
+        # [2] Make the library aware of the new identifications of all supporters
+        #-------------------------------------------------------------------------
+        supporters = libdic[lib]
+        for sup in supporters:
+            supName = os.path.basename(sup)
+            if libName != supName and (supName in pathDic):
+                nameOld = "%s" % sup
+                nameNew = pathDic[supName]
+                command = "%s %s %s %s" % ( cmdNameChg, nameOld, nameNew, lib )
+                if subprocess.call( command, shell=True ) != 0:
+                    msg = "!!! Failed to make the library aware of the new identification name <%s> of supporter <%s> !!!"
+                    print( msg % (nameNew, sup), file=sys.stderr )
+                    return 1
+    # for-lib
+    return 0
 
 #----------------------------------------------------------------------------------------
 ## To set the identification names of KLayout's libraries to an executable
@@ -148,38 +148,38 @@ def SetChangeIdentificationNameOfDyLib( libdic, pathDic ):
 # @return 0 on success; non-zero on failure
 #----------------------------------------------------------------------------------------
 def SetChangeLibIdentificationName( executable, relativedir ):
-  cmdNameId  = XcodeToolChain['nameID']
-  cmdNameChg = XcodeToolChain['nameCH']
-  otoolCm    = "otool -L %s | grep libklayout" % executable
-  otoolOut   = os.popen( otoolCm ).read()
-  exedepdic  = DecomposeLibraryDependency( executable + ":\n" + otoolOut )
-  keys       = exedepdic.keys()
-  deplibs    = exedepdic[ list(keys)[0] ]
+    cmdNameId  = XcodeToolChain['nameID']
+    cmdNameChg = XcodeToolChain['nameCH']
+    otoolCm    = "otool -L %s | grep libklayout" % executable
+    otoolOut   = os.popen( otoolCm ).read()
+    exedepdic  = DecomposeLibraryDependency( executable + ":\n" + otoolOut )
+    keys       = exedepdic.keys()
+    deplibs    = exedepdic[ list(keys)[0] ]
 
-  for lib in deplibs:
-    #-----------------------------------------------------------
-    # [1] Set the identification names for the library
-    #-----------------------------------------------------------
-    nameOld = "klayout.app/Contents/Frameworks/%s" % lib
-    nameNew = "@executable_path/%s/%s"  % ( relativedir, lib )
-    command = "%s %s %s" % ( cmdNameId, nameNew, nameOld )
-    if subprocess.call( command, shell=True ) != 0:
-      msg = "!!! Failed to set the new identification name to <%s> !!!"
-      print( msg % lib, file=sys.stderr )
-      return 1
+    for lib in deplibs:
+        #-----------------------------------------------------------
+        # [1] Set the identification names for the library
+        #-----------------------------------------------------------
+        nameOld = "klayout.app/Contents/Frameworks/%s" % lib
+        nameNew = "@executable_path/%s/%s"  % ( relativedir, lib )
+        command = "%s %s %s" % ( cmdNameId, nameNew, nameOld )
+        if subprocess.call( command, shell=True ) != 0:
+            msg = "!!! Failed to set the new identification name to <%s> !!!"
+            print( msg % lib, file=sys.stderr )
+            return 1
 
-    #-----------------------------------------------------------
-    # [2] Make the application aware of the new identification
-    #-----------------------------------------------------------
-    nameOld = "%s" % lib
-    nameNew = "@executable_path/%s/%s"  % ( relativedir, lib )
-    command = "%s %s %s %s" % ( cmdNameChg, nameOld, nameNew, executable )
-    if subprocess.call( command, shell=True ) != 0:
-      msg = "!!! Failed to make the application aware of the new identification name <%s> !!!"
-      print( msg % nameNew, file=sys.stderr )
-      return 1
-  # for-lib
-  return 0
+        #-----------------------------------------------------------
+        # [2] Make the application aware of the new identification
+        #-----------------------------------------------------------
+        nameOld = "%s" % lib
+        nameNew = "@executable_path/%s/%s"  % ( relativedir, lib )
+        command = "%s %s %s %s" % ( cmdNameChg, nameOld, nameNew, executable )
+        if subprocess.call( command, shell=True ) != 0:
+            msg = "!!! Failed to make the application aware of the new identification name <%s> !!!"
+            print( msg % nameNew, file=sys.stderr )
+            return 1
+    # for-lib
+    return 0
 
 #----------------------------------------------------------------------------------------
 ## To make a library dependency dictionary by recursively walk down the lib hierarchy
@@ -191,23 +191,23 @@ def SetChangeLibIdentificationName( executable, relativedir ):
 # @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] ]
+    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:
-      for idx, lib in enumerate(deplibs):
-        lib = str(lib)
-        if lib != list(keys)[0]:
-          deplibs[idx] = WalkLibDependencyTree(lib, depth+1, filter_regex)
-    if depth == 0:
-      return deplibs
-    return exedepdic
-  else:
-    raise RuntimeError( "Exceeded maximum recursion depth." )
+    if depth < 5:
+        if len(deplibs) > 0:
+            for idx, lib in enumerate(deplibs):
+                lib = str(lib)
+                if lib != list(keys)[0]:
+                    deplibs[idx] = WalkLibDependencyTree(lib, depth+1, filter_regex)
+        if depth == 0:
+            return deplibs
+        return exedepdic
+    else:
+        raise RuntimeError( "Exceeded maximum recursion depth." )
 
 #----------------------------------------------------------------------------------------
 ## To make a library dependency dictionary by recursively walk down the Framework
@@ -219,27 +219,27 @@ def WalkLibDependencyTree( dylibPath, depth=0, filter_regex=r'\t+/usr/local/opt'
 # @return a dictionary
 #----------------------------------------------------------------------------------------
 def WalkFrameworkPaths( frameworkPaths, filter_regex=r'\.(so|dylib)$',
-                                        search_path_filter=r'\t+/usr/local/opt' ):
+                                                                                search_path_filter=r'\t+/usr/local/opt' ):
 
-  if isinstance(frameworkPaths, str):
-    frameworkPathsIter = [frameworkPaths]
-  else:
-    frameworkPathsIter = frameworkPaths
+    if isinstance(frameworkPaths, str):
+        frameworkPathsIter = [frameworkPaths]
+    else:
+        frameworkPathsIter = frameworkPaths
 
-  dependency_dict = dict()
+    dependency_dict = dict()
 
-  for frameworkPath in frameworkPathsIter:
-    # print("Calling:", 'find %s -type f | grep -E "%s"' % (frameworkPath, filter_regex))
-    find_grep_results = os.popen('find %s -type f | grep -E "%s"' % (frameworkPath, filter_regex)).read().split('\n')
-    framework_files = filter(lambda x: x != '',
-                          map(lambda x: x.strip(),
-                                find_grep_results))
+    for frameworkPath in frameworkPathsIter:
+        # print("Calling:", 'find %s -type f | grep -E "%s"' % (frameworkPath, filter_regex))
+        find_grep_results = os.popen('find %s -type f | grep -E "%s"' % (frameworkPath, filter_regex)).read().split('\n')
+        framework_files = filter(lambda x: x != '',
+                                                    map(lambda x: x.strip(),
+                                                                find_grep_results))
 
-    dependency_dict[frameworkPath] = list()
-    for idx, file in enumerate(framework_files):
-      dict_file = {file: WalkLibDependencyTree(file, filter_regex=search_path_filter)}
-      dependency_dict[frameworkPath].append(dict_file)
-  return dependency_dict
+        dependency_dict[frameworkPath] = list()
+        for idx, file in enumerate(framework_files):
+            dict_file = {file: WalkLibDependencyTree(file, filter_regex=search_path_filter)}
+            dependency_dict[frameworkPath].append(dict_file)
+    return dependency_dict
 
 #----------------------------------------------------------------------------------------
 ## To make a list of changed libraries
@@ -250,32 +250,32 @@ def WalkFrameworkPaths( frameworkPaths, filter_regex=r'\.(so|dylib)$',
 # @return a list
 #----------------------------------------------------------------------------------------
 def WalkDictTree( dependencyDict, visited_files ):
-  libNameChanges = list()
-  for lib, dependencies in dependencyDict.items():
-    if lib in visited_files:
-      continue
+    libNameChanges = list()
+    for lib, dependencies in dependencyDict.items():
+        if lib in visited_files:
+            continue
 
-    dependency_list = list()
-    if isinstance(dependencies, list):
-      for deplib in dependencies:
-        if isinstance(deplib, str):
-          dependency_list.append(deplib)
-          if deplib not in visited_files:
-            visited_files.append(deplib)
-        elif isinstance(deplib, dict):
-          dependency_list.append(next(iter(deplib)))
-          libNameChanges.extend(WalkDictTree(deplib, visited_files))
+        dependency_list = list()
+        if isinstance(dependencies, list):
+            for deplib in dependencies:
+                if isinstance(deplib, str):
+                    dependency_list.append(deplib)
+                    if deplib not in visited_files:
+                        visited_files.append(deplib)
+                elif isinstance(deplib, dict):
+                    dependency_list.append(next(iter(deplib)))
+                    libNameChanges.extend(WalkDictTree(deplib, visited_files))
+                else:
+                    #raise RuntimeError("Unexpected value: %s" % deplib)
+                    pass
         else:
-          #raise RuntimeError("Unexpected value: %s" % deplib)
-          pass
-    else:
-      raise RuntimeError("Unexpected value: %s" % dependencies)
-    if len(dependency_list) > 0:
-      libNameChanges.append((lib, dependency_list))
-    else:
-      libNameChanges.append((lib, ))
-    visited_files.append(lib)
-  return libNameChanges
+            raise RuntimeError("Unexpected value: %s" % dependencies)
+        if len(dependency_list) > 0:
+            libNameChanges.append((lib, dependency_list))
+        else:
+            libNameChanges.append((lib, ))
+        visited_files.append(lib)
+    return libNameChanges
 
 #----------------------------------------------------------------------------------------
 ## To find the Framework name from a library name
@@ -286,10 +286,10 @@ def WalkDictTree( dependencyDict, visited_files ):
 # @return the path to a Framework
 #----------------------------------------------------------------------------------------
 def FindFramework( path, root_path ):
-  relPath = os.path.relpath(path, root_path)
-  frmPath = os.path.join(root_path, relPath.split(os.sep)[0])
-  #print( "###", frmPath, path, root_path )
-  return frmPath
+    relPath = os.path.relpath(path, root_path)
+    frmPath = os.path.join(root_path, relPath.split(os.sep)[0])
+    #print( "###", frmPath, path, root_path )
+    return frmPath
 
 #----------------------------------------------------------------------------------------
 ## To resolve an executable path
@@ -300,9 +300,9 @@ def FindFramework( path, root_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
+    """ Transforms @executable_path into executable_path"""
+    p = path.replace("@executable_path", "/%s/" % executable_path)
+    return p
 
 #----------------------------------------------------------------------------------------
 ## To detect the changed library names
@@ -315,12 +315,12 @@ def ResolveExecutablePath( path, executable_path ):
 #         * ('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))
-  return libNameChanges
+    visited_files = list()
+    libNameChanges = list()
+    for framework, libraries in frameworkDependencyDict.items():
+        for libraryDict in libraries:
+            libNameChanges.extend(WalkDictTree(libraryDict, visited_files))
+    return libNameChanges
 
 #----------------------------------------------------------------------------------------
 ## To perform the required changes
@@ -332,79 +332,79 @@ def DetectChanges(frameworkDependencyDict):
 # @return 0 on success; > 0 on failure
 #----------------------------------------------------------------------------------------
 def PerformChanges( frameworkDependencyDict, replaceFromToPairs=None, executable_path="/tmp/klayout" ):
-  libNameChanges = DetectChanges(frameworkDependencyDict)
-  #print(libNameChanges)
-  cmdNameId  = XcodeToolChain['nameID']
-  cmdNameChg = XcodeToolChain['nameCH']
+    libNameChanges = DetectChanges(frameworkDependencyDict)
+    #print(libNameChanges)
+    cmdNameId  = XcodeToolChain['nameID']
+    cmdNameChg = XcodeToolChain['nameCH']
 
-  if replaceFromToPairs is None:
-    return 0
-  else:
-    for libNameChange in libNameChanges:
-      libNameChangeIterator = iter(libNameChange)
-      lib = next(libNameChangeIterator)
-      try:
-        dependencies = next(libNameChangeIterator)
-      except StopIteration:
-        dependencies = list()
-      for replaceFrom, replaceTo, libdir in replaceFromToPairs:
-        fileName = ResolveExecutablePath(lib.replace(replaceFrom, replaceTo), executable_path)
-        if fileName.startswith('/usr'):
-          # print(f'skipping fileName: {fileName}')
-          continue
+    if replaceFromToPairs is None:
+        return 0
+    else:
+        for libNameChange in libNameChanges:
+            libNameChangeIterator = iter(libNameChange)
+            lib = next(libNameChangeIterator)
+            try:
+                dependencies = next(libNameChangeIterator)
+            except StopIteration:
+                dependencies = list()
+            for replaceFrom, replaceTo, libdir in replaceFromToPairs:
+                fileName = ResolveExecutablePath(lib.replace(replaceFrom, replaceTo), executable_path)
+                if fileName.startswith('/usr'):
+                    # print(f'skipping fileName: {fileName}')
+                    continue
 
-        if lib.find(replaceFrom) >= 0:
-          if libdir:
-            frameworkPath = FindFramework(lib, replaceFrom)
-          else:
-            frameworkPath = lib
-          destFrameworkPath = frameworkPath.replace(replaceFrom, replaceTo)
-          destFrameworkPath = ResolveExecutablePath(destFrameworkPath, executable_path)
+                if lib.find(replaceFrom) >= 0:
+                    if libdir:
+                        frameworkPath = FindFramework(lib, replaceFrom)
+                    else:
+                        frameworkPath = lib
+                    destFrameworkPath = frameworkPath.replace(replaceFrom, replaceTo)
+                    destFrameworkPath = ResolveExecutablePath(destFrameworkPath, executable_path)
 
-          if not os.path.exists(fileName):
-            print( "     NOT FOUND:", lib.replace(replaceFrom, replaceTo) )
-            print( "       COPYING:", frameworkPath, " -> ", destFrameworkPath )
-            shutil.copytree(frameworkPath, destFrameworkPath)
+                    if not os.path.exists(fileName):
+                        print( "     NOT FOUND:", lib.replace(replaceFrom, replaceTo) )
+                        print( "       COPYING:", frameworkPath, " -> ", destFrameworkPath )
+                        shutil.copytree(frameworkPath, destFrameworkPath)
 
-          nameId = lib.replace(replaceFrom, replaceTo)
-          command = "%s %s %s" % ( cmdNameId, nameId, fileName )
-          if not os.access(fileName, os.W_OK):
-            command = "chmod u+w %s; %s; chmod u-w %s" % (fileName, command, fileName)
-          # print("\t%s" % command)
-          if subprocess.call( command, shell=True ) != 0:
-            msg = "!!! Failed to set the new identification name to <%s> !!!"
-            print( msg % fileName, file=sys.stderr )
-            return 1
+                    nameId = lib.replace(replaceFrom, replaceTo)
+                    command = "%s %s %s" % ( cmdNameId, nameId, fileName )
+                    if not os.access(fileName, os.W_OK):
+                        command = "chmod u+w %s; %s; chmod u-w %s" % (fileName, command, fileName)
+                    # print("\t%s" % command)
+                    if subprocess.call( command, shell=True ) != 0:
+                        msg = "!!! Failed to set the new identification name to <%s> !!!"
+                        print( msg % fileName, file=sys.stderr )
+                        return 1
 
-        for dependency in dependencies:
-          if dependency.find(replaceFrom) >= 0:
-            print( "       IN:", fileName )
-            print( "         RENAMING:", dependency, " -> ", dependency.replace(replaceFrom, replaceTo) )
+                for dependency in dependencies:
+                    if dependency.find(replaceFrom) >= 0:
+                        print( "       IN:", fileName )
+                        print( "         RENAMING:", dependency, " -> ", dependency.replace(replaceFrom, replaceTo) )
 
-            # Try changing id first
-            nameId = dependency.replace(replaceFrom, replaceTo)
-            command = "%s %s %s" % ( cmdNameId, nameId, fileName)
-            if not os.access(str(fileName), os.W_OK):
-              command = "chmod u+w %s; %s; chmod u-w %s" % (fileName, command, fileName)
-              # print("\t%s" % command)
-            if subprocess.call( command, shell=True ) != 0:
-              msg = "!!! Failed to set the new identification name to <%s> !!!"
-              print( msg % fileName, file=sys.stderr )
-              return 1
+                        # Try changing id first
+                        nameId = dependency.replace(replaceFrom, replaceTo)
+                        command = "%s %s %s" % ( cmdNameId, nameId, fileName)
+                        if not os.access(str(fileName), os.W_OK):
+                            command = "chmod u+w %s; %s; chmod u-w %s" % (fileName, command, fileName)
+                            # print("\t%s" % command)
+                        if subprocess.call( command, shell=True ) != 0:
+                            msg = "!!! Failed to set the new identification name to <%s> !!!"
+                            print( msg % fileName, file=sys.stderr )
+                            return 1
 
-            # Rename dependencies
-            nameOld = dependency
-            nameNew = dependency.replace(replaceFrom, replaceTo)
-            command = "%s %s %s %s" % ( cmdNameChg, nameOld, nameNew, str(fileName) )
-            if not os.access(str(fileName), os.W_OK):
-              command = "chmod u+w %s; %s; chmod u-w %s" % (fileName, command, fileName)
+                        # Rename dependencies
+                        nameOld = dependency
+                        nameNew = dependency.replace(replaceFrom, replaceTo)
+                        command = "%s %s %s %s" % ( cmdNameChg, nameOld, nameNew, str(fileName) )
+                        if not os.access(str(fileName), os.W_OK):
+                            command = "chmod u+w %s; %s; chmod u-w %s" % (fileName, command, fileName)
 
-            # print("\t%s" % command)
-            if subprocess.call( command, shell=True ) != 0:
-              msg = "!!! Failed to set the new identification name to <%s> !!!"
-              print( msg % fileName, file=sys.stderr )
-              return 1
-    return 0
+                        # print("\t%s" % command)
+                        if subprocess.call( command, shell=True ) != 0:
+                            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'
@@ -414,25 +414,25 @@ def PerformChanges( frameworkDependencyDict, replaceFromToPairs=None, executable
 # @return version string
 #----------------------------------------------------------------------------------------
 def GetKLayoutVersionFrom( verfile='version.h' ):
-  version = "?.?.?"
-  try:
-    fd = open( verfile, "r" )
-    contents = fd.readlines()
-    fd.close()
-  except Exception as e:
-    return version
+    version = "?.?.?"
+    try:
+        fd = open( verfile, "r" )
+        contents = fd.readlines()
+        fd.close()
+    except Exception as e:
+        return version
 
-  verReg = re.compile( u'(KLAYOUT_VERSION=\")([0-9A-Z_a-z\.]+)(\")' )
-  for line in contents:
-    m = verReg.match(line)
-    if m:
-      # print(m.group(0)) # KLAYOUT_VERSION="0.26.1"
-      # print(m.group(1)) # KLAYOUT_VERSION="
-      # print(m.group(2)) # 0.26.1
-      # print(m.group(3)) # "
-      version = m.group(2)
-      return version
-  return version
+    verReg = re.compile( u'(KLAYOUT_VERSION=\")([0-9A-Z_a-z\.]+)(\")' )
+    for line in contents:
+        m = verReg.match(line)
+        if m:
+            # print(m.group(0)) # KLAYOUT_VERSION="0.26.1"
+            # print(m.group(1)) # KLAYOUT_VERSION="
+            # print(m.group(2)) # 0.26.1
+            # print(m.group(3)) # "
+            version = m.group(2)
+            return version
+    return version
 
 #----------------------------------------------------------------------------------------
 ## To generate the contents of "Info.plist" file from a template
@@ -443,24 +443,24 @@ def GetKLayoutVersionFrom( verfile='version.h' ):
 # @return generated strings
 #----------------------------------------------------------------------------------------
 def GenerateInfoPlist( keydic, templfile ):
-  val_exe   = keydic['exe']
-  val_icon  = keydic['icon']
-  val_bname = keydic['bname']
-  val_ver   = keydic['ver']
+    val_exe   = keydic['exe']
+    val_icon  = keydic['icon']
+    val_bname = keydic['bname']
+    val_ver   = keydic['ver']
 
-  try:
-    fd = open( templfile, "r" )
-    template = fd.read()
-    fd.close()
-  except Exception as e:
-    return "???"
+    try:
+        fd = open( templfile, "r" )
+        template = fd.read()
+        fd.close()
+    except Exception as e:
+        return "???"
 
-  t = string.Template(template)
-  s = t.substitute( EXECUTABLE = val_exe,
-                    ICONFILE   = val_icon,
-                    BUNDLENAME = val_bname,
-                    VERSION    = val_ver)
-  return s
+    t = string.Template(template)
+    s = t.substitute( EXECUTABLE = val_exe,
+                                        ICONFILE   = val_icon,
+                                        BUNDLENAME = val_bname,
+                                        VERSION    = val_ver)
+    return s
 
 #----------------
 # End of File
diff --git a/macbuild/makeDMG4mac.py b/macbuild/makeDMG4mac.py
index 04998cb33..5ef4edd6f 100755
--- a/macbuild/makeDMG4mac.py
+++ b/macbuild/makeDMG4mac.py
@@ -23,6 +23,7 @@ import platform
 import optparse
 import subprocess
 import hashlib
+import string
 
 #-------------------------------------------------------------------------------
 ## To import global dictionaries of different modules and utility functions
@@ -41,6 +42,7 @@ def SetGlobals():
   global GenOSName          # generic OS name
   global Platform           # platform
   global PkgDir             # the package directory where "klayout.app" exists
+  global UnsafePkg          # flags whether to proceed to making "invalid" dmg
   global OpClean            # 'clean' operation
   global OpMake             # 'make' operation
   global DefaultBundleName  # the default bundle name 'klayout.app'
@@ -87,6 +89,8 @@ def SetGlobals():
   Usage += "                        :   <-c|--clean> and <-m|--make> are mutually exclusive      | \n"
   Usage += "   [-b|--bundle <name>] : forcibly use this bundle name in the DMG                   | '' \n"
   Usage += "   [-s|--serial <num>]  : DMG serial number                                          | 1 \n"
+  Usage += "   <-u|--unsafe>        : Ignores a few checks (use with caution)                    | disabled \n"
+  Usage += "   <-t|--targetdmg>     : Specify output .dmg filename                               | chosen by script \n"
   Usage += "   [-?|--?]             : print this usage and exit                                  | disabled \n"
   Usage += "-------------------------------------------------------------------------------------+------------------\n"
 
@@ -131,6 +135,7 @@ def SetGlobals():
     sys.exit(1)
 
   PkgDir            = ""
+  UnsafePkg         = False
   OpClean           = False
   OpMake            = False
   DefaultBundleName = "klayout.app"
@@ -189,6 +194,8 @@ def SetGlobals():
 #         on failure, -1
 #------------------------------------------------------------------------------
 def CheckPkgDirectory():
+  global PkgDir
+  global UnsafePkg
   global Platform
   global OpClean
   global OpMake
@@ -229,76 +236,79 @@ def CheckPkgDirectory():
   regQRP = re.compile(patQRP)
   if not regQRP.match(PkgDir):
     print( "! Cannot identify (Qt, Ruby, Python) from the package directory name" )
-    print( "" )
-    return -1
+    if UnsafePkg:
+      print( "! Ignoring..." )
+    else:
+      print( "" )
+      return -1
   else:
     pkgdirComponents = regQRP.match(PkgDir).groups()
     PackagePrefix    = pkgdirComponents[0]
     QtIdentification = pkgdirComponents[2]
     RubyPythonID     = pkgdirComponents[5]
 
-  #-----------------------------------------------------------------------------
-  # [3] Check if the "LatestOS" with MacPorts / Homebrew / Anaconda3
-  #-----------------------------------------------------------------------------
-  LatestOSMacPorts   = Platform == LatestOS
-  LatestOSMacPorts  &= PackagePrefix == "LW"
-  LatestOSMacPorts  &= QtIdentification == "qt5MP"
-  LatestOSMacPorts  &= RubyPythonID == "Rmp26Pmp38"
+    #-----------------------------------------------------------------------------
+    # [3] Check if the "LatestOS" with MacPorts / Homebrew / Anaconda3
+    #-----------------------------------------------------------------------------
+    LatestOSMacPorts   = Platform == LatestOS
+    LatestOSMacPorts  &= PackagePrefix == "LW"
+    LatestOSMacPorts  &= QtIdentification == "qt5MP"
+    LatestOSMacPorts  &= RubyPythonID == "Rmp26Pmp38"
 
-  LatestOSHomebrew   = Platform == LatestOS
-  LatestOSHomebrew  &= PackagePrefix == "LW"
-  LatestOSHomebrew  &= QtIdentification == "qt5Brew"
-  LatestOSHomebrew  &= RubyPythonID == "Rhb27Phb38"
+    LatestOSHomebrew   = Platform == LatestOS
+    LatestOSHomebrew  &= PackagePrefix == "LW"
+    LatestOSHomebrew  &= QtIdentification == "qt5Brew"
+    LatestOSHomebrew  &= RubyPythonID == "Rhb27Phb38"
 
-  LatestOSAnaconda3  = Platform == LatestOS
-  LatestOSAnaconda3 &= PackagePrefix == "LW"
-  LatestOSAnaconda3 &= QtIdentification == "qt5Ana3"
-  LatestOSAnaconda3 &= RubyPythonID == "Rana3Pana3"
+    LatestOSAnaconda3  = Platform == LatestOS
+    LatestOSAnaconda3 &= PackagePrefix == "LW"
+    LatestOSAnaconda3 &= QtIdentification == "qt5Ana3"
+    LatestOSAnaconda3 &= RubyPythonID == "Rana3Pana3"
 
-  if LatestOSMacPorts:
-    mydic  = DicLightWeight["ports"]
-    srcDir = PkgDir + "/" + mydic["src"]
-    desDir = PkgDir + "/" + mydic["des"]
-    if OpMake:
-      with zipfile.ZipFile( mydic["zip"], 'r' ) as zip_ref:
-        zip_ref.extractall(PkgDir)
-      os.rename( srcDir, desDir )
-    if OpClean:
-      if os.path.isdir(srcDir):
-        shutil.rmtree(srcDir)
-      if os.path.isdir(desDir):
-        shutil.rmtree(desDir)
-    Item3AppleScript = mydic["item3"]
+    if LatestOSMacPorts:
+      mydic  = DicLightWeight["ports"]
+      srcDir = PkgDir + "/" + mydic["src"]
+      desDir = PkgDir + "/" + mydic["des"]
+      if OpMake:
+        with zipfile.ZipFile( mydic["zip"], 'r' ) as zip_ref:
+          zip_ref.extractall(PkgDir)
+        os.rename( srcDir, desDir )
+      if OpClean:
+        if os.path.isdir(srcDir):
+          shutil.rmtree(srcDir)
+        if os.path.isdir(desDir):
+          shutil.rmtree(desDir)
+      Item3AppleScript = mydic["item3"]
 
-  if LatestOSHomebrew:
-    mydic  = DicLightWeight["brew"]
-    srcDir = PkgDir + "/" + mydic["src"]
-    desDir = PkgDir + "/" + mydic["des"]
-    if OpMake:
-      with zipfile.ZipFile( mydic["zip"], 'r' ) as zip_ref:
-        zip_ref.extractall(PkgDir)
-      os.rename( srcDir, desDir )
-    if OpClean:
-      if os.path.isdir(srcDir):
-        shutil.rmtree(srcDir)
-      if os.path.isdir(desDir):
-        shutil.rmtree(desDir)
-    Item3AppleScript = mydic["item3"]
+    if LatestOSHomebrew:
+      mydic  = DicLightWeight["brew"]
+      srcDir = PkgDir + "/" + mydic["src"]
+      desDir = PkgDir + "/" + mydic["des"]
+      if OpMake:
+        with zipfile.ZipFile( mydic["zip"], 'r' ) as zip_ref:
+          zip_ref.extractall(PkgDir)
+        os.rename( srcDir, desDir )
+      if OpClean:
+        if os.path.isdir(srcDir):
+          shutil.rmtree(srcDir)
+        if os.path.isdir(desDir):
+          shutil.rmtree(desDir)
+      Item3AppleScript = mydic["item3"]
 
-  if LatestOSAnaconda3:
-    mydic  = DicLightWeight["ana3"]
-    srcDir = PkgDir + "/" + mydic["src"]
-    desDir = PkgDir + "/" + mydic["des"]
-    if OpMake:
-      with zipfile.ZipFile( mydic["zip"], 'r' ) as zip_ref:
-        zip_ref.extractall(PkgDir)
-      os.rename( srcDir, desDir )
-    if OpClean:
-      if os.path.isdir(srcDir):
-        shutil.rmtree(srcDir)
-      if os.path.isdir(desDir):
-        shutil.rmtree(desDir)
-    Item3AppleScript = mydic["item3"]
+    if LatestOSAnaconda3:
+      mydic  = DicLightWeight["ana3"]
+      srcDir = PkgDir + "/" + mydic["src"]
+      desDir = PkgDir + "/" + mydic["des"]
+      if OpMake:
+        with zipfile.ZipFile( mydic["zip"], 'r' ) as zip_ref:
+          zip_ref.extractall(PkgDir)
+        os.rename( srcDir, desDir )
+      if OpClean:
+        if os.path.isdir(srcDir):
+          shutil.rmtree(srcDir)
+        if os.path.isdir(desDir):
+          shutil.rmtree(desDir)
+      Item3AppleScript = mydic["item3"]
 
   #------------------------------------------------------
   # [4] Check the presence of the default bundle
@@ -337,6 +347,7 @@ def ParseCommandLineArguments():
   global OpMake
   global BundleName
   global DMGSerialNum
+  global UnsafePkg
   global PackagePrefix
   global QtIdentification
   global RubyPythonID
@@ -369,6 +380,16 @@ def ParseCommandLineArguments():
                 dest='dmg_serial',
                 help="DMG serial number" )
 
+  p.add_option( '-t', '--targetdmg',
+                dest='target_dmg',
+                help="output DMG filename" )
+
+  p.add_option( '-z', '--unsafe',
+                action='store_true',
+                dest='unsafe',
+                default=False,
+                help="If set, do not check whether pkg folder is empty" )
+
   p.add_option( '-?', '--??',
                 action='store_true',
                 dest='checkusage',
@@ -379,7 +400,9 @@ def ParseCommandLineArguments():
                   operation_clean   = False,
                   operation_make    = False,
                   bundle_name       = "",
+                  target_dmg        = "",
                   dmg_serial        = "1",
+                  unsafe            = False,
                   checkusage        = False )
 
   #-----------------------------------------------------------
@@ -394,6 +417,7 @@ def ParseCommandLineArguments():
   OpClean      = opt.operation_clean
   OpMake       = opt.operation_make
   DMGSerialNum = int(opt.dmg_serial)
+  UnsafePkg    = opt.unsafe
 
   if not opt.bundle_name == "":
     base, ext  = os.path.splitext( os.path.basename(opt.bundle_name) )
@@ -410,10 +434,13 @@ def ParseCommandLineArguments():
   # [2] Check the PKG directory to set QtIdentification, RubyPythonID, and BundleName
   #------------------------------------------------------------------------------------
   OccupiedDS = CheckPkgDirectory()
-  if not 0 < OccupiedDS:
+  if not 0 < OccupiedDS and not UnsafePkg:
     print( "! Failed to check the PKG directory" )
     print( "" )
     quit()
+
+  if opt.target_dmg != "":
+    TargetDMG = opt.target_dmg
   else:
     TargetDMG = "%s-klayout-%s-%s-%s-%d-%s-%s.dmg" \
                 % (PackagePrefix, KLVersion, GenOSName, Platform, DMGSerialNum, QtIdentification, RubyPythonID)
@@ -663,7 +690,8 @@ def CleanUp(msg=""):
   os.chdir(ProjectDir)
   dmgs = glob.glob( "*.dmg*" )
   for item in dmgs:
-    os.system( "rm -Rf %s" % item )
+    print("Removing %s" % item)
+    os.system( "rm -Rf -- \"%s\"" % item )
 
   #----------------------------------------------------
   # [3] Clean up AppleScript if any