GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-15 18:26:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

More tweaks for brew, Mac deploy and bootstrap compilation

Browse Source
This commit is contained in:
Alessandro Ranellucci 2018-11-09 10:39:54 +01:00
parent 3f155825e1
commit dd4dfab255
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -20,7 +20,7 @@ before_install:
script: script:
- if [[ "${TRAVIS_OS_NAME}" == "linux" && "$TARGET" == "main" ]]; then ./package/linux/travis-build-main.sh; fi - if [[ "${TRAVIS_OS_NAME}" == "linux" && "$TARGET" == "main" ]]; then ./package/linux/travis-build-main.sh; fi
- if [[ "${TRAVIS_OS_NAME}" == "linux" && "$TARGET" == "cpp" ]]; then ./package/linux/travis-build-cpp.sh; fi - if [[ "${TRAVIS_OS_NAME}" == "linux" && "$TARGET" == "cpp" ]]; then ./package/linux/travis-build-cpp.sh; fi
- if [[ "${TRAVIS_OS_NAME}" == "osx" && "$TARGET" == "main" ]]; then ./package/osx/travis-build-main.sh; fi - if [[ "${TRAVIS_OS_NAME}" == "osx" && "$TARGET" == "main" ]]; then travis_wait 60 ./package/osx/travis-build-main.sh; fi
- if [[ "${TRAVIS_OS_NAME}" == "osx" && "$TARGET" == "cpp" ]]; then ./package/osx/travis-build-cpp.sh; fi - if [[ "${TRAVIS_OS_NAME}" == "osx" && "$TARGET" == "cpp" ]]; then ./package/osx/travis-build-cpp.sh; fi
branches: branches:

4
package/osx/travis-build-cpp.sh
View File

@ -8,7 +8,7 @@ mkdir -p $CACHE
( sudo Xvfb :99 -ac -screen 0 1024x768x8; echo ok )& ( sudo Xvfb :99 -ac -screen 0 1024x768x8; echo ok )&
brew update -v brew update -v
brew upgrade ccache || brew install ccache brew install ccache || brew upgrade ccache
if [[ "$WXVERSION" != "pkg" ]]; then if [[ "$WXVERSION" != "pkg" ]]; then
WXVER_EXPANDED=${WXVERSION:0:1}.${WXVERSION:1:1}.${WXVERSION:2:1} WXVER_EXPANDED=${WXVERSION:0:1}.${WXVERSION:1:1}.${WXVERSION:2:1}
@ -26,7 +26,7 @@ if [[ "$WXVERSION" != "pkg" ]]; then
export PATH=${PATH}:${WXDIR} export PATH=${PATH}:${WXDIR}
cd $TRAVIS_BUILD_DIR # go back to the build dir cd $TRAVIS_BUILD_DIR # go back to the build dir
else else
brew upgrade wxmac || brew install wxmac # install via homebrew brew install wxmac || brew upgrade wxmac # install via homebrew
fi fi
mkdir build && cd build mkdir build && cd build

8
package/osx/travis-build-main.sh
View File

@ -2,10 +2,10 @@
set -euo pipefail set -euo pipefail
brew update -v brew update -v
brew upgrade boost || brew install boost brew install boost || brew upgrade boost
brew upgrade perl || brew install perl brew install perl || brew upgrade perl
brew upgrade cpanminus || brew install cpanminus brew install cpanminus || brew upgrade cpanminus
brew upgrade wxwidgets || brew install wxwidgets brew install wxwidgets || brew upgrade wxwidgets
brew link --overwrite perl cpanminus brew link --overwrite perl cpanminus
export SLIC3R_STATIC=1 export SLIC3R_STATIC=1

2
package/osx/travis-deploy-main.sh
View File

@ -2,4 +2,4 @@
set -euo pipefail set -euo pipefail
package/osx/make_dmg.sh package/osx/make_dmg.sh
package/deploy/sftp.sh mac ~/slic3r-upload.rsa *.bz2 Slic3r*.dmg package/deploy/sftp.sh mac ~/slic3r-upload.rsa *.bz2 slic3r*.dmg