diff options
| author | Edward Hervey <edward@collabora.com> | 2013-09-25 13:45:10 +0200 |
|---|---|---|
| committer | Edward Hervey <edward@collabora.com> | 2013-09-25 13:45:10 +0200 |
| commit | 48e3a14353a8c6b9dfc2ca8ec4fe043d51b2562d (patch) | |
| tree | fd10daef1437c5a12d0793b97be33ce7c283a11a | |
| parent | 02e0dff2c337e9f27908db5bfc81d0fda4a4bc00 (diff) | |
Install when doing full flavor
| -rwxr-xr-x | ci-build.sh | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/ci-build.sh b/ci-build.sh index 1efe0d1..0c644b4 100755 --- a/ci-build.sh +++ b/ci-build.sh @@ -68,7 +68,7 @@ then exit fi WORKSPACE=$PWD - BUILD_TAG="try13" + BUILD_TAG="local" else echo "Jenkins build" fi @@ -98,6 +98,14 @@ if test "x$FLAVOR" == "xfull"; then echo "Modules scheduled to be checked for leaks (make check-valgrind):" echo " $VALGRIND_MODULES" echo + + # setup the various env variables + export PATH="$INSTALLPREFIX/bin":$PATH + export LD_LIBRARY_PATH="$INSTALLPREFIX/lib":$LD_LIBRARY_PATH + export DYLD_LIBRARY_PATH="$INSTALLPREFIX/lib":$DYLD_LIBRARY_PATH + export GI_TYPELIB_PATH="$INSTALLPREFIX/share/gir-1.0":$GI_TYPELIB_PATH + export PKG_CONFIG_PATH="$INSTALLPREFIX/lib/pkgconfig/":$PKG_CONFIG_PATH + export GST_REGISTRY="$INSTALLPREFIX/gstreamer-registry.dat" fi echo @@ -132,8 +140,10 @@ build() AGARGS="--disable-gtk-doc --disable-docbook --disable-introspection";; nodebug) AGARGS="--disable-gst-debug --disable-gtk-doc --disable-docbook --disable-introspection";; + full) + AGARGS="--prefix=$INSTALLPREFIX --enable-gtk-doc --enable-docbook --enable-introspection";; *) - AGARGS="--enable-gtk-doc --enable-docbook --enable-introspection";; + AGARGS="";; esac ./autogen.sh --cache-file=$INSTALLPREFIX/config.cache $AGARGS > $logname 2>&1 @@ -144,6 +154,9 @@ build() exit $ERROR_RETURN fi fi + else + echo "+ $1: git submodule update" + git submodule update 2>&1 > /dev/null fi echo "+ $1 : make" @@ -157,6 +170,18 @@ build() exit $ERROR_RETURN fi + if test "x$FLAVOR" == "xfull"; then + echo "+ $1 : make install" + logname=$INSTALLPREFIX/$1-make-install.log + make install > $logname 2>&1 + if test $? -ne 0 + then + echo "MAKE INSTALL FAILURE" + cat $logname + exit $ERROR_RETURN + fi + fi + echo "+ $1 : make clean-cruft" make clean-cruft > /dev/null 2>&1 fi |