diff options
| author | René de Hesselle <dehesselle@web.de> | 2019-07-21 22:21:39 +0000 |
|---|---|---|
| committer | René de Hesselle <dehesselle@web.de> | 2019-07-21 22:21:39 +0000 |
| commit | 246379f1aa7af11d5cbf079314d6bdbfb8d09b95 (patch) | |
| tree | a24e85810332ab8587d1b529a509832b504a1a7c /packaging/macos/build_toolset.sh | |
| parent | Make menu icon preference apply to Layers and Objects dialogs (diff) | |
| download | inkscape-246379f1aa7af11d5cbf079314d6bdbfb8d09b95.tar.gz inkscape-246379f1aa7af11d5cbf079314d6bdbfb8d09b95.zip | |
Update jhbuild
This is a massive internal update due to changes in JHBuild.
Update Python to 3.7.4.
Diffstat (limited to 'packaging/macos/build_toolset.sh')
| -rwxr-xr-x | packaging/macos/build_toolset.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packaging/macos/build_toolset.sh b/packaging/macos/build_toolset.sh index 12e0d7b8d..0a50b7bcb 100755 --- a/packaging/macos/build_toolset.sh +++ b/packaging/macos/build_toolset.sh @@ -8,7 +8,8 @@ ### load settings and functions ################################################ -SELF_DIR=$(cd $(dirname "$0"); pwd -P) +SELF_DIR=$(F=$0; while [ ! -z $(readlink $F) ] && F=$(readlink $F); \ + cd $(dirname $F); F=$(basename $F); [ -L $F ]; do :; done; echo $(pwd -P)) for script in $SELF_DIR/0??-*.sh; do source $script; done set -e @@ -26,8 +27,11 @@ else # Until a better solution is found, the ramdisk has to be manually created # on the runner and is disabled on CI. [ ! -z $CI_JOB_ID ] && RAMDISK_ENABLE=false - $SELF_DIR/110-jhbuild-install.sh + $SELF_DIR/110-sysprep.sh get_source $URL_TOOLSET_CACHE $WRK_DIR + mkdir -p $HOME/.config + rm -f $HOME/.config/jhbuild* + ln -sf $DEVCONFIG/jhbuild* $HOME/.config else # we need to build from scratch for script in $SELF_DIR/1??-*.sh; do $script |