From 376ddb7cf5c51a5e3e57ff0eb6b7f8981d498c33 Mon Sep 17 00:00:00 2001
From: Kazunari Sekigawa <sekigawa@titan.ocn.ne.jp>
Date: Wed, 27 Dec 2017 19:39:24 +0900
Subject: [PATCH 1/6] Prepare Python scripts for building for Mac OSX.

This refs #4.
---
 macbuild/build4mac.py      | 334 ++++++++++++++++++++++++++++++++-----
 macbuild/build4mac_env.py  |  21 ++-
 macbuild/build4mac_util.py | 127 ++++++++++++++
 3 files changed, 436 insertions(+), 46 deletions(-)
 create mode 100755 macbuild/build4mac_util.py

diff --git a/macbuild/build4mac.py b/macbuild/build4mac.py
index ca48f0452..a32734802 100755
--- a/macbuild/build4mac.py
+++ b/macbuild/build4mac.py
@@ -10,6 +10,8 @@
 from __future__ import print_function  # to use print() of Python 3 in Python >= 2.7
 import sys
 import os
+import shutil
+import glob
 import platform
 import optparse
 import subprocess
@@ -19,13 +21,14 @@ import subprocess
 #-------------------------------------------------------------------------------
 mydir = os.path.dirname(os.path.abspath(__file__))
 sys.path.append( mydir + "/macbuild" )
-from build4mac_env import *
+from build4mac_env  import *
+from build4mac_util import *
 
 #-------------------------------------------------------------------------------
 ## To set global variables including present directory and platform info.
 #-------------------------------------------------------------------------------
 def SetGlobals():
-  global PresentDir         # present directory
+  global ProjectDir         # project directory where "build.sh" exists
   global Usage              # string on usage
   global BuildBash          # the main build Bash script
   global Platform           # platform
@@ -35,7 +38,8 @@ def SetGlobals():
   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 check the command line only
+  global CheckComOnly       # True if only for checking the command line parameters to "build.sh"
+  global Deployment         # True if deploying the binaries for a package
   # auxiliary variables on platform
   global System             # 6-tuple from platform.uname()
   global Node               # - do -
@@ -63,10 +67,15 @@ def SetGlobals():
   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 += "   [-?|--?]             : print this usage and exit                       | disabled\n"
+  Usage += "   [-y|--deploy]        : deploy built binaries with depending libraries  | disabled \n"
+  Usage += "                        : ! After confirmation of successful build of     | \n"
+  Usage += "                        :   KLayout, rerun this script with BOTH:         | \n"
+  Usage += "                        :     1) the same options used for building AND   | \n"
+  Usage += "                        :     2) [-y|--deploy]                            | \n"
+  Usage += "   [-?|--?]             : print this usage and exit                       | disabled \n"
   Usage += "---------------------------------------------------------------------------------------------\n"
 
-  PresentDir = os.getcwd()
+  ProjectDir = os.getcwd()
   BuildBash  = "./build.sh"
   (System, Node, Release, Version, Machine, Processor) = platform.uname()
 
@@ -120,6 +129,7 @@ def SetGlobals():
   MakeOptions  = "-j4"
   DebugMode    = False
   CheckComOnly = False
+  Deployment   = False
 
 #------------------------------------------------------------------------------
 ## To get command line parameters
@@ -134,6 +144,7 @@ def ParseCommandLineArguments():
   global MakeOptions
   global DebugMode
   global CheckComOnly
+  global Deployment
 
   p = optparse.OptionParser( usage=Usage )
   p.add_option( '-q', '--qt',
@@ -170,6 +181,12 @@ def ParseCommandLineArguments():
                 default=False,
                 help="check command line and exit without building" )
 
+  p.add_option( '-y', '--deploy',
+                action='store_true',
+                dest='deploy_bins',
+                default=False,
+                help="deploy built binaries" )
+
   p.add_option( '-?', '--??',
                 action='store_true',
                 dest='checkusage',
@@ -183,6 +200,7 @@ def ParseCommandLineArguments():
                   make_option   = "-j4",
                   debug_build   = False,
                   check_command = False,
+                  deploy_bins   = False,
                   checkusage    = False )
 
   opt, args = p.parse_args()
@@ -278,17 +296,22 @@ def ParseCommandLineArguments():
   MakeOptions  = opt.make_option
   DebugMode    = opt.debug_build
   CheckComOnly = opt.check_command
+  Deployment   = opt.deploy_bins
 
-  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) )
+  if not Deployment:
+    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) )
 
 #------------------------------------------------------------------------------
-## To run the main Bash script with appropriate options
+## To run the main Bash script "build.sh" with appropriate options
+#
+# @return 0 on success; non-zero on failure
 #------------------------------------------------------------------------------
-def Run():
+def RunMainBuildBash():
+  global ProjectDir
   global Platform
   global BuildBash
   global ModuleQt
@@ -298,9 +321,15 @@ def Run():
   global MakeOptions
   global DebugMode
   global CheckComOnly
-  global MacBinDir    # binary directory
-  global MacBuildDir  # build directory
-  global MacBuildLog  # build log file
+  global Deployment
+  global MacPkgDir       # relative path to package directory
+  global MacBinDir       # relative path to binary directory
+  global MacBuildDir     # relative path to build directory
+  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 AbsMacBuildLog  # absolute path to build log file
 
   #-----------------------------------------------------
   # [1] Set parameters passed to the main Bash script
@@ -317,21 +346,31 @@ def Run():
 
   # (B) Qt4 or Qt5
   if ModuleQt == 'Qt4MacPorts':
-    parameters += " \\\n  -qt4"
-    parameters += " \\\n  -qmake  %s" % Qt4MacPorts['qmake']
-    MacBinDir   = "./qt4.bin.macos-%s-%s"       % (Platform, mode)
-    MacBuildDir = "./qt4.build.macos-%s-%s"     % (Platform, mode)
-    MacBuildLog = "./qt4.build.macos-%s-%s.log" % (Platform, mode)
-    parameters += " \\\n  -bin    %s" % MacBinDir
-    parameters += " \\\n  -build  %s" % MacBuildDir
+    parameters    += " \\\n  -qt4"
+    parameters    += " \\\n  -qmake  %s" % Qt4MacPorts['qmake']
+    MacPkgDir      = "./qt4.pkg.macos-%s-%s/"       % (Platform, mode)
+    MacBinDir      = "./qt4.bin.macos-%s-%s/"       % (Platform, mode)
+    MacBuildDir    = "./qt4.build.macos-%s-%s/"     % (Platform, mode)
+    MacBuildLog    = "./qt4.build.macos-%s-%s.log"  % (Platform, mode)
+    AbsMacPkgDir   = "%s/qt4.pkg.macos-%s-%s/"      % (ProjectDir, Platform, mode)
+    AbsMacBinDir   = "%s/qt4.bin.macos-%s-%s/"      % (ProjectDir, Platform, mode)
+    AbsMacBuildDir = "%s/qt4.build.macos-%s-%s/"    % (ProjectDir, Platform, mode)
+    AbsMacBuildLog = "%s/qt4.build.macos-%s-%s.log" % (ProjectDir, Platform, mode)
+    parameters    += " \\\n  -bin    %s" % MacBinDir
+    parameters    += " \\\n  -build  %s" % MacBuildDir
   elif ModuleQt == 'Qt5MacPorts':
