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

improving build process. tentative fix to python3 osx10.11

This commit is contained in:
Thomas Ferreira de Lima 2018-10-03 17:35:35 -04:00
parent 4ffcaba5d1
commit 96be601da9
No known key found for this signature in database
GPG Key ID: 43E98870EAA0A86E
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -58,11 +58,11 @@ matrix:
os: osx os: osx
osx_image: xcode8 # macOS 10.11 osx_image: xcode8 # macOS 10.11
env: env:
- MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';" - MATRIX_EVAL="rvm list; rvm use ruby-2.3.0; brew install python3; brew unlink python && brew link --overwrite python;"
- ARCHFLAGS="-std=c++11" - ARCHFLAGS="-std=c++11"
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=true - BREW_BUNDLE=false
- name: "klayout python3.6 package" - name: "klayout python3.6 package"
os: linux os: linux

6
Makefile
View File

@ -2,6 +2,12 @@
GITCOMMIT := $(shell git rev-parse --short HEAD) GITCOMMIT := $(shell git rev-parse --short HEAD)
KLAYOUT_VERSION := $(shell source version.sh && echo $$KLAYOUT_VERSION) KLAYOUT_VERSION := $(shell source version.sh && echo $$KLAYOUT_VERSION)
ifndef PYTHON_VERSION
PYTHON_VERSION := B37
endif
ifndef MACOS_VERSION
MACOS_VERSION := HighSierra
endif
.ONESHELL: .ONESHELL:

6
macbuild/build4mac.py
View File

@ -661,7 +661,7 @@ def DeployBinariesForBundle():
#------------------------------------------------------------------- #-------------------------------------------------------------------
# (C) This library goes into Frameworks, hence record it's path there # (C) This library goes into Frameworks, hence record it's path there
#------------------------------------------------------------------- #-------------------------------------------------------------------
pathDic[nameStyle3] = "@executable_path/../Frameworks/" + nameStyle3 pathDic[nameStyle3] = "@executable_path/../Frameworks/" + nameStyle3
os.chdir(ProjectDir) os.chdir(ProjectDir)
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -695,8 +695,8 @@ def DeployBinariesForBundle():
#------------------------------------------------------------------- #-------------------------------------------------------------------
# (C) This library goes into the plugin dir # (C) This library goes into the plugin dir
#------------------------------------------------------------------- #-------------------------------------------------------------------
pathDic[nameStyle3] = "@executable_path/" + piDir + "/" + nameStyle3 pathDic[nameStyle3] = "@executable_path/" + piDir + "/" + nameStyle3
''' '''
PrintLibraryDependencyDictionary( depDicOrdinary, pathDic, "Style (3)" ) PrintLibraryDependencyDictionary( depDicOrdinary, pathDic, "Style (3)" )
exit() exit()

14
travis-build.sh
View File

@ -6,12 +6,16 @@ export PING_SLEEP=30s
bash -c "while true; do echo -n '.'; sleep $PING_SLEEP; done" & bash -c "while true; do echo -n '.'; sleep $PING_SLEEP; done" &
PING_LOOP_PID=$! PING_LOOP_PID=$!
make build >> build.txt 2>&1 touch build.txt
make deploy >> build.txt 2>&1
make test >> build.txt 2>&1 || true
make dropbox-deploy
tail -500 build.txt echo "build"
make build >> build.txt 2>&1 || tail -500 build.txt
echo "deploy"
make deploy >> build.txt 2>&1 || tail -500 build.txt
echo "test"
make test >> build.txt 2>&1 || tail -500 build.txt
echo "dropbox-deploy"
make dropbox-deploy
echo "build finished" echo "build finished"