From 1464ede7079dcc8c3543cd0c8b028cdded5b638f Mon Sep 17 00:00:00 2001
From: Kazunari Sekigawa <kazunari.sekigawa@gmail.com>
Date: Fri, 6 May 2022 05:01:40 +0900
Subject: [PATCH] Updated the build system for Mac (#1073)

* WIP: add "pymod"

* To fix the issue reported by GitHub ticket No.1040

* WIP: To build "pymod"

* Updated the build system for Mac.

* Updated the build system for Mac.
---
 macbuild/ReadMe.md                     |  74 ++--
 macbuild/Resources/script-bundle-A.zip | Bin 4440184 -> 4441255 bytes
 macbuild/Resources/script-bundle-B.zip | Bin 4441504 -> 4442749 bytes
 macbuild/Resources/script-bundle-P.zip | Bin 4463962 -> 4465202 bytes
 macbuild/build4mac.py                  | 449 ++++++++++++++++++-------
 5 files changed, 368 insertions(+), 155 deletions(-)

diff --git a/macbuild/ReadMe.md b/macbuild/ReadMe.md
index cb9e98f62..b0918d249 100644
--- a/macbuild/ReadMe.md
+++ b/macbuild/ReadMe.md
@@ -1,9 +1,9 @@
-Relevant KLayout version: 0.27.4<br>
+Relevant KLayout version: 0.27.9<br>
 Author: Kazzz-S<br>
-Last modified: 2021-11-07<br>
+Last modified: 2022-04-30<br>
 
 # 1. Introduction
-This directory **`macbuild`** contains different files required for building KLayout (http://www.klayout.de/) version 0.27.4 or later for different 64-bit macOS, including:
+This directory **`macbuild`** contains different files required for building KLayout (http://www.klayout.de/) version 0.27.9 or later for different 64-bit macOS, including:
 * Catalina    (10.15.7) : the primary development environment
 * Big Sur     (11.x)    : experimental; Apple M1 chip is not tested since the author does not own an M1 Mac
 * Monterey    (12.x)    : -- ditto --
@@ -53,8 +53,9 @@ $ /usr/bin/python --version
   Python 2.7.16
 ```
 
-Big Sur (11.x) and Monterey (12.x) still provide the Python 2.7 binaries to run various legacy applications.<br>
+Big Sur (11.x) and Monterey (< 12.3) still provide the Python 2.7 binaries to run various legacy applications.<br>
 However, the latest Xcode 13.1 does not allow us to link the legacy Python 2.7 library with the newly compiled KLayout binaries.<br>
+Moreover, Monterey (12.3.1) finally eliminated the Python 2.7 binaries.<br>
 Therefore, Homebrew is adopted as the default environment for Big Sur and Monterey.
 
 The build script **`build4mac.py`** provides several possible combinations of Qt5, Ruy, and Python modules to accommodate such a slightly complex environment.<br>
@@ -72,9 +73,9 @@ You need to have:
 ```
 ---------------------------------------------------------------------------------------------------------
 << Usage of 'build4mac.py' >>
-       for building KLayout 0.27.4 or later on different Apple macOS / Mac OSX platforms.
+       for building KLayout 0.27.9 or later on different Apple macOS / Mac OSX platforms.
 
-$ [python] ./build4mac.py 
+$ [python] ./build4mac.py
    option & argument    : descriptions (refer to 'macbuild/build4mac_env.py' for details)| default value
    --------------------------------------------------------------------------------------+---------------
    [-q|--qt <type>]     : case-insensitive type=['Qt5MacPorts', 'Qt5Brew', 'Qt5Ana3']    | qt5macports 
@@ -95,23 +96,24 @@ $ [python] ./build4mac.py
                         :   HB38: use Python 3.8 from Homebrew                           | 
                         :   Ana3: use Python 3.8 from Anaconda3                          | 
                         : HBAuto: use the latest Python 3.x auto-detected from Homebrew  | 
-   [-n|--noqtbinding]   : don't create Qt bindings for ruby scripts                      | disabled 
-   [-u|--noqtuitools]   : don't include uitools in Qt binding                            | disabled 
-   [-m|--make <option>] : option passed to 'make'                                        | '--jobs=4' 
-   [-d|--debug]         : enable debug mode build                                        | disabled 
-   [-c|--checkcom]      : check command-line and exit without building                   | disabled 
-   [-y|--deploy]        : deploy executables and dylibs including Qt's Frameworks        | disabled 
-   [-Y|--DEPLOY]        : deploy executables and dylibs for those who built KLayout      | disabled 
+   [-j|--jump2pymod]    : jump into <pymod> build (developer's use only)                 | disabled
+   [-n|--noqtbinding]   : don't create Qt bindings for ruby scripts                      | disabled
+   [-u|--noqtuitools]   : don't include uitools in Qt binding                            | disabled
+   [-m|--make <option>] : option passed to 'make'                                        | '--jobs=4'
+   [-d|--debug]         : enable debug mode build                                        | disabled
+   [-c|--checkcom]      : check command-line and exit without building                   | disabled
+   [-y|--deploy]        : deploy executables and dylibs including Qt's Frameworks        | disabled
+   [-Y|--DEPLOY]        : deploy executables and dylibs for those who built KLayout      | disabled
                         : from the source code and use the tools in the same machine     | 
                         : ! After confirmation of successful build of 'klayout.app',     | 
                         :   rerun this script with BOTH:                                 | 
                         :     1) the same options used for building AND                  | 
                         :     2) <-y|--deploy> OR <-Y|--DEPLOY>                          | 
                         :   optionally with [-v|--verbose <0-3>]                         | 
-   [-v|--verbose <0-3>] : verbose level of `macdeployqt' (effective with -y only)        | 1 
+   [-v|--verbose <0-3>] : verbose level of `macdeployqt' (effective with -y only)        | 1
                         : 0 = no output, 1 = error/warning (default),                    | 
                         : 2 = normal,    3 = debug                                       | 
-   [-?|--?]             : print this usage and exit                                      | disabled 
+   [-?|--?]             : print this usage and exit                                      | disabled
 -----------------------------------------------------------------------------------------+---------------
 ```
 
@@ -119,9 +121,9 @@ $ [python] ./build4mac.py
 ```
 ---------------------------------------------------------------------------------------------------------
 << Usage of 'build4mac.py' >>
-       for building KLayout 0.27.4 or later on different Apple macOS / Mac OSX platforms.
+       for building KLayout 0.27.9 or later on different Apple macOS / Mac OSX platforms.
 
-$ [python] ./build4mac.py 
+$ [python] ./build4mac.py
    option & argument    : descriptions (refer to 'macbuild/build4mac_env.py' for details)| default value
    --------------------------------------------------------------------------------------+---------------
    [-q|--qt <type>]     : case-insensitive type=['Qt5MacPorts', 'Qt5Brew', 'Qt5Ana3']    | qt5brew 
@@ -142,23 +144,24 @@ $ [python] ./build4mac.py
                         :   HB38: use Python 3.8 from Homebrew                           | 
                         :   Ana3: use Python 3.8 from Anaconda3                          | 
                         : HBAuto: use the latest Python 3.x auto-detected from Homebrew  | 
-   [-n|--noqtbinding]   : don't create Qt bindings for ruby scripts                      | disabled 
-   [-u|--noqtuitools]   : don't include uitools in Qt binding                            | disabled 
-   [-m|--make <option>] : option passed to 'make'                                        | '--jobs=4' 
-   [-d|--debug]         : enable debug mode build                                        | disabled 
-   [-c|--checkcom]      : check command-line and exit without building                   | disabled 
-   [-y|--deploy]        : deploy executables and dylibs including Qt's Frameworks        | disabled 
-   [-Y|--DEPLOY]        : deploy executables and dylibs for those who built KLayout      | disabled 
+   [-j|--jump2pymod]    : jump into <pymod> build (developer's use only)                 | disabled
+   [-n|--noqtbinding]   : don't create Qt bindings for ruby scripts                      | disabled
+   [-u|--noqtuitools]   : don't include uitools in Qt binding                            | disabled
+   [-m|--make <option>] : option passed to 'make'                                        | '--jobs=4'
+   [-d|--debug]         : enable debug mode build                                        | disabled
+   [-c|--checkcom]      : check command-line and exit without building                   | disabled
+   [-y|--deploy]        : deploy executables and dylibs including Qt's Frameworks        | disabled
+   [-Y|--DEPLOY]        : deploy executables and dylibs for those who built KLayout      | disabled
                         : from the source code and use the tools in the same machine     | 
                         : ! After confirmation of successful build of 'klayout.app',     | 
                         :   rerun this script with BOTH:                                 | 
                         :     1) the same options used for building AND                  | 
                         :     2) <-y|--deploy> OR <-Y|--DEPLOY>                          | 
                         :   optionally with [-v|--verbose <0-3>]                         | 
-   [-v|--verbose <0-3>] : verbose level of `macdeployqt' (effective with -y only)        | 1 
+   [-v|--verbose <0-3>] : verbose level of `macdeployqt' (effective with -y only)        | 1
                         : 0 = no output, 1 = error/warning (default),                    | 
                         : 2 = normal,    3 = debug                                       | 
-   [-?|--?]             : print this usage and exit                                      | disabled 
+   [-?|--?]             : print this usage and exit                                      | disabled
 -----------------------------------------------------------------------------------------+---------------
 ```
 
@@ -214,7 +217,9 @@ $ ./build4mac.py -q qt5macports -r mp27 -p mp38
 ```
 2. Confirm successful build (it will take about one hour depending on your machine spec).
 3. Run **`build4mac.py`** again with the same options used in 1. PLUS "-Y" to deploy executables and libraries under **`klayout.app`** bundle.<br>
-   The buddy command-line tools (strm*) will also be deployed in this step.
+   The buddy command-line tools (strm*) will also be deployed under **klayout.app/Contents/Buddy/** in this step.<br>
+   The KLayout Python Module (\*.whl, \*.egg) will be deployed under **klayout.app/Contents/pymod-dist/**.
+
 ```
 $ ./build4mac.py -q qt5macports -r mp27 -p mp38 -Y
 ```
@@ -239,7 +244,9 @@ $ ./build4mac.py -q qt5brew -r hb27 -p hb38
 ```
 2. Confirm successful build (it will take about one hour depending on your machine spec).
 3. Run **`build4mac.py`** again with the same options used in 1. PLUS "-Y" to deploy executables and libraries under **`klayout.app`** bundle.<br>
-   The buddy command-line tools (strm*) will also be deployed in this step.
+   The buddy command-line tools (strm*) will also be deployed under **klayout.app/Contents/Buddy/** in this step.<br>
+   The KLayout Python Module (\*.whl, \*.egg) will be deployed under **klayout.app/Contents/pymod-dist/**.
+
 ```
 $ ./build4mac.py -q qt5brew -r hb27 -p hb38 -Y
 ```
@@ -263,7 +270,8 @@ $ ./build4mac.py -q qt5brew -r sys -p hb38
 ```
 2. Confirm successful build (it will take about one hour depending on your machine spec).
 3. Run **`build4mac.py`** again with the same options used in 1. PLUS "-y" to deploy executables and libraries (including Qt's framework and Python framework) under **`klayout.app`** bundle.<br>
-   The buddy command-line tools (strm*) will also be deployed in this step.
+   The buddy command-line tools (strm*) will also be deployed under **klayout.app/Contents/Buddy/** in this step.
+
 ```
 $ ./build4mac.py -q qt5brew -r sys -p hb38 -y
 ```
@@ -289,7 +297,9 @@ $ ./build4mac.py -q qt5ana3 -r ana3 -p ana3
 ```
 2. Confirm successful build (it will take about one hour depending on your machine spec).
 3. Run **`build4mac.py`** again with the same options used in 1. PLUS "-Y" to deploy executables and libraries under **`klayout.app`** bundle.<br>
-   The buddy command-line tools (strm*) will also be deployed in this step.
+   The buddy command-line tools (strm*) will also be deployed under **klayout.app/Contents/Buddy/** in this step.<br>
+   The KLayout Python Module (\*.whl, \*.egg) will be deployed under **klayout.app/Contents/pymod-dist/**.
+
 ```
 $ ./build4mac.py -q qt5ana3 -r ana3 -p ana3 -Y
 ```
@@ -324,8 +334,8 @@ $ cd /where/'build.sh'/exists
 $ ./makeDMG4mac.py -p ST-qt5MP.pkg.macos-Catalina-release-RsysPsys -m
 ```
 This command will generate the two files below:<br>
-* **`ST-klayout-0.27.4-macOS-Catalina-1-qt5MP-RsysPsys.dmg`**      ---(1) the main DMG file
-* **`ST-klayout-0.27.4-macOS-Catalina-1-qt5MP-RsysPsys.dmg.md5`**  ---(2) MD5-value text file
+* **`ST-klayout-0.27.9-macOS-Catalina-1-qt5MP-RsysPsys.dmg`**      ---(1) the main DMG file
+* **`ST-klayout-0.27.9-macOS-Catalina-1-qt5MP-RsysPsys.dmg.md5`**  ---(2) MD5-value text file
 
 # Known issues
 Because we assume some specific versions of non-OS-standard Ruby and Python, updating MacPorts, Homebrew, or Anaconda3 may cause build- and link errors.<br>
diff --git a/macbuild/Resources/script-bundle-A.zip b/macbuild/Resources/script-bundle-A.zip
index 2e1a41015e13c07d772836fa2b9c920bc82d552d..53bbbe84bf6a789612add9bde4b617a4fb5b6cf8 100644
GIT binary patch
delta 7964
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
bW!`g=oi#TP<IKJb{`S`6;8>oF!k_*RG)fWK

delta 6905
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
EA8f@gdjJ3c

diff --git a/macbuild/Resources/script-bundle-B.zip b/macbuild/Resources/script-bundle-B.zip
index 7efc6d950a598958be574b39e82be7625183d445..a1ae588c6d88503d742dab322216b98ebed5c660 100644
GIT binary patch
delta 8185
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

delta 6934
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
V6~^Ef<jwG(JyS+zRSX8d{tM;=Zqon&

diff --git a/macbuild/Resources/script-bundle-P.zip b/macbuild/Resources/script-bundle-P.zip
index 92e9e332789981d72eba14c4cc0672a38bf94429..e9aef5d08b994641782918480f6e4ee1126aca65 100644
GIT binary patch
delta 7059
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

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

diff --git a/macbuild/build4mac.py b/macbuild/build4mac.py
index d2f97b363..9c7f1fbd3 100755
--- a/macbuild/build4mac.py
+++ b/macbuild/build4mac.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 #===============================================================================
@@ -47,7 +47,7 @@ def GenerateUsage(platform):
     usage  = "\n"
     usage += "---------------------------------------------------------------------------------------------------------\n"
     usage += "<< Usage of 'build4mac.py' >>\n"
-    usage += "       for building KLayout 0.27.4 or later on different Apple macOS / Mac OSX platforms.\n"
+    usage += "       for building KLayout 0.27.9 or later on different Apple macOS / 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"
@@ -70,6 +70,7 @@ def GenerateUsage(platform):
     usage += "                        :   HB38: use Python 3.8 from Homebrew                           | \n"
     usage += "                        :   Ana3: use Python 3.8 from Anaconda3                          | \n"
     usage += "                        : HBAuto: use the latest Python 3.x auto-detected from Homebrew  | \n"
+    usage += "   [-j|--jump2pymod]    : jump into <pymod> build (developer's use only)                 | disabled\n"
     usage += "   [-n|--noqtbinding]   : don't create Qt bindings for ruby scripts                      | disabled\n"
     usage += "   [-u|--noqtuitools]   : don't include uitools in Qt binding                            | disabled\n"
     usage += "   [-m|--make <option>] : option passed to 'make'                                        | '--jobs=4'\n"
@@ -176,6 +177,7 @@ def Get_Default_Config():
         ModuleRuby   = "nil"
         ModulePython = "nil"
 
+    Jump2Pymod    = False
     NonOSStdLang  = False
     NoQtBindings  = False
     NoQtUiTools   = False
@@ -196,6 +198,7 @@ def Get_Default_Config():
     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['Jump2Pymod']    = Jump2Pymod        # True to jump into <pymod> build
     config['NonOSStdLang']  = NonOSStdLang      # True if non-OS-standard language is chosen
     config['NoQtBindings']  = NoQtBindings      # True if not creating Qt bindings for Ruby scripts
     config['NoQtUiTools']   = NoQtUiTools       # True if not to include QtUiTools in Qt binding
@@ -235,6 +238,7 @@ def Parse_CLI_Args(config):
     ModuleQt      = config['ModuleQt']
     ModuleRuby    = config['ModuleRuby']
     ModulePython  = config['ModulePython']
+    Jump2Pymod    = config['Jump2Pymod']
     NonOSStdLang  = config['NonOSStdLang']
     NoQtBindings  = config['NoQtBindings']
     NoQtUiTools   = config['NoQtUiTools']
@@ -263,6 +267,12 @@ def Parse_CLI_Args(config):
                     dest='type_python',
                     help="Python type=['nil', 'Sys', 'MP38', 'HB38', 'Ana3', 'HBAuto']" )
 
+    p.add_option( '-j', '--jump2pymod',
+                    action='store_true',
+                    dest='jump_to_pymod',
+                    default=False,
+                    help="jump into <pymod> build (developer's use only)" )
+
     p.add_option( '-n', '--noqtbinding',
                     action='store_true',
                     dest='no_qt_binding',
@@ -317,6 +327,7 @@ def Parse_CLI_Args(config):
         p.set_defaults( type_qt        = "qt5brew",
                         type_ruby      = "hb27",
                         type_python    = "hb38",
+                        jump_to_pymod  = False,
                         no_qt_binding  = False,
                         no_qt_uitools  = False,
                         make_option    = "--jobs=4",
@@ -330,6 +341,7 @@ def Parse_CLI_Args(config):
         p.set_defaults( type_qt        = "qt5macports",
                         type_ruby      = "sys",
                         type_python    = "sys",
+                        jump_to_pymod  = False,
                         no_qt_binding  = False,
                         no_qt_uitools  = False,
                         make_option    = "--jobs=4",
@@ -473,6 +485,8 @@ def Parse_CLI_Args(config):
     # (D) Set of modules chosen
     ModuleSet = ( choiceQt5, choiceRuby, choicePython )
 
+    # (E) Set other parameters
+    Jump2Pymod   = opt.jump_to_pymod
     NoQtBindings = opt.no_qt_binding
     NoQtUiTools  = opt.no_qt_uitools
     MakeOptions  = opt.make_option
@@ -518,7 +532,7 @@ def Parse_CLI_Args(config):
         print( "" )
         print( message )
         print( "" )
-        if CheckComOnly:
+        if CheckComOnly and not Jump2Pymod:
             sys.exit(0)
 
     #-----------------------------------------------------
@@ -529,6 +543,7 @@ def Parse_CLI_Args(config):
     config['ModuleQt']      = ModuleQt
     config['ModuleRuby']    = ModuleRuby
     config['ModulePython']  = ModulePython
+    config['Jump2Pymod']    = Jump2Pymod
     config['NonOSStdLang']  = NonOSStdLang
     config['NoQtBindings']  = NoQtBindings
     config['NoQtUiTools']   = NoQtUiTools
@@ -539,7 +554,7 @@ def Parse_CLI_Args(config):
     config['DeploymentP']   = DeploymentP
     config['PackagePrefix'] = PackagePrefix
     config['DeployVerbose'] = DeployVerbose
-    config['ModuleSet']     = ModuleSet         #
+    config['ModuleSet']     = ModuleSet
     return config
 
 #------------------------------------------------------------------------------
@@ -559,6 +574,7 @@ def Get_Build_Parameters(config):
     ModuleQt      = config['ModuleQt']
     ModuleRuby    = config['ModuleRuby']
     ModulePython  = config['ModulePython']
+    Jump2Pymod    = config['Jump2Pymod']
     ModuleSet     = config['ModuleSet']
     NoQtBindings  = config['NoQtBindings']
     NoQtUiTools   = config['NoQtUiTools']
@@ -642,8 +658,162 @@ def Get_Build_Parameters(config):
 
     # (J) Extra parameters needed for deployment
     parameters['project_dir'] = ProjectDir
+
+    # (K) Extra parameters needed for <pymod>
+    #     <pymod> will be built for:
+    #       Platform     = [ 'Monterey', 'BigSur', 'Catalina' ]
+    #       ModuleRuby   = [ 'Ruby27MacPorts', 'Ruby27Brew', 'RubyAnaconda3' ]
+    #       ModulePython = [ 'Python38MacPorts', 'Python38Brew',
+    #                        'PythonAnaconda3',  'PythonAutoBrew' ]
+    parameters['Jump2Pymod']   = Jump2Pymod
+    parameters['Platform']     = Platform
+    parameters['ModuleRuby']   = ModuleRuby
+    parameters['ModulePython'] = ModulePython
+
+    PymodDistDir = dict()
+    if Platform in [ 'Monterey', 'BigSur', 'Catalina' ]:
+        if ModuleRuby in [ 'Ruby27MacPorts', 'Ruby27Brew', 'RubyAnaconda3' ]:
+            if ModulePython in ['Python38MacPorts']:
+                PymodDistDir[ModulePython] = 'dist-MP3'
+            elif ModulePython in [ 'Python38Brew', 'PythonAutoBrew' ]:
+                PymodDistDir[ModulePython] = 'dist-HB3'
+            elif ModulePython in [ 'PythonAnaconda3' ]:
+                PymodDistDir[ModulePython] = 'dist-ana3'
+    parameters['pymod_dist'] = PymodDistDir
     return parameters
 
+#------------------------------------------------------------------------------
+## To run the "setup.py" script with appropriate options for building
+#  the klayout Python Module "pymod".
+#
+# @param[in] parameters     dictionary containing the build parameters
+#
+# @return 0 on success; non-zero (1), otherwise
+#------------------------------------------------------------------------------
+def Build_pymod(parameters):
+    #---------------------------------------------------------------------------
+    # [1] <pymod> will be built for:
+    #       Platform     = [ 'Monterey', 'BigSur', 'Catalina' ]
+    #       ModuleRuby   = [ 'Ruby27MacPorts', 'Ruby27Brew', 'RubyAnaconda3' ]
+    #       ModulePython = [ 'Python38MacPorts', 'Python38Brew',
+    #                        'PythonAnaconda3',  'PythonAutoBrew' ]
+    #---------------------------------------------------------------------------
+    Platform     = parameters['Platform']
+    ModuleRuby   = parameters['ModuleRuby']
+    ModulePython = parameters['ModulePython']
+    if not Platform in [ 'Monterey', 'BigSur', 'Catalina' ]:
+        return 0
+    elif not ModuleRuby in [ 'Ruby27MacPorts', 'Ruby27Brew', 'RubyAnaconda3' ]:
+        return 0
+    elif not ModulePython in [ 'Python38MacPorts', 'Python38Brew', 'PythonAnaconda3', 'PythonAutoBrew' ]:
+        return 0
+
+    #--------------------------------------------------------------------
+    # [2] Get the new directory names (dictionary) for "dist"
+    #--------------------------------------------------------------------
+    PymodDistDir = parameters['pymod_dist']
+
+    #--------------------------------------------------------------------
+    # [3] Set different command line parameters for building <pymod>
+    #--------------------------------------------------------------------
+    cmd1_args = "   setup.py  build \\\n"
+    cmd2_args = "   setup.py  bdist_wheel \\\n"
+    cmd3_args = "   setup.py  bdist_egg \\\n"
+    cmd4_args = "   setup.py  clean --all \\\n"
+
+    #--------------------------------------------------------------------
+    # [4] Make the consolidated command lines
+    #--------------------------------------------------------------------
+    command1  = "time"
+    command1 += " \\\n   %s \\\n" % parameters['python']
+    command1 += cmd1_args
+    command1 += "   2>&1 | tee -a %s; \\\n" % parameters['logfile']
+    command1 += "   test ${PIPESTATUS[0]} -eq 0"  # tee always exits with 0
+
+    command2  = "time"
+    command2 += " \\\n   %s \\\n" % parameters['python']
+    command2 += cmd2_args
+    command2 += "   2>&1 | tee -a %s; \\\n" % parameters['logfile']
+    command2 += "   test ${PIPESTATUS[0]} -eq 0"  # tee always exits with 0
+
+    command3  = "time"
+    command3 += " \\\n   %s \\\n" % parameters['python']
+    command3 += cmd3_args
+    command3 += "   2>&1 | tee -a %s; \\\n" % parameters['logfile']
+    command3 += "   test ${PIPESTATUS[0]} -eq 0"  # tee always exits with 0
+
+    command4  = "time"
+    command4 += " \\\n   %s \\\n" % parameters['python']
+    command4 += cmd4_args
+    command4 += "   2>&1 | tee -a %s; \\\n" % parameters['logfile']
+    command4 += "   test ${PIPESTATUS[0]} -eq 0"  # tee always exits with 0
+
+    print( "" )
+    print( "### You are going to build <pymod> with the following four stages." )
+    print( "<Stage-1>")
+    print( "  ", command1 )
+    print( "" )
+
+    print( "<Stage-2>")
+    print( "  ", command2 )
+    print( "" )
+
+    print( "<Stage-3>")
+    print( "  ", command3 )
+    print( "" )
+
+    print( "<Stage-4>")
+    print( "  ", command4 )
+    print( "" )
+    if parameters['check_cmd_only']:
+        sys.exit(0)
+
+    #-----------------------------------------------------
+    # [5] Invoke the main Python scripts; takes time:-)
+    #-----------------------------------------------------
+    myscript = os.path.basename(__file__)
+    ret = subprocess.call( command1, shell=True )
+    if ret != 0:
+        print( "", file=sys.stderr )
+        print( "-------------------------------------------------------------", file=sys.stderr )
+        print( "!!! <%s>: failed to build <pymod>" % myscript, file=sys.stderr )
+        print( "-------------------------------------------------------------", file=sys.stderr )
+        print( "", file=sys.stderr )
+        return 1
+
+    ret = subprocess.call( command2, shell=True )
+    if ret != 0:
+        print( "", file=sys.stderr )
+        print( "-------------------------------------------------------------", file=sys.stderr )
+        print( "!!! <%s>: failed to build <pymod-wheel>" % myscript, file=sys.stderr )
+        print( "-------------------------------------------------------------", file=sys.stderr )
+        print( "", file=sys.stderr )
+        return 1
+
+    ret = subprocess.call( command3, shell=True )
+    if ret != 0:
+        print( "", file=sys.stderr )
+        print( "-------------------------------------------------------------", file=sys.stderr )
+        print( "!!! <%s>: failed to build <pymod-egg>" % myscript, file=sys.stderr )
+        print( "-------------------------------------------------------------", file=sys.stderr )
+        print( "", file=sys.stderr )
+        return 1
+
+    ret = subprocess.call( command4, shell=True )
+    if ret != 0:
+        print( "", file=sys.stderr )
+        print( "-------------------------------------------------------------", file=sys.stderr )
+        print( "!!! <%s>: failed to clean <pymod>" % myscript, file=sys.stderr )
+        print( "-------------------------------------------------------------", file=sys.stderr )
+        print( "", file=sys.stderr )
+        return 1
+
+    #-----------------------------------------------------
+    # [6] Rename the "dist/" directory
+    #-----------------------------------------------------
+    os.rename( "dist", PymodDistDir[ModulePython] )
+    return 0
+
 #------------------------------------------------------------------------------
 ## To run the main Bash script "build.sh" with appropriate options
 #
@@ -652,133 +822,141 @@ def Get_Build_Parameters(config):
 # @return 0 on success; non-zero (1), otherwise
 #------------------------------------------------------------------------------
 def Run_Build_Command(parameters):
-    #-----------------------------------------------------
-    # [1] Set parameters passed to the main Bash script
-    #-----------------------------------------------------
-    cmd_args = ""
+    jump2pymod = parameters['Jump2Pymod']
 
-    # (A) debug or release
-    if parameters["debug_mode"]:
-        mode      = "debug"
-        cmd_args += "  -debug"
-    else:
-        mode      = "release"
-        cmd_args += "  -release"
+    if not jump2pymod:
+        #-----------------------------------------------------
+        # [1] Set parameters passed to the main Bash script
+        #-----------------------------------------------------
+        cmd_args = ""
 
-    # (C) Target directories and files
-    MacBuildDirQAT = parameters['build'] + ".macQAT"
+        # (A) debug or release
+        if parameters["debug_mode"]:
+            mode      = "debug"
+            cmd_args += "  -debug"
+        else:
+            mode      = "release"
+            cmd_args += "  -release"
 
-    # (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']
+        # (C) Target directories and files
+        MacBuildDirQAT = parameters['build'] + ".macQAT"
 
-    # (E) want Qt bindings with Ruby scripts?
-    if parameters['no_qt_bindings']:
-        cmd_args += " \\\n  -without-qtbinding"
-    else:
-        cmd_args += " \\\n  -with-qtbinding"
+        # (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']
 
-    # (F) want QtUiTools?
-    if parameters['no_qt_uitools']:
-        cmd_args += " \\\n  -without-qt-uitools"
+        # (E) want Qt bindings with Ruby scripts?
+        if parameters['no_qt_bindings']:
+            cmd_args += " \\\n  -without-qtbinding"
+        else:
+            cmd_args += " \\\n  -with-qtbinding"
 
-    # (G) options to `make` tool
-    if 'make_options' in parameters:
-        cmd_args += " \\\n  -option %s" % parameters['make_options']
+        # (F) want QtUiTools?
+        if parameters['no_qt_uitools']:
+            cmd_args += " \\\n  -without-qt-uitools"
 
-    # (H) 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"
+        # (G) options to `make` tool
+        if 'make_options' in parameters:
+            cmd_args += " \\\n  -option %s" % parameters['make_options']
 
-    # (I) 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"
+        # (H) 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"
 
-    #-----------------------------------------------------
-    # [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
+        # (I) 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"
 
-    if parameters['check_cmd_only']:
-        print(command)
-        sys.exit(0)
+        #-----------------------------------------------------
+        # [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
 
-    #-----------------------------------------------------
-    # [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 )
+        print( "### <%s>: successfully built 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( 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 )
+            print( "-------------------------------------------------------------", file=sys.stderr )
+            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:
+            print( "", file=sys.stderr )
+            print( "-------------------------------------------------------------", file=sys.stderr )
+            print( "!!! <%s>: failed to unpack <%s>" % (myscript, tarFile), file=sys.stderr )
+            print( "-------------------------------------------------------------", file=sys.stderr )
+            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 )
 
     #------------------------------------------------------------------------
-    # [4] Prepare "*.macQAT/" directory for the QATest.
-    #     Binaries under "*.macQAT/" such as *.dylib will be touched later.
+    # [5] Build <pymod> for some predetermined environments
     #------------------------------------------------------------------------
-    print( "### Preparing <%s>" % MacBuildDirQAT )
-    if os.path.isdir( MacBuildDirQAT ):
-        shutil.rmtree( MacBuildDirQAT )
-
-    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 )
-        print( "-------------------------------------------------------------", file=sys.stderr )
-        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:
-        print( "", file=sys.stderr )
-        print( "-------------------------------------------------------------", file=sys.stderr )
-        print( "!!! <%s>: failed to unpack <%s>" % (myscript, tarFile), file=sys.stderr )
-        print( "-------------------------------------------------------------", file=sys.stderr )
-        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
+    ret = Build_pymod(parameters)
+    return ret
 
 #------------------------------------------------------------------------------
 ## For making a bundle (klayout.app), deploy built binaries and libraries
@@ -814,6 +992,13 @@ def Deploy_Binaries_For_Bundle(config, parameters):
     AbsMacBuildDir = "%s/%s" % (ProjectDir, MacBuildDir)
     AbsMacBuildLog = "%s/%s" % (ProjectDir, MacBuildLog)
 
+    try:
+        PymodDistDir = parameters['pymod_dist']
+        pymodDistDir = PymodDistDir[ModulePython]   # [ 'dist-MP3', 'dist-HB3', 'dist-ana3' ]
+    except KeyError:
+        pymodDistDir = ""
+    else:
+        pass
 
     print("")
     print( "##### Started deploying libraries and executables for <klayout.app> #####" )
@@ -852,7 +1037,7 @@ def Deploy_Binaries_For_Bundle(config, parameters):
 
 
     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.
@@ -872,24 +1057,34 @@ def Deploy_Binaries_For_Bundle(config, parameters):
     #                             |         +-- db_plugins/
     #                             |         +-- lay_plugins/
     #                             +-- Buddy/+
-    #                                       +-- 'strm2cif'
-    #                                       +-- 'strm2dxf'
-    #                                       :
-    #                                       +-- 'strmxor'
-    #-----------------------------------------------------------------
+    #                             |         +-- 'strm2cif'
+    #                             |         +-- 'strm2dxf'
+    #                             |         :
+    #                             |         +-- 'strmxor'
+    #                             |
+    #                             +-- pymod-dist/+ (created only if *.whl and *.egg are available)
+    #                                            +-- klayout-0.27.8-cp38-cp38-macosx_10_9_x86_64.whl (example)(1)
+    #                                            +-- klayout-0.27.8-py3.8-macosx-10.9-x86_64.egg (example)(2)
+    #
+    #                                            (1) *.whl is recommended to install with 'pip3'
+    #                                            (2) *.egg is for 'easy_install' users
+    #--------------------------------------------------------------------------------------------------------------
     targetDir0 = "%s/klayout.app/Contents" % AbsMacPkgDir
     targetDirR = targetDir0 + "/Resources"
     targetDirF = targetDir0 + "/Frameworks"
     targetDirM = targetDir0 + "/MacOS"
     targetDirB = targetDir0 + "/Buddy"
+    targetDirP = targetDir0 + "/pymod-dist"
     os.makedirs(targetDirR)
     os.makedirs(targetDirF)
     os.makedirs(targetDirM)
     os.makedirs(targetDirB)
+    if not pymodDistDir == "":
+        os.makedirs(targetDirP)
 
 
     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/" >>>
@@ -919,7 +1114,7 @@ def Deploy_Binaries_For_Bundle(config, parameters):
     #     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
@@ -1033,7 +1228,9 @@ def Deploy_Binaries_For_Bundle(config, parameters):
     sourceDir1 = sourceDir0 + "/MacOS"
     sourceDir2 = "%s/macbuild/Resources" % ProjectDir
     sourceDir3 = "%s" % MacBinDir
+    sourceDir4 = "%s/pymod" % MacBinDir
 
+    # (A) the main components
     tmpfileM = ProjectDir + "/macbuild/Resources/Info.plist.template"
     keydicM  = { 'exe': 'klayout', 'icon': 'klayout.icns', 'bname': 'klayout', 'ver': Version }
     plistM   = GenerateInfoPlist( keydicM, tmpfileM )
@@ -1045,18 +1242,24 @@ def Deploy_Binaries_For_Bundle(config, parameters):
     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 )
 
+    # (B) the buddy command line tools
     buddies = glob.glob( sourceDir3 + "/strm*" )
     for item in buddies:
         shutil.copy2( item, targetDirB )
         buddy = os.path.basename(item)
         os.chmod( targetDirB + "/" + buddy, 0o0755 )
 
+    # (C) the pymod
+    if not pymodDistDir == "":
+        for item in glob.glob( pymodDistDir + "/*.whl" ):
+            shutil.copy2( item,  targetDirP )
+        for item in glob.glob( pymodDistDir + "/*.egg" ):
+            shutil.copy2( item,  targetDirP )
 
     print( " [7] Setting and changing the identification names of KLayout's libraries in each executable ..." )
     #-------------------------------------------------------------