-    parameters += " \\\n  -qt5"
-    parameters += " \\\n  -qmake  %s" % Qt5MacPorts['qmake']
-    MacBinDir   = "./qt5.bin.macos-%s-%s"       % (Platform, mode)
-    MacBuildDir = "./qt5.build.macos-%s-%s"     % (Platform, mode)
-    MacBuildLog = "./qt5.build.macos-%s-%s.log" % (Platform, mode)
-    parameters += " \\\n  -bin    %s" % MacBinDir
-    parameters += " \\\n  -build  %s" % MacBuildDir
+    parameters    += " \\\n  -qt5"
+    parameters    += " \\\n  -qmake  %s" % Qt5MacPorts['qmake']
+    MacPkgDir      = "./qt5.pkg.macos-%s-%s/"       % (Platform, mode)
+    MacBinDir      = "./qt5.bin.macos-%s-%s/"       % (Platform, mode)
+    MacBuildDir    = "./qt5.build.macos-%s-%s/"     % (Platform, mode)
+    MacBuildLog    = "./qt5.build.macos-%s-%s.log"  % (Platform, mode)
+    AbsMacPkgDir   = "%s/qt5.pkg.macos-%s-%s/"      % (ProjectDir, Platform, mode)
+    AbsMacBinDir   = "%s/qt5.bin.macos-%s-%s/"      % (ProjectDir, Platform, mode)
+    AbsMacBuildDir = "%s/qt5.build.macos-%s-%s/"    % (ProjectDir, Platform, mode)
+    AbsMacBuildLog = "%s/qt5.build.macos-%s-%s.log" % (ProjectDir, Platform, mode)
+    parameters    += " \\\n  -bin    %s" % MacBinDir
+    parameters    += " \\\n  -build  %s" % MacBuildDir
 
   # (C) want Qt bindings with Ruby scripts?
   if NoQtBindings:
@@ -373,21 +412,220 @@ def Run():
   #-----------------------------------------------------
   # [3] Invoke the main Bash script
   #-----------------------------------------------------
-  myscript = "build4mac.py"
-  if subprocess.call( command, shell=True ) != 0:
-    print("")
-    print( "-------------------------------------------------------------" )
-    print( "!!! <%s>: failed to build KLayout" % myscript, file=sys.stderr )
-    print( "-------------------------------------------------------------" )
-    print("")
-    sys.exit(1)
+  if Deployment:
+    return(0)
   else:
-    print("")
-    print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" )
-    print( "### <%s>: successfully built KLayout" % myscript, file=sys.stderr )
-    print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" )
-    print("")
-    sys.exit(0)
+    myscript = "build4mac.py"
+    if subprocess.call( command, shell=True ) != 0:
+      print("")
+      print( "-------------------------------------------------------------" )
+      print( "!!! <%s>: failed to build KLayout" % myscript, file=sys.stderr )
+      print( "-------------------------------------------------------------" )
+      print("")
+      return(1)
+    else:
+      print("")
+      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" )
+      print( "### <%s>: successfully built KLayout" % myscript, file=sys.stderr )
+      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" )
+      print("")
+      return(0)
+
+#------------------------------------------------------------------------------
+## To deploy built binaries and depending libraries for making a bundle
+#
+# Reference: "Deploying an Application on Mac OS X" of Qt Assistant.
+#
+# @return 0 on success; non-zero on failure
+#------------------------------------------------------------------------------
+def DeployBinariesForBundle():
+  global ProjectDir
+  global ModuleQt
+  global Deployment
+  global MacPkgDir
+  global MacBinDir
+  global MacBuildDir
+  global MacBuildLog
+  global AbsMacPkgDir
+  global AbsMacBinDir
+  global AbsMacBuildDir
+  global AbsMacBuildLog
+
+  #-------------------------------------------------------------
+  # [1] Check the status of working directory
+  #-------------------------------------------------------------
+  os.chdir(ProjectDir)
+  if not Deployment:
+    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)
+
+  #-------------------------------------------------------------
+  # [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)
+
+  #-------------------------------------------------------------
+  # [3] Create the directory skeleton for "klayout.app" bundle
+  #     and command line buddy tools such as "strm2cif"
+  #     that should look like...
+  #
+  #    klayout.app/+
+  #                +-- Contents/+
+  #                             +-- Info.plist
+  #                             +-- MacOS/+
+  #                                       +-- 'klayout'
+  #                             +-- PkgInfo
+  #                             +-- Resources/
+  #                             +-- Frameworks/
+  #                             +-- buddy_tool/+
+  #                                            +-- 'strm2cif'
+  #                                            +-- 'strm2dxf'
+  #                                            :
+  #                                            +-- 'strmxor'
+  #-------------------------------------------------------------
+  targetDir0 = "%s/klayout.app/Contents/" % AbsMacPkgDir
+  targetDir1 = targetDir0 + "MacOS/"
+  targetDir2 = targetDir0 + "Resources/"
+  targetDir3 = targetDir0 + "Frameworks/"
+  targetDir4 = targetDir0 + "buddy_tool/"
+  os.makedirs(targetDir1)
+  os.makedirs(targetDir2)
+  os.makedirs(targetDir3)
+  os.makedirs(targetDir4)
+
+  #-------------------------------------------------------------
+  # [4] Copy KLayout's dynamic link libraries to "Frameworks/"
+  #     and create two library dependency dictionaries.
+  #     Do this job in "Frameworks/"
+  #-------------------------------------------------------------
+  os.chdir( targetDir3 )
+  dylibs     = glob.glob( AbsMacBinDir + "*.dylib" )
+  depDicReal = {} # library dependency dictionary for "real file"
+  depDicLink = {} # library dependency dictionary for "symbolic link"
+  for item in dylibs:
+    #-------------------------------------------------------------------
+    # (A) Copy an ordinary *.dylib file here and set its mode to 0755
+    #     then get inter-library dependencies
+    #-------------------------------------------------------------------
+    if os.path.isfile(item) and not os.path.islink(item):
+      nameReal = os.path.basename(item)
+      shutil.copy2( item, "./" )
+      os.chmod( nameReal, 0755 )
+      otoolCm   = "otool -L %s | grep libklayout" % nameReal
+      otoolOut  = os.popen( otoolCm ).read()
+      dependDic = DecomposeLibraryDependency(otoolOut)
+      depDicReal.update(dependDic)
+    #-------------------------------------------------------------------
+    # (B) Recreate a symbolic link
+    #     then get inter-library dependencies
+    #-------------------------------------------------------------------
+    elif os.path.isfile(item) and os.path.islink(item):
+      nameLink = os.path.basename(item)
+      nameReal = os.path.basename( os.path.realpath(item) )
+      os.symlink( nameReal, nameLink )
+      otoolCm   = "otool -L %s | grep libklayout" % nameLink
+      otoolOut  = os.popen( otoolCm ).read()
+      dependDic = DecomposeLibraryDependency(otoolOut)
+      depDicLink.update(dependDic)
+  '''
+  PrintLibraryDependencyDictionary( depDicReal, "Ordinary/Real" )
+  PrintLibraryDependencyDictionary( depDicLink, "Symbolic Link")
+  quit()
+  '''
+
+  #-------------------------------------------------------------
+  # [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
+  #-------------------------------------------------------------
+
+
+  #-------------------------------------------------------------
+  # [6] Copy known some files in source directories to
+  #     relevant target directories
+  #-------------------------------------------------------------
+  os.chdir(ProjectDir)
+  sourceDir0 = "%s/klayout.app/Contents/" % MacBinDir
+  sourceDir1 = sourceDir0 + "MacOS/"
+  sourceDir2 = "%s/etc/" % ProjectDir
+  sourceDir3 = "%s/src/klayout_main/" % ProjectDir
+  sourceDir4 = "%s" % MacBinDir
+
+  shutil.copy2( sourceDir0 + "Info.plist", targetDir0 )
+  shutil.copy2( sourceDir1 + "klayout",    targetDir1 )
+  shutil.copy2( sourceDir2 + "logo.png",   targetDir2 )
+  shutil.copy2( sourceDir3 + "logo.ico",   targetDir2 )
+
+  os.chmod( targetDir0 + "Info.plist", 0644 )
+  os.chmod( targetDir1 + "klayout",    0755 )
+  os.chmod( targetDir2 + "logo.png",   0644 )
+  os.chmod( targetDir2 + "logo.ico",   0644 )
+
+  buddies = glob.glob( sourceDir4 + "strm*" )
+  for item in buddies:
+    shutil.copy2( item, targetDir4 )
+    buddy = os.path.basename(item)
+    os.chmod( targetDir4 + buddy, 0755 )
+
+  #-------------------------------------------------------------
+  # [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:
+    os.chdir(ProjectDir)
+    print( "!!! Failed to set/change library identification name for <%s> !!!" % klayoutexec, \
+           file=sys.stderr )
+    return(1)
+
+  buddies = glob.glob( "klayout.app/Contents/buddy_tool/strm*" )
+  for buddy in buddies:
+    ret = SetChangeLibIdentificationName( buddy, "../Frameworks" )
+    if not ret == 0:
+      os.chdir(ProjectDir)
+      print( "!!! Failed to set/change library identification name for <%s> !!!" % buddy, \
+             file=sys.stderr )
+      return(1)
+
+  #-------------------------------------------------------------
+  # [8] Deploying Applications on OS X including Qt frameworks
+  #-------------------------------------------------------------
+  if ModuleQt == 'Qt4MacPorts':
+    deploytool = Qt4MacPorts['deploy']
+    app_bundle = "klayout.app"
+    options    = "-libpath=klayout.app/Contents/Frameworks"
+  elif ModuleQt == 'Qt5MacPorts':
+    deploytool = Qt5MacPorts['deploy']
+    app_bundle = "klayout.app"
+    options    = "-libpath=klayout.app/Contents/Frameworks"
+
+  os.chdir(ProjectDir)
+  os.chdir(MacPkgDir)
+  command = "%s %s %s" % ( deploytool, app_bundle, options )
+  if subprocess.call( command, shell=True ) != 0:
+    print( "!!! Failed to deploy applications on OSX !!!", file=sys.stderr )
+    os.chdir(ProjectDir)
+    return(1)
+  else:
+    print( "### Deployed applications on OS X ###", file=sys.stderr )
+    os.chdir(ProjectDir)
+    return(0)
 
 #------------------------------------------------------------------------------
 ## The main function
