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

#4660 use greadlink from homebrew on osx for deployment

Browse Source
This commit is contained in:
Joseph Lenox 2018-12-30 13:04:51 -06:00 committed by Joseph Lenox
parent 3680e6a869
commit 3106a5e365
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/deploy/sftp-symlink.sh
View File

@ -12,6 +12,12 @@ EXT=$1
shift shift
FILES=$* FILES=$*
if [ -z ${READLINK+x} ]; then
READLINK_BIN=readlink
else
READLINK_BIN=$READLINK
fi
source $(dirname $0)/../common/util.sh source $(dirname $0)/../common/util.sh
set_pr_id set_pr_id
set_branch set_branch
@ -21,7 +27,7 @@ fi
if [ -s $KEY ]; then if [ -s $KEY ]; then
for i in $FILES; do for i in $FILES; do
filepath=$(readlink -f "$i") filepath=$(${READLINK_BIN} -f "$i")
filepath=$(basename $filepath) filepath=$(basename $filepath)
tmpfile=$(mktemp) tmpfile=$(mktemp)

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

@ -11,6 +11,7 @@ brew install boost || brew upgrade boost
brew install perl || brew upgrade perl brew install perl || brew upgrade perl
brew install cpanminus || brew upgrade cpanminus brew install cpanminus || brew upgrade cpanminus
brew install wxwidgets || brew upgrade wxwidgets brew install wxwidgets || brew upgrade wxwidgets
brew install greadlink || brew upgrade greadlink
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

@ -3,4 +3,4 @@ set -euo pipefail
package/osx/make_dmg.sh package/osx/make_dmg.sh
package/deploy/sftp.sh mac ~/slic3r-upload.rsa `pwd`/slic3r*.dmg package/deploy/sftp.sh mac ~/slic3r-upload.rsa `pwd`/slic3r*.dmg
package/deploy/sftp-symlink.sh mac ~/slic3r-upload.rsa dmg *.dmg READLINK=greadlink package/deploy/sftp-symlink.sh mac ~/slic3r-upload.rsa dmg *.dmg