add out of tree build and dist build to liburcu stable 0.7 & 0.8

diff --git a/userspace-rcu/liburcu-master.sh b/userspace-rcu/liburcu-master.sh
index 21bee61bfe2227664ae226c7f27612b8767d4c14..52fbba46d6a725450dab36a2d3afbeb017a3a89d 100755 (executable)
--- a/userspace-rcu/liburcu-master.sh
+++ b/userspace-rcu/liburcu-master.sh
@@ -64,7 +64,7 @@ case "$build" in
                ;;
 esac
 
-make V=1
+make
 make install
 make clean
 
@@ -72,6 +72,7 @@ make clean
 find $WORKSPACE/build/lib -name "*.so" -exec chrpath --delete {} \;
 find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \;
 
+# Cleanup temp directory of dist build
 if [ $build = "dist" ]; then
        rm -rf $BUILD_PATH
 fi

diff --git a/userspace-rcu/liburcu-stable-0.7.sh b/userspace-rcu/liburcu-stable-0.7.sh
index 41da104aa1b25d5b384cd02eaf55922f6a839d57..52fbba46d6a725450dab36a2d3afbeb017a3a89d 100755 (executable)
--- a/userspace-rcu/liburcu-stable-0.7.sh
+++ b/userspace-rcu/liburcu-stable-0.7.sh
@@ -23,7 +23,46 @@ tls_fallback)
     ;;
 esac
 
-./configure --prefix=$PREFIX $CONF_OPTS
+# Build type
+# oot : out-of-tree build
+# dist: build via make dist
+# *   : normal tree build
+#
+# Make sure to move to the build_path and configure
+# before continuing
+
+BUILD_PATH=$WORKSPACE
+case "$build" in
+       oot)
+               echo "Out of tree build"
+               BUILD_PATH=$WORKSPACE/oot
+               mkdir -p $BUILD_PATH
+               cd $BUILD_PATH
+               $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
+               ;;
+       dist)
+               echo "Distribution out of tree build"
+               BUILD_PATH=`mktemp -d`
+
+               # Initial configure and generate tarball
+               ./configure
+               make dist
+
+               mkdir -p $BUILD_PATH
+               cp *.tar.* $BUILD_PATH/
+               cd $BUILD_PATH
+
+               # Ignore level 1 of tar
+               tar xvf *.tar.* --strip 1
+
+               $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
+               ;;
+       *)
+               BUILD_PATH=$WORKSPACE
+               echo "Standard tree build"
+               $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
+               ;;
+esac
 
 make
 make install
@@ -32,3 +71,8 @@ make clean
 # Cleanup rpath and libtool .la files
 find $WORKSPACE/build/lib -name "*.so" -exec chrpath --delete {} \;
 find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \;
+
+# Cleanup temp directory of dist build
+if [ $build = "dist" ]; then
+       rm -rf $BUILD_PATH
+fi

diff --git a/userspace-rcu/liburcu-stable-0.8.sh b/userspace-rcu/liburcu-stable-0.8.sh
index 41da104aa1b25d5b384cd02eaf55922f6a839d57..52fbba46d6a725450dab36a2d3afbeb017a3a89d 100755 (executable)
--- a/userspace-rcu/liburcu-stable-0.8.sh
+++ b/userspace-rcu/liburcu-stable-0.8.sh
@@ -23,7 +23,46 @@ tls_fallback)
     ;;
 esac
 
-./configure --prefix=$PREFIX $CONF_OPTS
+# Build type
+# oot : out-of-tree build
+# dist: build via make dist
+# *   : normal tree build
+#
+# Make sure to move to the build_path and configure
+# before continuing
+
+BUILD_PATH=$WORKSPACE
+case "$build" in
+       oot)
+               echo "Out of tree build"
+               BUILD_PATH=$WORKSPACE/oot
+               mkdir -p $BUILD_PATH
+               cd $BUILD_PATH
+               $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
+               ;;
+       dist)
+               echo "Distribution out of tree build"
+               BUILD_PATH=`mktemp -d`
+
+               # Initial configure and generate tarball
+               ./configure
+               make dist
+
+               mkdir -p $BUILD_PATH
+               cp *.tar.* $BUILD_PATH/
+               cd $BUILD_PATH
+
+               # Ignore level 1 of tar
+               tar xvf *.tar.* --strip 1
+
+               $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
+               ;;
+       *)
+               BUILD_PATH=$WORKSPACE
+               echo "Standard tree build"
+               $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
+               ;;
+esac
 
 make
 make install
@@ -32,3 +71,8 @@ make clean
 # Cleanup rpath and libtool .la files
 find $WORKSPACE/build/lib -name "*.so" -exec chrpath --delete {} \;
 find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \;
+
+# Cleanup temp directory of dist build
+if [ $build = "dist" ]; then
+       rm -rf $BUILD_PATH
+fi