@@ -395,7 +633,15 @@ def Run():
 def main():
   SetGlobals()
   ParseCommandLineArguments()
-  Run()
+  ret = RunMainBuildBash()
+  if not Deployment:
+    if ret == 0:
+      sys.exit(0)
+    else:
+      sys.exit(1)
+  else:
+    ret = DeployBinariesForBundle()
+    sys.exit(ret)
 
 #===================================================================================
 if __name__ == "__main__":
diff --git a/macbuild/build4mac_env.py b/macbuild/build4mac_env.py
index 3d06235dd..678d77475 100755
--- a/macbuild/build4mac_env.py
+++ b/macbuild/build4mac_env.py
@@ -11,6 +11,13 @@
 # This file is imported by 'build4mac.py' script.
 #===============================================================================
 
+#-----------------------------------------------------
+# [0] Xcode
+#-----------------------------------------------------
+XcodeToolChain = { 'nameID': '/usr/bin/install_name_tool -id ',
+                   'nameCH': '/usr/bin/install_name_tool -change '
+                 }
+
 #-----------------------------------------------------
 # [1] Qt
 #-----------------------------------------------------
@@ -20,14 +27,16 @@ Qts = [ 'Qt4MacPorts', 'Qt5MacPorts' ]
 # Whereabout of different components of Qt4
 #-----------------------------------------------------
 # Qt4 from MacPorts (https://www.macports.org/)
