diff --git a/macbuild/ReadMe.md b/macbuild/ReadMe.md index 1ca45ab36..4f87e9616 100644 --- a/macbuild/ReadMe.md +++ b/macbuild/ReadMe.md @@ -1,4 +1,4 @@ -Relevant KLayout version: 0.26.4 +Relevant KLayout version: 0.26.5 # 1. Introduction This directory **`macbuild`** contains different files required for building KLayout (http://www.klayout.de/) version 0.26.1 or later for different 64-bit Mac OSXs including: @@ -26,6 +26,11 @@ Alternatively, you can use "Qt5" from Homebrew (https://brew.sh/) which is usual $HOME/opt/anaconda3/pkgs/qt-{version} ``` +If you have installed Anaconda3 under $HOME/opt/anaconda3/, make a symbolic link: +``` +/Applications/anaconda3/ ---> $HOME/opt/anaconda3/ +``` + # 3. Script language support: Ruby and Python By default, supported script languages, i.e., Ruby and Python, are those standard ones bundled with the OS.
As for Catalina (10.15), @@ -220,8 +225,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:
-* **`ST-klayout-0.26.4-macOS-Catalina-1-qt5MP-RsysPsys.dmg`** ---(1) the main DMG file -* **`ST-klayout-0.26.4-macOS-Catalina-1-qt5MP-RsysPsys.dmg.md5`** ---(2) MD5-value text file +* **`ST-klayout-0.26.5-macOS-Catalina-1-qt5MP-RsysPsys.dmg`** ---(1) the main DMG file +* **`ST-klayout-0.26.5-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.
diff --git a/macbuild/Resources/script-bundles.zip b/macbuild/Resources/script-bundles.zip index a6e85de68..874b343d9 100644 Binary files a/macbuild/Resources/script-bundles.zip and b/macbuild/Resources/script-bundles.zip differ diff --git a/macbuild/build4mac_env.py b/macbuild/build4mac_env.py index b07d08e45..033e574d9 100755 --- a/macbuild/build4mac_env.py +++ b/macbuild/build4mac_env.py @@ -42,11 +42,12 @@ Qt5Brew = { 'qmake' : '/usr/local/opt/qt/bin/qmake', 'deploy': '/usr/local/opt/qt/bin/macdeployqt' } -# Qt5 bundled with anaconda3 installed under $HOME/opt/anaconda3/ -# installed by the standard installation package +# Qt5 bundled with anaconda3 installed under /Applications/anaconda3/ +# The standard installation deploys the tool under $HOME/opt/anaconda3/. +# If so, you need to make a symbolic link: /Applications/anaconda3 ---> $HOME/opt/anaconda3/ # [Key Type Name] = 'Qt5Ana3' -Qt5Ana3 = { 'qmake' : '%s/opt/anaconda3/bin/qmake' % MyHome, - 'deploy': '%s/opt/anaconda3/bin/macdeployqt' % MyHome +Qt5Ana3 = { 'qmake' : '/Applications/anaconda3/bin/qmake', + 'deploy': '/Applications/anaconda3/bin/macdeployqt' } #----------------------------------------------------- @@ -126,12 +127,13 @@ Ruby27Brew = { 'exe': '%s/bin/ruby' % HBRuby27Path, 'lib': '%s/lib/libruby.2.7.dylib' % HBRuby27Path } -# Ruby 2.5 bundled with anaconda3 installed under $HOME/opt/anaconda3/ *+*+*+ EXPERIMENTAL *+*+*+ -# install with 'conda install ruby' +# Ruby 2.5 bundled with anaconda3 installed under /Applications/anaconda3/ *+*+*+ EXPERIMENTAL *+*+*+ +# The standard installation deploys the tool under $HOME/opt/anaconda3/. +# If so, you need to make a symbolic link: /Applications/anaconda3 ---> $HOME/opt/anaconda3/ # [Key Type Name] = 'Ana3' -RubyAnaconda3 = { 'exe': '%s/opt/anaconda3/bin/ruby' % MyHome, - 'inc': '%s/opt/anaconda3/include/ruby-2.5.0' % MyHome, - 'lib': '%s/opt/anaconda3/lib/libruby.2.5.1.dylib' % MyHome +RubyAnaconda3 = { 'exe': '/Applications/anaconda3/bin/ruby', + 'inc': '/Applications/anaconda3/include/ruby-2.5.0', + 'lib': '/Applications/anaconda3/lib/libruby.2.5.1.dylib' } # Consolidated dictionary kit for Ruby @@ -219,12 +221,13 @@ Python37Brew = { 'exe': '%s/Versions/3.7/bin/python3.7m' % HBPython37Framewor 'lib': '%s/Versions/3.7/lib/libpython3.7m.dylib' % HBPython37FrameworkPath } -# Python 3.7 bundled with anaconda3 installed under $HOME/opt/anaconda3/ *+*+*+ EXPERIMENTAL *+*+*+ -# installed by the standard installation package +# Python 3.7 bundled with anaconda3 installed under /Applications/anaconda3/ *+*+*+ EXPERIMENTAL *+*+*+ +# The standard installation deploys the tool under $HOME/opt/anaconda3/. +# If so, you need to make a symbolic link: /Applications/anaconda3 ---> $HOME/opt/anaconda3/ # [Key Type Name] = 'Ana3' -PythonAnaconda3 = { 'exe': '%s/opt/anaconda3/bin/python3.7m' % MyHome, - 'inc': '%s/opt/anaconda3/include/python3.7m' % MyHome, - 'lib': '%s/opt/anaconda3/lib/libpython3.7m.dylib' % MyHome +PythonAnaconda3 = { 'exe': '/Applications/anaconda3/bin/python3.7m', + 'inc': '/Applications/anaconda3/include/python3.7m', + 'lib': '/Applications/anaconda3/lib/libpython3.7m.dylib' } # Consolidated dictionary kit for Python