diff options
author | Edward Hervey <edward@collabora.com> | 2013-09-26 15:12:23 +0200 |
---|---|---|
committer | Edward Hervey <edward@collabora.com> | 2013-09-26 15:12:23 +0200 |
commit | ebb6dbdc5dd761c78796dde6a858e70cd979c47b (patch) | |
tree | cf4d9b86107ffb9a0d5a7da395bf954d5df284c1 | |
parent | eb3387771deb1bd3f23cee179bbffa488b5c8758 (diff) |
full: Ensure install prefix is always the same
Use a symbolic link to ensure the install prefix is always the same
-rwxr-xr-x | ci-build.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ci-build.sh b/ci-build.sh index c1818b4..2157367 100755 --- a/ci-build.sh +++ b/ci-build.sh @@ -77,6 +77,7 @@ echo # Create an output directory for all results # # output/ +# prefix/ # symbolic link to $BUILD_TAG/prefix (if flavor full) # $BUILD_TAG/ # logs/ # Where logs from the various steps are stored # prefix/ # Install prefix (if flavor:full) @@ -103,8 +104,10 @@ if test "x$FLAVOR" == "xfull"; then echo # prefix directory - INSTALLPREFIX=$OUTPUTDIR/prefix - mkdir -p $INSTALLPREFIX + INSTALLPREFIX=$WORKSPACE/output/prefix + + mkdir -p $OUTPUTDIR/prefix + ln -sf $OUTPUTDIR/prefix $INSTALLPREFIX # setup the various env variables export PATH="$INSTALLPREFIX/bin":$PATH @@ -285,6 +288,7 @@ beach() rm -Rf prefix echo echo "======================================================" + rm $INSTALLPREFIX fi echo "Update done" |