-Qt4MacPorts = { 'qmake': '/opt/local/libexec/qt4/bin/qmake'
+Qt4MacPorts = { 'qmake' : '/opt/local/libexec/qt4/bin/qmake',
+                'deploy': '/opt/local/libexec/qt4/bin/macdeployqt'
               }
 
 #-----------------------------------------------------
 # Whereabout of different components of Qt5
 #-----------------------------------------------------
 # Qt5 from MacPorts (https://www.macports.org/)
-Qt5MacPorts = { 'qmake': '/opt/local/libexec/qt5/bin/qmake'
+Qt5MacPorts = { 'qmake' : '/opt/local/libexec/qt5/bin/qmake',
+                'deploy': '/opt/local/libexec/qt5/bin/macdeployqt'
               }
 
 #-----------------------------------------------------
@@ -138,6 +147,14 @@ PythonDictionary= { 'nil'             : None,
                     'Anaconda27'      : Anaconda27,
                     'Anaconda36'      : Anaconda36
                   }
+
+#-----------------------------------------------------
+# [4] KLayout executables
+#-----------------------------------------------------
+KLayoutExecs  = ['klayout']
+KLayoutExecs += ['strm2cif', 'strm2dxf', 'strm2gds', 'strm2gdstxt', 'strm2oas']
+KLayoutExecs += ['strm2txt', 'strmclip', 'strmcmp',  'strmrun',     'strmxor']
+
 #----------------
 # End of File
 #----------------
diff --git a/macbuild/build4mac_util.py b/macbuild/build4mac_util.py
new file mode 100755
index 000000000..cd452d58d
--- /dev/null
+++ b/macbuild/build4mac_util.py
@@ -0,0 +1,127 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+
+#===============================================================================
+# File: "macbuild/build4mac_util.py"
+#
+# Here are utility functions and classes ...
+#  for building KLayout (http://www.klayout.de/index.php)
+#  version 0.25 or later on different Apple Mac OSX platforms.
+#
+# This file is imported by 'build4mac.py' script.
+#===============================================================================
+from __future__ import print_function  # to use print() of Python 3 in Python >= 2.7
+import sys
+import os
+import subprocess
+
+#-------------------------------------------------------------------------------
+## To import global dictionaries of different modules
+#-------------------------------------------------------------------------------
+mydir = os.path.dirname(os.path.abspath(__file__))
+sys.path.append( mydir )
+from build4mac_env  import *
+
+#------------------------------------------------------------------------------
+## To decompose strings obtained by 'otool -L <*.dylib>' command and to
+#  generate a dictionary of library dependency.
+#
+# @param[in] depstr   strings that tell dependency such as:
+#
+#  libklayout_edt.0.25.0.dylib: <=== key
+#    libklayout_edt.0.dylib (compatibility version 0.25.0, current version 0.25.0)
+#    libklayout_tl.0.dylib (compatibility version 0.25.0, current version 0.25.0)
+#    libklayout_gsi.0.dylib (compatibility version 0.25.0, current version 0.25.0)
+#    libklayout_laybasic.0.dylib (compatibility version 0.25.0, current version 0.25.0)
+#    libklayout_db.0.dylib (compatibility version 0.25.0, current version 0.25.0)
+#
+# @return a dictionary
+#------------------------------------------------------------------------------
+def DecomposeLibraryDependency( depstr ):
+  alllines   = depstr.split('\n')
+  numlines   = len(alllines)
+  dependent  = alllines[0].split(':')[0].strip(' ').strip('\t')
+  supporters = []
+  for i in range(1, numlines):
+    supporter = alllines[i].split(' ')[0].strip(' ').strip('\t')
+    if not supporter == '':
+      supporters.append(supporter)
+  return { dependent: supporters }
+
+#------------------------------------------------------------------------------
+## To print the contents of a library dependency dictionary
+#
+# @param[in] depdic  dictionary
+# @param[in] namedic dictionary name
+#------------------------------------------------------------------------------
+def PrintLibraryDependencyDictionary( depdic, namedic ):
+  keys = depdic.keys()
+  print("")
+  print("##### Contents of <%s> #####:" % namedic )
+  for key in keys:
+    supporters = depdic[key]
+    print( " %s:" % key )
+    for item in supporters:
+      print( "    %s" % item )
+
+#------------------------------------------------------------------------------
+## To set the identification names of KLayout's libraries to an executable
+#     and make the application aware of the library locations
+#
+# @param[in] executable    path/to/executable -- (1)
+# @param[in] relativedir   directory of dylib relative to executable -- (2)
+#
+# Example:  (1) "klayout.app/Contents/MacOS/klayout"
+#           (2) "../Frameworks"
+#
+#    klayout.app/+
+#                +-- Contents/+
+#                             +-- Info.plist
+#                             +-- MacOS/+
+#                                       +-- 'klayout'
+#                             +-- PkgInfo
+#                             +-- Resources/
+#                             +-- Frameworks/
+#                             +-- buddy_tool/+
+#                                            +-- 'strm2cif'
+#                                            +-- 'strm2dxf'
+#                                            :
+#                                            +-- 'strmxor'
+#
+# @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[ keys[0] ]
+  for lib in deplibs:
+    #-----------------------------------------------------------
+    # (A) 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:
+      print( "!!! Failed to set the new identification name to <%s> !!!" % lib, \
+             file=sys.stderr )
+      return(1)
+    #-----------------------------------------------------------
+    # (B) 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:
+      print( "!!! Failed to make the application aware of the new identification name <%s> !!!" % nameNew, \
+             file=sys.stderr )
+      return(1)
+
+  return(0)
+
+#----------------
+# End of File
+#----------------

From 978ac4786e36b78842b5a2453172328c3b6a72c9 Mon Sep 17 00:00:00 2001
From: Kazunari Sekigawa <sekigawa@titan.ocn.ne.jp>
Date: Wed, 27 Dec 2017 22:56:36 +0900
Subject: [PATCH 2/6] Prepare Python scripts for building for Mac OSX.

This refs #4.
---
 macbuild/build4mac.py | 132 ++++++++++++++++++++++++------------------
 1 file changed, 75 insertions(+), 57 deletions(-)

diff --git a/macbuild/build4mac.py b/macbuild/build4mac.py
index a32734802..31cbdf169 100755
--- a/macbuild/build4mac.py
+++ b/macbuild/build4mac.py
@@ -348,26 +348,26 @@ def RunMainBuildBash():
   if ModuleQt == 'Qt4MacPorts':
     parameters    += " \\\n  -qt4"
     parameters    += " \\\n  -qmake  %s" % Qt4MacPorts['qmake']
-    MacPkgDir      = "./qt4.pkg.macos-%s-%s/"       % (Platform, mode)
-    MacBinDir      = "./qt4.bin.macos-%s-%s/"       % (Platform, mode)
-    MacBuildDir    = "./qt4.build.macos-%s-%s/"     % (Platform, mode)
+    MacPkgDir      = "./qt4.pkg.macos-%s-%s"        % (Platform, mode)
+    MacBinDir      = "./qt4.bin.macos-%s-%s"        % (Platform, mode)
+    MacBuildDir    = "./qt4.build.macos-%s-%s"      % (Platform, mode)
     MacBuildLog    = "./qt4.build.macos-%s-%s.log"  % (Platform, mode)
-    AbsMacPkgDir   = "%s/qt4.pkg.macos-%s-%s/"      % (ProjectDir, Platform, mode)
-    AbsMacBinDir   = "%s/qt4.bin.macos-%s-%s/"      % (ProjectDir, Platform, mode)
-    AbsMacBuildDir = "%s/qt4.build.macos-%s-%s/"    % (ProjectDir, Platform, mode)
+    AbsMacPkgDir   = "%s/qt4.pkg.macos-%s-%s"       % (ProjectDir, Platform, mode)
+    AbsMacBinDir   = "%s/qt4.bin.macos-%s-%s"       % (ProjectDir, Platform, mode)
+    AbsMacBuildDir = "%s/qt4.build.macos-%s-%s"     % (ProjectDir, Platform, mode)
     AbsMacBuildLog = "%s/qt4.build.macos-%s-%s.log" % (ProjectDir, Platform, mode)
     parameters    += " \\\n  -bin    %s" % MacBinDir
     parameters    += " \\\n  -build  %s" % MacBuildDir
   elif ModuleQt == 'Qt5MacPorts':
     parameters    += " \\\n  -qt5"
     parameters    += " \\\n  -qmake  %s" % Qt5MacPorts['qmake']
-    MacPkgDir      = "./qt5.pkg.macos-%s-%s/"       % (Platform, mode)
-    MacBinDir      = "./qt5.bin.macos-%s-%s/"       % (Platform, mode)
-    MacBuildDir    = "./qt5.build.macos-%s-%s/"     % (Platform, mode)
+    MacPkgDir      = "./qt5.pkg.macos-%s-%s"        % (Platform, mode)
+    MacBinDir      = "./qt5.bin.macos-%s-%s"        % (Platform, mode)
+    MacBuildDir    = "./qt5.build.macos-%s-%s"      % (Platform, mode)
     MacBuildLog    = "./qt5.build.macos-%s-%s.log"  % (Platform, mode)
-    AbsMacPkgDir   = "%s/qt5.pkg.macos-%s-%s/"      % (ProjectDir, Platform, mode)
-    AbsMacBinDir   = "%s/qt5.bin.macos-%s-%s/"      % (ProjectDir, Platform, mode)
-    AbsMacBuildDir = "%s/qt5.build.macos-%s-%s/"    % (ProjectDir, Platform, mode)
+    AbsMacPkgDir   = "%s/qt5.pkg.macos-%s-%s"       % (ProjectDir, Platform, mode)
+    AbsMacBinDir   = "%s/qt5.bin.macos-%s-%s"       % (ProjectDir, Platform, mode)
+    AbsMacBuildDir = "%s/qt5.build.macos-%s-%s"     % (ProjectDir, Platform, mode)
     AbsMacBuildLog = "%s/qt5.build.macos-%s-%s.log" % (ProjectDir, Platform, mode)
     parameters    += " \\\n  -bin    %s" % MacBinDir
     parameters    += " \\\n  -build  %s" % MacBuildDir
@@ -506,46 +506,64 @@ def DeployBinariesForBundle():
   os.makedirs(targetDir3)
   os.makedirs(targetDir4)
 
-  #-------------------------------------------------------------
-  # [4] Copy KLayout's dynamic link libraries to "Frameworks/"
-  #     and create two library dependency dictionaries.
-  #     Do this job in "Frameworks/"
-  #-------------------------------------------------------------
+  #-------------------------------------------------------------------------------
+  # [4] Copy KLayout's dynamic link libraries to "Frameworks/" and create
+  #     the library dependency dictionary.
+  #     <<< Do this job in "Frameworks/" >>>
+  #
+  # Note:
+  #     A dynamic link library is built as below:
+  #       (1) libklayout_lay.0.25.0.dylib
+  #       (2) libklayout_lay.0.25.dylib -> libklayout_lay.0.25.0.dylib
+  #       (3) libklayout_lay.0.dylib -> libklayout_lay.0.25.0.dylib
+  #       (4) libklayout_lay.dylib -> libklayout_lay.0.25.0.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:
+  #   MacBookPro(1)$ otool -L klayout
+  #   klayout:
+  #       :
+  #       :
+  #     libklayout_tl.0.dylib (compatibility version 0.25.0, current version 0.25.0)
+  #     libklayout_gsi.0.dylib (compatibility version 0.25.0, current version 0.25.0)
+  #     libklayout_db.0.dylib (compatibility version 0.25.0, current version 0.25.0)
+  #       :
+  #-------------------------------------------------------------------------------
   os.chdir( targetDir3 )
-  dylibs     = glob.glob( AbsMacBinDir + "*.dylib" )
-  depDicReal = {} # library dependency dictionary for "real file"
-  depDicLink = {} # library dependency dictionary for "symbolic link"
-  for item in dylibs:
-    #-------------------------------------------------------------------
-    # (A) Copy an ordinary *.dylib file here and set its mode to 0755
-    #     then get inter-library dependencies
-    #-------------------------------------------------------------------
+  dynamicLinkLibs = glob.glob( AbsMacBinDir + "/*.dylib" )
+  depDicOrdinary  = {} # inter-library dependency dictionary
+  for item in dynamicLinkLibs:
     if os.path.isfile(item) and not os.path.islink(item):
-      nameReal = os.path.basename(item)
-      shutil.copy2( item, "./" )
-      os.chmod( nameReal, 0755 )
-      otoolCm   = "otool -L %s | grep libklayout" % nameReal
+      #-------------------------------------------------------------------
+      # (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', '25', '0', 'dylib' ]
+      nameStyle3 = fullName[0] + "." + fullName[1] + ".dylib"
+      shutil.copy2( item, nameStyle3 )
+      os.chmod( nameStyle3, 0755 )
+      #-------------------------------------------------------------------
+      # (B) Then get inter-library dependencies
+      #-------------------------------------------------------------------
+      otoolCm   = "otool -L %s | grep libklayout" % nameStyle3
       otoolOut  = os.popen( otoolCm ).read()
       dependDic = DecomposeLibraryDependency(otoolOut)
-      depDicReal.update(dependDic)
-    #-------------------------------------------------------------------
-    # (B) Recreate a symbolic link
-    #     then get inter-library dependencies
-    #-------------------------------------------------------------------
-    elif os.path.isfile(item) and os.path.islink(item):
-      nameLink = os.path.basename(item)
-      nameReal = os.path.basename( os.path.realpath(item) )
-      os.symlink( nameReal, nameLink )
-      otoolCm   = "otool -L %s | grep libklayout" % nameLink
-      otoolOut  = os.popen( otoolCm ).read()
-      dependDic = DecomposeLibraryDependency(otoolOut)
-      depDicLink.update(dependDic)
+      depDicOrdinary.update(dependDic)
   '''
-  PrintLibraryDependencyDictionary( depDicReal, "Ordinary/Real" )
-  PrintLibraryDependencyDictionary( depDicLink, "Symbolic Link")
+  PrintLibraryDependencyDictionary( depDicOrdinary, "Style (3)" )
   quit()
   '''
 
+
   #-------------------------------------------------------------
   # [5] Set the identification names for KLayout's libraries
   #     and make the library aware of the locations of libraries
@@ -558,23 +576,23 @@ def DeployBinariesForBundle():
   #     relevant target directories
   #-------------------------------------------------------------
   os.chdir(ProjectDir)
-  sourceDir0 = "%s/klayout.app/Contents/" % MacBinDir
-  sourceDir1 = sourceDir0 + "MacOS/"
-  sourceDir2 = "%s/etc/" % ProjectDir
-  sourceDir3 = "%s/src/klayout_main/" % ProjectDir
+  sourceDir0 = "%s/klayout.app/Contents" % MacBinDir
+  sourceDir1 = sourceDir0 + "/MacOS"
+  sourceDir2 = "%s/etc" % ProjectDir
+  sourceDir3 = "%s/src/klayout_main" % ProjectDir
   sourceDir4 = "%s" % MacBinDir
 
-  shutil.copy2( sourceDir0 + "Info.plist", targetDir0 )
-  shutil.copy2( sourceDir1 + "klayout",    targetDir1 )
-  shutil.copy2( sourceDir2 + "logo.png",   targetDir2 )
-  shutil.copy2( sourceDir3 + "logo.ico",   targetDir2 )
+  shutil.copy2( sourceDir0 + "/Info.plist", targetDir0 )
+  shutil.copy2( sourceDir1 + "/klayout",    targetDir1 )
+  shutil.copy2( sourceDir2 + "/logo.png",   targetDir2 )
+  shutil.copy2( sourceDir3 + "/logo.ico",   targetDir2 )
 
-  os.chmod( targetDir0 + "Info.plist", 0644 )
-  os.chmod( targetDir1 + "klayout",    0755 )
-  os.chmod( targetDir2 + "logo.png",   0644 )
-  os.chmod( targetDir2 + "logo.ico",   0644 )
+  os.chmod( targetDir0 + "/Info.plist", 0644 )
+  os.chmod( targetDir1 + "/klayout",    0755 )
+  os.chmod( targetDir2 + "/logo.png",   0644 )
+  os.chmod( targetDir2 + "/logo.ico",   0644 )
 
-  buddies = glob.glob( sourceDir4 + "strm*" )
+  buddies = glob.glob( sourceDir4 + "/strm*" )
   for item in buddies:
     shutil.copy2( item, targetDir4 )
     buddy = os.path.basename(item)

From 6e86ac77d36e31302f142e3249bebbb3f1ff519a Mon Sep 17 00:00:00 2001
From: Kazunari Sekigawa <sekigawa@titan.ocn.ne.jp>
Date: Thu, 28 Dec 2017 23:02:01 +0900
Subject: [PATCH 3/6] Prepare Python scripts for building for Mac OSX.

This refs #4 and #6.
---
 macbuild/build4mac.py      | 105 +++++++++++++++++++++++--------------
 macbuild/build4mac_util.py |  71 +++++++++++++++++++------
 2 files changed, 121 insertions(+), 55 deletions(-)

diff --git a/macbuild/build4mac.py b/macbuild/build4mac.py
index 31cbdf169..c7472f25c 100755
--- a/macbuild/build4mac.py
+++ b/macbuild/build4mac.py
@@ -451,6 +451,9 @@ def DeployBinariesForBundle():
   global AbsMacBuildDir
   global AbsMacBuildLog
 
+  print("")
+  print( "##### Start deploying libraries and executables #####" )
+  print( "[1] Checking the status of working directory ..." )
   #-------------------------------------------------------------
   # [1] Check the status of working directory
   #-------------------------------------------------------------
@@ -467,6 +470,8 @@ def DeployBinariesForBundle():
     print( "!!! Binary directory <%s> does not present !!!" % MacBinDir, file=sys.stderr )
     return(1)
 
+
+  print( "[2] Creating a new empty directory for deployment ..." )
   #-------------------------------------------------------------
   # [2] Create a new empty directory for deploying binaries
   #-------------------------------------------------------------
@@ -477,42 +482,46 @@ def DeployBinariesForBundle():
     shutil.rmtree(MacPkgDir)
   os.mkdir(MacPkgDir)
 
+
+  print( "[3] Creating the standard directory structure for a bundle ..." )
   #-------------------------------------------------------------
   # [3] Create the directory skeleton for "klayout.app" bundle
-  #     and command line buddy tools such as "strm2cif"
-  #     that should look like...
+  #     and command line buddy tools such as "strm2cif".
+  #     They should be stored in a directory structure like...
   #
   #    klayout.app/+
   #                +-- Contents/+
   #                             +-- Info.plist
-  #                             +-- MacOS/+
-  #                                       +-- 'klayout'
   #                             +-- PkgInfo
   #                             +-- Resources/
   #                             +-- Frameworks/
-  #                             +-- buddy_tool/+
-  #                                            +-- 'strm2cif'
-  #                                            +-- 'strm2dxf'
-  #                                            :
-  #                                            +-- 'strmxor'
+  #                             +-- MacOS/+
+  #                             |         +-- 'klayout'
+  #                             +-- Buddy/+
+  #                                       +-- 'strm2cif'
+  #                                       +-- 'strm2dxf'
+  #                                       :
+  #                                       +-- 'strmxor'
   #-------------------------------------------------------------
-  targetDir0 = "%s/klayout.app/Contents/" % AbsMacPkgDir
-  targetDir1 = targetDir0 + "MacOS/"
-  targetDir2 = targetDir0 + "Resources/"
-  targetDir3 = targetDir0 + "Frameworks/"
-  targetDir4 = targetDir0 + "buddy_tool/"
-  os.makedirs(targetDir1)
-  os.makedirs(targetDir2)
-  os.makedirs(targetDir3)
-  os.makedirs(targetDir4)
+  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:
-  #     A dynamic link library is built as below:
+  #     KLayout's dynamic link library is built as below:
   #       (1) libklayout_lay.0.25.0.dylib
   #       (2) libklayout_lay.0.25.dylib -> libklayout_lay.0.25.0.dylib
   #       (3) libklayout_lay.0.dylib -> libklayout_lay.0.25.0.dylib
@@ -537,7 +546,7 @@ def DeployBinariesForBundle():
   #     libklayout_db.0.dylib (compatibility version 0.25.0, current version 0.25.0)
   #       :
   #-------------------------------------------------------------------------------
-  os.chdir( targetDir3 )
+  os.chdir( targetDirF )
   dynamicLinkLibs = glob.glob( AbsMacBinDir + "/*.dylib" )
   depDicOrdinary  = {} # inter-library dependency dictionary
   for item in dynamicLinkLibs:
@@ -563,16 +572,22 @@ def DeployBinariesForBundle():
   quit()
   '''
 
-
+  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 )
+  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 known some files in source directories to
+  # [6] Copy some known files in source directories to
   #     relevant target directories
   #-------------------------------------------------------------
   os.chdir(ProjectDir)
@@ -583,21 +598,23 @@ def DeployBinariesForBundle():
   sourceDir4 = "%s" % MacBinDir
 
   shutil.copy2( sourceDir0 + "/Info.plist", targetDir0 )
-  shutil.copy2( sourceDir1 + "/klayout",    targetDir1 )
-  shutil.copy2( sourceDir2 + "/logo.png",   targetDir2 )
-  shutil.copy2( sourceDir3 + "/logo.ico",   targetDir2 )
+  shutil.copy2( sourceDir1 + "/klayout",    targetDirM )
+  shutil.copy2( sourceDir2 + "/logo.png",   targetDirR )
+  shutil.copy2( sourceDir3 + "/logo.ico",   targetDirR )
 
   os.chmod( targetDir0 + "/Info.plist", 0644 )
-  os.chmod( targetDir1 + "/klayout",    0755 )
-  os.chmod( targetDir2 + "/logo.png",   0644 )
-  os.chmod( targetDir2 + "/logo.ico",   0644 )
+  os.chmod( targetDirM + "/klayout",    0755 )
+  os.chmod( targetDirR + "/logo.png",   0644 )
+  os.chmod( targetDirR + "/logo.ico",   0644 )
 
   buddies = glob.glob( sourceDir4 + "/strm*" )
   for item in buddies:
-    shutil.copy2( item, targetDir4 )
+    shutil.copy2( item, targetDirB )
     buddy = os.path.basename(item)
-    os.chmod( targetDir4 + buddy, 0755 )
+    os.chmod( targetDirB + "/" + buddy, 0755 )
 
+
+  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
@@ -608,40 +625,48 @@ def DeployBinariesForBundle():
   ret = SetChangeLibIdentificationName( klayoutexec, "../Frameworks" )
   if not ret == 0:
     os.chdir(ProjectDir)
-    print( "!!! Failed to set/change library identification name for <%s> !!!" % klayoutexec, \
-           file=sys.stderr )
+    msg = "!!! Failed to set/change library identification name for <%s> !!!"
+    print( msg % klayoutexec, file=sys.stderr )
     return(1)
 
-  buddies = glob.glob( "klayout.app/Contents/buddy_tool/strm*" )
+  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)
-      print( "!!! Failed to set/change library identification name for <%s> !!!" % buddy, \
-             file=sys.stderr )
+      msg = "!!! Failed to set/change library identification name for <%s> !!!"
+      print( msg % buddy, file=sys.stderr )
       return(1)
 
+
+  print( "[8] Finally, deploying Qt's frameworks ..." )
   #-------------------------------------------------------------
-  # [8] Deploying Applications on OS X including Qt frameworks
+  # [8] Deploy Qt frameworks
   #-------------------------------------------------------------
   if ModuleQt == 'Qt4MacPorts':
     deploytool = Qt4MacPorts['deploy']
     app_bundle = "klayout.app"
-    options    = "-libpath=klayout.app/Contents/Frameworks"
+    options    = macdepQtOpt
   elif ModuleQt == 'Qt5MacPorts':
     deploytool = Qt5MacPorts['deploy']
     app_bundle = "klayout.app"
-    options    = "-libpath=klayout.app/Contents/Frameworks"
+    options    = macdepQtOpt
 
   os.chdir(ProjectDir)
   os.chdir(MacPkgDir)
   command = "%s %s %s" % ( deploytool, app_bundle, options )
   if subprocess.call( command, shell=True ) != 0:
-    print( "!!! Failed to deploy applications on OSX !!!", file=sys.stderr )
+    msg = "!!! Failed to deploy applications on OSX !!!"
+    print( msg, file=sys.stderr )
+    print("")
     os.chdir(ProjectDir)
     return(1)
   else:
-    print( "### Deployed applications on OS X ###", file=sys.stderr )
+    msg = "### Deployed applications on OS X ###"
+    print( msg, file=sys.stderr )
+    print("")
     os.chdir(ProjectDir)
     return(0)
 
diff --git a/macbuild/build4mac_util.py b/macbuild/build4mac_util.py
index cd452d58d..fe04d012a 100755
--- a/macbuild/build4mac_util.py
+++ b/macbuild/build4mac_util.py
@@ -28,7 +28,7 @@ from build4mac_env  import *
 #
 # @param[in] depstr   strings that tell dependency such as:
 #
-#  libklayout_edt.0.25.0.dylib: <=== key
+#  libklayout_edt.0.dylib:
 #    libklayout_edt.0.dylib (compatibility version 0.25.0, current version 0.25.0)
 #    libklayout_tl.0.dylib (compatibility version 0.25.0, current version 0.25.0)
 #    libklayout_gsi.0.dylib (compatibility version 0.25.0, current version 0.25.0)
@@ -64,6 +64,45 @@ def PrintLibraryDependencyDictionary( depdic, namedic ):
     for item in supporters:
       print( "    %s" % item )
 
+#------------------------------------------------------------------------------
+## To set and change identification name of dylib
+#
+# @param[in] libdic  inter-library dependency dictionary
+#
+# @return 0 on success; non-zero on failure
+#------------------------------------------------------------------------------
+def SetChangeIdentificationNameOfDyLib( libdic ):
+  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
+    nameNew = "@executable_path/../Frameworks/%s" % 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 library aware of the new identifications of all supporters
+    #-------------------------------------------------------------------------
+    supporters = libdic[lib]
+    for sup in supporters:
+      nameOld = "%s" % sup
+      nameNew = "@executable_path/../Frameworks/%s" % sup
+      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
 #     and make the application aware of the library locations
@@ -77,16 +116,16 @@ def PrintLibraryDependencyDictionary( depdic, namedic ):
 #    klayout.app/+
 #                +-- Contents/+
 #                             +-- Info.plist
-#                             +-- MacOS/+
-#                                       +-- 'klayout'
 #                             +-- PkgInfo
 #                             +-- Resources/
 #                             +-- Frameworks/
-#                             +-- buddy_tool/+
-#                                            +-- 'strm2cif'
-#                                            +-- 'strm2dxf'
-#                                            :
-#                                            +-- 'strmxor'
+#                             +-- MacOS/+
+#                             |         +-- 'klayout'
+#                             +-- Buddy/+
+#                                       +-- 'strm2cif'
+#                                       +-- 'strm2dxf'
+#                                       :
+#                                       +-- 'strmxor'
 #
 # @return 0 on success; non-zero on failure
 #------------------------------------------------------------------------------
@@ -98,28 +137,30 @@ def SetChangeLibIdentificationName( executable, relativedir ):
   exedepdic  = DecomposeLibraryDependency( executable + ":\n" + otoolOut )
   keys       = exedepdic.keys()
   deplibs    = exedepdic[ keys[0] ]
+
   for lib in deplibs:
     #-----------------------------------------------------------
-    # (A) Set the identification names for the library
+    # [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:
-      print( "!!! Failed to set the new identification name to <%s> !!!" % lib, \
-             file=sys.stderr )
+      msg = "!!! Failed to set the new identification name to <%s> !!!"
+      print( msg % lib, file=sys.stderr )
       return(1)
+
     #-----------------------------------------------------------
-    # (B) Make the application aware of the new identification
+    # [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:
-      print( "!!! Failed to make the application aware of the new identification name <%s> !!!" % nameNew, \
-             file=sys.stderr )
+      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)
 
 #----------------

From 102cfe5c3d5c7310e695e45b2d0815bcb9702a68 Mon Sep 17 00:00:00 2001
From: Kazunari Sekigawa <sekigawa@titan.ocn.ne.jp>
Date: Fri, 29 Dec 2017 00:11:19 +0900
Subject: [PATCH 4/6] Prepare Python scripts for building for Mac OSX.

This refs #4 and #6.
---
 macbuild/ReadMe.txt   | 50 +++++++++++++++++++++++++++----------------
 macbuild/build4mac.py | 16 +++++++-------
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/macbuild/ReadMe.txt b/macbuild/ReadMe.txt
index 080317a54..2f16e7e4e 100644
--- a/macbuild/ReadMe.txt
+++ b/macbuild/ReadMe.txt
@@ -1,25 +1,39 @@
-<< Draft Version 0.001>>
+<< Draft Version 0.002>>
 
-This directory "macbuild" contains different files required to build KLayout
-version 0.25 or later for different Max OSX including:
-    * Yosemite    (10.10)
-    * El Capitan  (10.11)
-    * Sierra      (10.12)
-    * High Sierra (10.13)
+1. Introduction:
+    This directory "macbuild" contains different files required to build KLayout
+    version 0.25 or later for different Max OSX including:
+        * Yosemite    (10.10)
+        * El Capitan  (10.11)
+        * Sierra      (10.12)
+        * High Sierra (10.13)
 
-By default, Qt framework is Qt5 from Mac Ports (https://www.macports.org/) which
-is usually located under:
-   /opt/local/libexec/qt5/
+    By default, Qt framework is Qt5 from Mac Ports (https://www.macports.org/) which
+    is usually located under:
+       /opt/local/libexec/qt5/
 
-Also by default, supported script languages, i.e,, Ruby and Python, are those
-standard ones bundled with the OS.
-However, you are able to choose other options like Python from Anaconda.
-
-bla bla bla ...
+    Also by default, supported script languages, i.e, Ruby and Python, are those
+    standard ones bundled with the OS.
+    However, you are able to choose other options like Python from Anaconda.
+        :
+        :
+        :
+        :
 
 
-To use the top script "build4mac.py" make a symbolic link from the parent directory like:
-    build4mac.py -> macbuild/build4mac.py
-then execute the Python script to build with appropriate options if required.
+2. How to use:
+    (1) Make a symbolic link from the parent directory (where 'build.sh' exists) to
+        'build4mac.py', that is,
+            build4mac.py -> macbuild/build4mac.py
+
+    (2) Build KLayout by appropriate options, for example, for debug-build:
+            $ cd /where/'build.sh'/exists
+            $ ./build4mac.py -d
+
+    (3) Confirm successful build.
+
+    (4) Run 'build4mac.py' again with the same options used in (2) with "-y"
+        to deploy executables and libraries under "klayout.app" bundle.
+            $ ./build4mac.py -d -y
 
 [End of File]
diff --git a/macbuild/build4mac.py b/macbuild/build4mac.py
index c7472f25c..86a7522ac 100755
--- a/macbuild/build4mac.py
+++ b/macbuild/build4mac.py
@@ -453,7 +453,7 @@ def DeployBinariesForBundle():
 
   print("")
   print( "##### Start deploying libraries and executables #####" )
-  print( "[1] Checking the status of working directory ..." )
+  print( " [1] Checking the status of working directory ..." )
   #-------------------------------------------------------------
   # [1] Check the status of working directory
   #-------------------------------------------------------------
@@ -471,7 +471,7 @@ def DeployBinariesForBundle():
     return(1)
 
 
-  print( "[2] Creating a new empty directory for deployment ..." )
+  print( " [2] Creating a new empty directory <%s> for deployment ..." % MacPkgDir )
   #-------------------------------------------------------------
   # [2] Create a new empty directory for deploying binaries
   #-------------------------------------------------------------
@@ -483,7 +483,7 @@ def DeployBinariesForBundle():
   os.mkdir(MacPkgDir)
 
 
-  print( "[3] Creating the standard directory structure for a bundle ..." )
+  print( " [3] Creating the standard directory structure for a bundle ..." )
   #-------------------------------------------------------------
   # [3] Create the directory skeleton for "klayout.app" bundle
   #     and command line buddy tools such as "strm2cif".
@@ -514,7 +514,7 @@ def DeployBinariesForBundle():
   os.makedirs(targetDirB)
 
 
-  print( "[4] Copying KLayout's dynamic link libraries to 'Frameworks' ..." )
+  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.
@@ -572,7 +572,7 @@ def DeployBinariesForBundle():
   quit()
   '''
 
-  print( "[5] Setting and changing the identification names among KLayout's libraries ..." )
+  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
@@ -585,7 +585,7 @@ def DeployBinariesForBundle():
     return(1)
 
 
-  print( "[6] Copying built executables and resource files ..." )
+  print( " [6] Copying built executables and resource files ..." )
   #-------------------------------------------------------------
   # [6] Copy some known files in source directories to
   #     relevant target directories
@@ -614,7 +614,7 @@ def DeployBinariesForBundle():
     os.chmod( targetDirB + "/" + buddy, 0755 )
 
 
-  print( "[7] Setting and changing the identification names of KLayout's libraries in each executable ..." )
+  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
@@ -641,7 +641,7 @@ def DeployBinariesForBundle():
       return(1)
 
 
-  print( "[8] Finally, deploying Qt's frameworks ..." )
+  print( " [8] Finally, deploying Qt's frameworks ..." )
   #-------------------------------------------------------------
   # [8] Deploy Qt frameworks
   #-------------------------------------------------------------

From 4deb368e4d1620ec3de9e68bd3a710e55779ab48 Mon Sep 17 00:00:00 2001
From: Kazunari Sekigawa <sekigawa@titan.ocn.ne.jp>
Date: Fri, 29 Dec 2017 00:11:19 +0900
Subject: [PATCH 5/6] Prepare Python scripts for building for Mac OSX.

This refs #4 and #6.

# Conflicts:
#	macbuild/build4mac.py
---
 macbuild/ReadMe.txt | 50 +++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/macbuild/ReadMe.txt b/macbuild/ReadMe.txt
index 080317a54..2f16e7e4e 100644
--- a/macbuild/ReadMe.txt
+++ b/macbuild/ReadMe.txt
@@ -1,25 +1,39 @@
-<< Draft Version 0.001>>
+<< Draft Version 0.002>>
 
-This directory "macbuild" contains different files required to build KLayout
-version 0.25 or later for different Max OSX including:
-    * Yosemite    (10.10)
-    * El Capitan  (10.11)
-    * Sierra      (10.12)
-    * High Sierra (10.13)
+1. Introduction:
+    This directory "macbuild" contains different files required to build KLayout
+    version 0.25 or later for different Max OSX including:
+        * Yosemite    (10.10)
+        * El Capitan  (10.11)
+        * Sierra      (10.12)
+        * High Sierra (10.13)
 
-By default, Qt framework is Qt5 from Mac Ports (https://www.macports.org/) which
-is usually located under:
-   /opt/local/libexec/qt5/
+    By default, Qt framework is Qt5 from Mac Ports (https://www.macports.org/) which
+    is usually located under:
+       /opt/local/libexec/qt5/
 
-Also by default, supported script languages, i.e,, Ruby and Python, are those
-standard ones bundled with the OS.
-However, you are able to choose other options like Python from Anaconda.
-
-bla bla bla ...
+    Also by default, supported script languages, i.e, Ruby and Python, are those
+    standard ones bundled with the OS.
+    However, you are able to choose other options like Python from Anaconda.
+        :
+        :
+        :
+        :
 
 
-To use the top script "build4mac.py" make a symbolic link from the parent directory like:
-    build4mac.py -> macbuild/build4mac.py
-then execute the Python script to build with appropriate options if required.
+2. How to use:
+    (1) Make a symbolic link from the parent directory (where 'build.sh' exists) to
+        'build4mac.py', that is,
+            build4mac.py -> macbuild/build4mac.py
+
+    (2) Build KLayout by appropriate options, for example, for debug-build:
+            $ cd /where/'build.sh'/exists
+            $ ./build4mac.py -d
+
+    (3) Confirm successful build.
+
+    (4) Run 'build4mac.py' again with the same options used in (2) with "-y"
+        to deploy executables and libraries under "klayout.app" bundle.
+            $ ./build4mac.py -d -y
 
 [End of File]

From 65e9a1854a4e890848872146f22e79b98ec1e15d Mon Sep 17 00:00:00 2001
From: Kazunari Sekigawa <sekigawa@titan.ocn.ne.jp>
Date: Fri, 29 Dec 2017 21:00:03 +0900
Subject: [PATCH 6/6] Prepare Python scripts for building for Mac OSX.

This refs #4 and #6.
---
 macbuild/ReadMe.txt        | 8 ++++----
 macbuild/build4mac.py      | 9 +++++----
 macbuild/build4mac_env.py  | 2 +-
 macbuild/build4mac_util.py | 6 ++++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/macbuild/ReadMe.txt b/macbuild/ReadMe.txt
index 2f16e7e4e..cb2b7749f 100644
--- a/macbuild/ReadMe.txt
+++ b/macbuild/ReadMe.txt
@@ -1,7 +1,7 @@
 << Draft Version 0.002>>
 
 1. Introduction:
-    This directory "macbuild" contains different files required to build KLayout
+    This directory "macbuild" contains different files required for building KLayout
     version 0.25 or later for different Max OSX including:
         * Yosemite    (10.10)
         * El Capitan  (10.11)
@@ -16,7 +16,7 @@
     standard ones bundled with the OS.
     However, you are able to choose other options like Python from Anaconda.
         :
-        :
+        : (to be updated)
         :
         :
 
@@ -26,13 +26,13 @@
         'build4mac.py', that is,
             build4mac.py -> macbuild/build4mac.py
 
-    (2) Build KLayout by appropriate options, for example, for debug-build:
+    (2) Invoke 'build4mac.py' with appropriate options, for example, for debug-build:
             $ cd /where/'build.sh'/exists
             $ ./build4mac.py -d
 
     (3) Confirm successful build.
 
-    (4) Run 'build4mac.py' again with the same options used in (2) with "-y"
+    (4) Run 'build4mac.py' again with the same options used in (2) PLUS "-y"
         to deploy executables and libraries under "klayout.app" bundle.
             $ ./build4mac.py -d -y
 
diff --git a/macbuild/build4mac.py b/macbuild/build4mac.py
index 86a7522ac..83397e420 100755
--- a/macbuild/build4mac.py
+++ b/macbuild/build4mac.py
@@ -432,7 +432,8 @@ def RunMainBuildBash():
       return(0)
 
 #------------------------------------------------------------------------------
-## To deploy built binaries and depending libraries for making a bundle
+## To deploy built binaries and libraries on which those binaries depend
+#  for making a bundle (klayout.app)
 #
 # Reference: "Deploying an Application on Mac OS X" of Qt Assistant.
 #
@@ -483,11 +484,11 @@ def DeployBinariesForBundle():
   os.mkdir(MacPkgDir)
 
 
-  print( " [3] Creating the standard directory structure for a bundle ..." )
+  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 should be stored in a directory structure like...
+  #     They are stored in the directory structure below.
   #
   #    klayout.app/+
   #                +-- Contents/+
@@ -641,7 +642,7 @@ def DeployBinariesForBundle():
       return(1)
 
 
-  print( " [8] Finally, deploying Qt's frameworks ..." )
+  print( " [8] Finally, deploying Qt's Frameworks ..." )
   #-------------------------------------------------------------
   # [8] Deploy Qt frameworks
   #-------------------------------------------------------------
diff --git a/macbuild/build4mac_env.py b/macbuild/build4mac_env.py
index 678d77475..7dce1cdf3 100755
--- a/macbuild/build4mac_env.py
+++ b/macbuild/build4mac_env.py
@@ -12,7 +12,7 @@
 #===============================================================================
 
 #-----------------------------------------------------
-# [0] Xcode
+# [0] Xcode's tools
 #-----------------------------------------------------
 XcodeToolChain = { 'nameID': '/usr/bin/install_name_tool -id ',
                    'nameCH': '/usr/bin/install_name_tool -change '
diff --git a/macbuild/build4mac_util.py b/macbuild/build4mac_util.py
index fe04d012a..f67bf692b 100755
--- a/macbuild/build4mac_util.py
+++ b/macbuild/build4mac_util.py
@@ -24,7 +24,7 @@ from build4mac_env  import *
 
 #------------------------------------------------------------------------------
 ## To decompose strings obtained by 'otool -L <*.dylib>' command and to
-#  generate a dictionary of library dependency.
+#  generate a dictionary of KLayout's inter-library dependency.
 #
 # @param[in] depstr   strings that tell dependency such as:
 #
@@ -34,6 +34,8 @@ from build4mac_env  import *
 #    libklayout_gsi.0.dylib (compatibility version 0.25.0, current version 0.25.0)
 #    libklayout_laybasic.0.dylib (compatibility version 0.25.0, current version 0.25.0)
 #    libklayout_db.0.dylib (compatibility version 0.25.0, current version 0.25.0)
+#      :
+#      :
 #
 # @return a dictionary
 #------------------------------------------------------------------------------
@@ -65,7 +67,7 @@ def PrintLibraryDependencyDictionary( depdic, namedic ):
       print( "    %s" % item )
 
 #------------------------------------------------------------------------------
-## To set and change identification name of dylib
+## To set and change identification name of KLayout's dylib
 #
 # @param[in] libdic  inter-library dependency dictionary
 #