ci-build: Fixup "full" flavor

Enable distcheck for all modules (except gst-libav).

Tests are not actually run, but they are compiled

1 files changed, 74 insertions, 57 deletions

diff --git a/ci-build.sh b/ci-build.sh
index 1fe0480..7f3a337 100755
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -48,7 +48,14 @@ MODULES="gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-libav gst-rtsp-se
 EXTRA_MODULES="gst-python"
 
 # modules for which we run make check/distcheck
-CHECK_MODULES="orc gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-libav gst-rtsp-server gnonlin gst-editing-services"
+if test "x$FLAVOR" == "xfull"; then
+    # FIXME : distcheck fails for gst-libav
+    CHECK_MODULES="orc gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-rtsp-server gnonlin gst-editing-services"
+else
+    CHECK_MODULES="orc gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-libav gst-rtsp-server gnonlin gst-editing-services"
+fi
+
+# FIXME : Gradually add more modules
 VALGRIND_MODULES=""
 
 ERROR_RETURN=255
@@ -103,19 +110,22 @@ if test "x$FLAVOR" == "xfull"; then
     echo "  $VALGRIND_MODULES"
     echo
 
-    # prefix directory
-    INSTALLPREFIX=$WORKSPACE/output/prefix
+    # # prefix directory
+    # INSTALLPREFIX=$WORKSPACE/output/prefix
+
+    # mkdir -p $OUTPUTDIR/prefix
+    # ln -sf $OUTPUTDIR/prefix $INSTALLPREFIX
 
-    mkdir -p $OUTPUTDIR/prefix
-    ln -sf $OUTPUTDIR/prefix $INSTALLPREFIX
+    # # 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"
 
-    # 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"
+    # Checks are disabled for full variants
+    export GST_CHECKS="nothing-at-all-go-away-die-die"
 fi
 
 echo "======================================================"
@@ -152,19 +162,19 @@ build()
 	    else
 		echo "+ $1: autogen.sh"
 		logname=$LOGDIR/$1-autogen.log
-		# Fast variant => no instrospection, no docs
+		# Fast variant => no docs
 		# Full variant => introspection and docs
 		case "$FLAVOR" in
 		    fast)
-			AGARGS="--disable-gtk-doc --disable-docbook --disable-introspection";;
+			AGARGS="--disable-gtk-doc --disable-docbook --enable-introspection";;
 		    nodebug)
-			AGARGS="--disable-gst-debug --disable-gtk-doc --disable-docbook --disable-introspection";;
+			AGARGS="--disable-gst-debug --disable-gtk-doc --disable-docbook --enable-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
+		./autogen.sh $AGARGS > $logname 2>&1
 
 		if test $? -ne 0
 		then
@@ -189,23 +199,41 @@ build()
 	    exit $ERROR_RETURN
 	fi
 
-	if test "x$FLAVOR" == "xfull"; then
-	    echo "+ $1 : make install"
-	    logname=$LOGDIR/$1-make-install.log
-	    make install V=1 > $logname 2>&1
-	    if test $? -ne 0
-	    then
-		echo "MAKE INSTALL FAILURE"
-		cat $logname
-		exit $ERROR_RETURN
-	    fi
-	fi
+	# if test "x$FLAVOR" == "xfull"; then
+	#     echo "+ $1 : make install"
+	#     logname=$LOGDIR/$1-make-install.log
+	#     make install V=1 > $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
 }
 
+make_distcheck()
+{
+    if test -d $WORKSPACE/$1; then
+	cd $WORKSPACE/$1
+
+	echo "+ $1 : make distcheck"
+	logname=$LOGDIR/$1-make-distcheck.log
+	make distcheck V=1 > $logname 2>&1
+	
+	if test $? -ne 0
+	then
+	    echo "MAKE DISTCHECK FAILURE"
+	    cat $logname
+	    exit $ERROR_RETURN
+	fi
+    fi
+}
+
 make_check()
 {
     if test -d $WORKSPACE/$1; then
@@ -225,21 +253,6 @@ make_check()
 	    # We don't want to error out
 	    # exit $ERROR_RETURN
 	fi
-
-	if test "x$FLAVOR" == "xfull"; then
-	    if test "x$1" != "xgst-libav"; then
-		echo "+ $1 : make distcheck"
-		logname=$LOGDIR/$1-make-distcheck.log
-		make distcheck V=1 > $logname 2>&1
-
-		if test $? -ne 0
-		then
-		    echo "MAKE DISTCHECK FAILURE"
-		    cat $logname
-		    exit $ERROR_RETURN
-		fi
-	    fi
-	fi
     fi
 }
 
@@ -283,19 +296,19 @@ beach()
     # ccache will have cached all non-changed compilation, we can safely make clean
     repo forall -c make clean > /dev/null 2>&1
 
-    if test "x$FLAVOR" == "xfull"; then
-	echo
-	echo "======================================================"
-	echo
-	echo "Compressing/storing output prefix"
-	cd $OUTPUTDIR
-	tar cvJf $BUILD_TAG.tar.xz prefix > /dev/null
-	ls -lah $BUILD_TAG.tar.xz
-	rm -Rf prefix
-	echo
-	echo "======================================================"
-	rm $INSTALLPREFIX
-    fi
+    # if test "x$FLAVOR" == "xfull"; then
+    # 	echo
+    # 	echo "======================================================"
+    # 	echo
+    # 	echo "Compressing/storing output prefix"
+    # 	cd $OUTPUTDIR
+    # 	tar cvJf $BUILD_TAG.tar.xz prefix > /dev/null
+    # 	ls -lah $BUILD_TAG.tar.xz
+    # 	rm -Rf prefix
+    # 	echo
+    # 	echo "======================================================"
+    # 	rm $INSTALLPREFIX
+    # fi
 
     echo "Update done"
     exit
@@ -309,7 +322,11 @@ done
 
 # make check (for those activated)
 for m in $CHECK_MODULES; do
-    make_check $m
+    if test "x$FLAVOR" == "xfull"; then
+	make_distcheck $m
+    else
+	make_check $m
+    fi
 done
 
 # make valgrind (for those activated)