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

Preparing for integrated python module (Mac)

This commit is contained in:
Matthias Koefferlein 2023-03-07 23:44:39 +01:00
parent c3e831f96f
commit 3e53431d92
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macbuild/build4mac.py
View File

@ -1285,6 +1285,7 @@ def Deploy_Binaries_For_Bundle(config, parameters):
# | +-- 'klayout' # | +-- 'klayout'
# | +-- db_plugins/ # | +-- db_plugins/
# | +-- lay_plugins/ # | +-- lay_plugins/
# | +-- pymod/
# +-- Buddy/+ # +-- Buddy/+
# | +-- 'strm2cif' # | +-- 'strm2cif'
# | +-- 'strm2dxf' # | +-- 'strm2dxf'
@ -1378,7 +1379,7 @@ def Deploy_Binaries_For_Bundle(config, parameters):
# Copy the contents of the plugin directories to a place next to # Copy the contents of the plugin directories to a place next to
# the application binary # the application binary
#------------------------------------------------------------------- #-------------------------------------------------------------------
for piDir in [ "db_plugins", "lay_plugins" ]: for piDir in [ "db_plugins", "lay_plugins", "pymod" ]:
os.makedirs( os.path.join( targetDirM, piDir )) os.makedirs( os.path.join( targetDirM, piDir ))
dynamicLinkLibs = glob.glob( os.path.join( MacBinDir, piDir, "*.dylib" ) ) dynamicLinkLibs = glob.glob( os.path.join( MacBinDir, piDir, "*.dylib" ) )
for item in dynamicLinkLibs: for item in dynamicLinkLibs:
@ -1428,6 +1429,7 @@ def Deploy_Binaries_For_Bundle(config, parameters):
# | +-- 'klayout' # | +-- 'klayout'
# | +-- db_plugins/ # | +-- db_plugins/
# | +-- lay_plugins/ # | +-- lay_plugins/
# | +-- pymod/
# : # :
#---------------------------------------------------------------------------------- #----------------------------------------------------------------------------------
os.chdir( targetDirF ) os.chdir( targetDirF )

4
macbuild/macQAT.py
View File

@ -184,11 +184,11 @@ def ExportEnvVariables():
MyEnviron[ 'TESTSRC' ] = ".." MyEnviron[ 'TESTSRC' ] = ".."
MyEnviron[ 'TESTTMP' ] = WorkDir MyEnviron[ 'TESTTMP' ] = WorkDir
if System == "Darwin": if System == "Darwin":
MyEnviron[ 'DYLD_LIBRARY_PATH' ] = "%s:%s/db_plugins:%s/lay_plugins" % (ProjectDir, ProjectDir, ProjectDir) MyEnviron[ 'DYLD_LIBRARY_PATH' ] = "%s:%s/db_plugins:%s/lay_plugins:%s/pymod" % (ProjectDir, ProjectDir, ProjectDir, ProjectDir)
for env in [ 'TESTSRC', 'TESTTMP', 'DYLD_LIBRARY_PATH' ]: for env in [ 'TESTSRC', 'TESTTMP', 'DYLD_LIBRARY_PATH' ]:
os.environ[env] = MyEnviron[env] os.environ[env] = MyEnviron[env]
else: else:
MyEnviron[ 'LD_LIBRARY_PATH' ] = "%s:%s/db_plugins:%s/lay_plugins" % (ProjectDir, ProjectDir, ProjectDir) MyEnviron[ 'LD_LIBRARY_PATH' ] = "%s:%s/db_plugins:%s/lay_plugins:%s/pymod" % (ProjectDir, ProjectDir, ProjectDir, ProjectDir)
for env in [ 'TESTSRC', 'TESTTMP', 'LD_LIBRARY_PATH' ]: for env in [ 'TESTSRC', 'TESTTMP', 'LD_LIBRARY_PATH' ]:
os.environ[env] = MyEnviron[env] os.environ[env] = MyEnviron[env]

2
macbuild/macQAT.sh
View File

@ -46,7 +46,7 @@ logfile=QATest_${gitSHA1}_${timestamp}__${presentDir}.log
#---------------------------------------------------------------- #----------------------------------------------------------------
export TESTSRC=.. export TESTSRC=..
export TESTTMP=QATest_${gitSHA1}_${timestamp}__${presentDir} export TESTTMP=QATest_${gitSHA1}_${timestamp}__${presentDir}
export DYLD_LIBRARY_PATH=$(pwd):$(pwd)/db_plugins:$(pwd)/lay_plugins export DYLD_LIBRARY_PATH=$(pwd):$(pwd)/db_plugins:$(pwd)/lay_plugins:$(pwd)/pymod
#---------------------------------------------------------------- #----------------------------------------------------------------
# Environment variables for "ut_runner" # Environment variables for "ut_runner"