luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1737 from Kazzz-S/0.29.2-mac1 

Updated the macOS build system to build KLayout 0.29.2
This commit is contained in:
Matthias Köfferlein 2024-06-29 20:11:27 +02:00 committed by GitHub
parent eaf6ba46e3 f68dc1f473
commit f0fcba413d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
macbuild/ReadMe.md
View File

@ -1,6 +1,6 @@
Relevant KLayout version: 0.29.1<br> Relevant KLayout version: 0.29.2<br>
Author: Kazzz-S<br> Author: Kazzz-S<br>
Last modified: 2024-05-01<br> Last modified: 2024-06-09<br>
# 1. Introduction # 1. Introduction
This directory **`macbuild`** contains various files required for building KLayout (http://www.klayout.de/) version 0.29.0 or later for different 64-bit macOS, including: This directory **`macbuild`** contains various files required for building KLayout (http://www.klayout.de/) version 0.29.0 or later for different 64-bit macOS, including:
@ -55,6 +55,7 @@ You need to have the followings:
* https://developer.apple.com/xcode/resources/ * https://developer.apple.com/xcode/resources/
* https://mac.install.guide/commandlinetools/4 * https://mac.install.guide/commandlinetools/4
* Qt5 package from MacPorts or Anaconda3. Qt6, from Homebrew. * Qt5 package from MacPorts or Anaconda3. Qt6, from Homebrew.
* libgit2 form MacPorts, Homebrew,or Anaconda3.
* Optionally, Ruby and Python packages from MacPorts, Homebrew, or Anaconda3 * Optionally, Ruby and Python packages from MacPorts, Homebrew, or Anaconda3
#### For matching versions of Ruby and Python, please also refer to `build4mac_env.py`. #### For matching versions of Ruby and Python, please also refer to `build4mac_env.py`.

2
macbuild/build4mac_env.py
View File

@ -182,7 +182,7 @@ RubySonoma = { 'exe': '/System/Library/Frameworks/Ruby.framework/Versions/
# install with 'sudo port install ruby33' # install with 'sudo port install ruby33'
# [Key Type Name] = 'MP33' # [Key Type Name] = 'MP33'
Ruby33MacPorts = { 'exe': '/opt/local/bin/ruby3.3', Ruby33MacPorts = { 'exe': '/opt/local/bin/ruby3.3',
'inc': '/opt/local/include/ruby-3.3.1', 'inc': '/opt/local/include/ruby-3.3.3',
'lib': '/opt/local/lib/libruby.3.3.dylib' 'lib': '/opt/local/lib/libruby.3.3.dylib'
} }

14
macbuild/nightlyBuild.py
View File

@ -537,9 +537,9 @@ def Build_Deploy():
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
## To run the QA tests ## To run the QA tests
# #
# @param[in] exclude test to exclude such as 'pymod,pya' # @param[in] excludeList list of tests to exclude such as ['pymod', 'pya']
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
def Run_QATest( exclude ): def Run_QATest( excludeList ):
pyRunnerQAT = "./macQAT.py" pyRunnerQAT = "./macQAT.py"
myPlatform = Test_My_Platform() myPlatform = Test_My_Platform()
dirQAT = Get_QAT_Directory( Get_Build_Target_Dict(), myPlatform ) dirQAT = Get_QAT_Directory( Get_Build_Target_Dict(), myPlatform )
@ -548,7 +548,13 @@ def Run_QATest( exclude ):
if key == "ana3" and qttype == 6: # anaconda3 does not provide Qt6 so far if key == "ana3" and qttype == 6: # anaconda3 does not provide Qt6 so far
continue continue
command1 = [ pyRunnerQAT ] + [ '--run', '--exclude', '%s' % exclude ] if key == "ana3":
excludeList += ['pymod']
exclude = ",".join( sorted( set(excludeList) ) )
command1 = [ pyRunnerQAT ] + [ '--run' ]
if not exclude == "":
command1 += [ '--exclude', '%s' % exclude ]
print( dirQAT[(qttype, key)], command1 ) print( dirQAT[(qttype, key)], command1 )
#continue #continue
os.chdir( dirQAT[(qttype, key)] ) os.chdir( dirQAT[(qttype, key)] )
@ -707,7 +713,7 @@ def Main():
if Build: if Build:
Build_Deploy() Build_Deploy()
if QATest: if QATest:
Run_QATest( 'pymod,pya' ) Run_QATest( [] ) # ex. ['pymod', 'pya']
if QACheck: if QACheck:
Check_QATest_Results( 20 ) Check_QATest_Results( 20 )
elif MakeDMG: elif MakeDMG: