Update bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index d822e592a33963d39b25515592c52191bfe7dc97..b548686f03b0cf280ba22dda72fa1da5d93fe19b 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -358,8 +358,10 @@ function safe_pushd ()
 {
   pushd $1 &> /dev/null ;
 
-  if $VERBOSE -a test -n "$BUILD_DIR"; then
-    echo "BUILD_DIR=$BUILD_DIR"
+  if [ -n "$BUILD_DIR" ]; then
+    if $VERBOSE; then
+      echo "BUILD_DIR=$BUILD_DIR"
+    fi
   fi
 }
 
@@ -470,6 +472,10 @@ function make_darwin_malloc ()
 
 function snapshot_check ()
 {
+  if [ ! -f "$BOOTSTRAP_SNAPSHOT_CHECK" ]; then
+    make_for_snapshot
+  fi
+
   if [ -n "$BOOTSTRAP_SNAPSHOT_CHECK" ]; then
     assert_file "$BOOTSTRAP_SNAPSHOT_CHECK" 'snapshot check failed'
   fi
@@ -567,6 +573,8 @@ function make_for_continuus_integration ()
       assert_exec_file 'configure'
       assert_file 'Makefile'
 
+      make_target 'all'
+
       # make rpm includes "make distcheck"
       if [[ -f rpm.am ]]; then
         make_rpm
@@ -587,6 +595,8 @@ function make_for_continuus_integration ()
       assert_exec_file 'configure'
       assert_file 'Makefile'
 
+      make_target 'all'
+
       make_distcheck
 
       assert_exec_file 'configure'
@@ -663,7 +673,7 @@ function make_gdb ()
 # $2 to die, or not to die, based on contents
 function make_target ()
 {
-  if [[ -z "$1" ]]; then
+  if [ -z "$1" ]; then
     die "Programmer error, no target provided for make"
   fi
 
@@ -672,15 +682,17 @@ function make_target ()
     run_configure
   fi
 
-  if [ -n "$TESTS_ENVIRONMENT" -a $VERBOSE ]; then
-    echo "TESTS_ENVIRONMENT=$TESTS_ENVIRONMENT"
+  if [ -n "$TESTS_ENVIRONMENT" ]; then
+    if $VERBOSE; then
+      echo "TESTS_ENVIRONMENT=$TESTS_ENVIRONMENT"
+    fi
   fi
 
-  if [[ -z "$MAKE" ]]; then
+  if [ -z "$MAKE" ]; then
     die "MAKE was not set"
   fi
 
-  if [[ -n "$2" ]]; then
+  if [ -n "$2" ]; then
     run $MAKE $1 || return 1
   else
     run $MAKE $1 || die "Cannot execute $MAKE $1"
@@ -749,6 +761,11 @@ function run_autoreconf ()
     die "Programmer error, tried to call run_autoreconf () but AUTORECONF was not set"
   fi
 
+  if test $use_libtool = 1; then
+    assert $BOOTSTRAP_LIBTOOLIZE
+    run $BOOTSTRAP_LIBTOOLIZE '--copy' '--install' '--force' || die "Cannot execute $BOOTSTRAP_LIBTOOLIZE"
+  fi
+
   run $AUTORECONF || die "Cannot execute $AUTORECONF"
 
   eval 'bash -n configure' || die "autoreconf generated a malformed configure"
@@ -838,7 +855,16 @@ determine_vcs ()
   fi
 }
 
-autoreconf_setup ()
+function require_libtoolise ()
+{
+  use_libtool=0
+  grep '^[         ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
+    && use_libtool=1
+  grep '^[         ]*LT_INIT' configure.ac >/dev/null \
+    && use_libtool=1
+}
+
+function autoreconf_setup ()
 {
   # Set ENV MAKE in order to override "make"
   if [[ -z "$MAKE" ]]; then 
@@ -881,15 +907,36 @@ autoreconf_setup ()
     fi
   fi
 
-  if [[ -z "$LIBTOOLIZE" ]]; then
-    # If we are using OSX, we first check to see glibtoolize is available
-    if [[ "$VENDOR_DISTRIBUTION" == "darwin" ]]; then
-      LIBTOOLIZE=`type -p glibtoolize`
+  if test $use_libtool = 1; then
+    if [[ -n "$LIBTOOLIZE" ]]; then
+      BOOTSTRAP_LIBTOOLIZE=`type -p $LIBTOOLIZE`
 
-      if [[ -z "$LIBTOOLIZE" ]]; then
-        echo "Couldn't find glibtoolize, it is required on OSX"
+      if [[ -z "$BOOTSTRAP_LIBTOOLIZE" ]]; then
+        echo "Couldn't find user supplied libtoolize, it is required"
       fi
+    else
+      # If we are using OSX, we first check to see glibtoolize is available
+      if [[ "$VENDOR_DISTRIBUTION" == "darwin" ]]; then
+        BOOTSTRAP_LIBTOOLIZE=`type -p glibtoolize`
+
+        if [[ -z "$BOOTSTRAP_LIBTOOLIZE" ]]; then
+          echo "Couldn't find glibtoolize, it is required on OSX"
+        fi
+      else
+        BOOTSTRAP_LIBTOOLIZE=`type -p libtoolize`
+
+        if [[ -z "$BOOTSTRAP_LIBTOOLIZE" ]]; then
+          echo "Couldn't find libtoolize, it is required"
+        fi
+      fi
+    fi
+    if $VERBOSE; then
+      LIBTOOLIZE_OPTIONS="--verbose $BOOTSTRAP_LIBTOOLIZE_OPTIONS"
     fi
+    if $DEBUG; then
+      LIBTOOLIZE_OPTIONS="--debug $BOOTSTRAP_LIBTOOLIZE_OPTIONS"
+    fi
+    LIBTOOLIZE=true
   fi
 
   # Test the ENV AUTOMAKE if it exists
@@ -912,6 +959,12 @@ autoreconf_setup ()
     run $AUTOM4TE '--help'    &> /dev/null    || die "Failed to run AUTOM4TE:$AUTOM4TE"
   fi
 
+  # Test the ENV AUTOHEADER if it exists, if not we add one and add --install
+  if [[ -z "$ACLOCAL" ]]; then
+    ACLOCAL="aclocal --install"
+  fi
+  run $ACLOCAL '--help'  &> /dev/null    || die "Failed to run ACLOCAL:$ACLOCAL"
+
   if [[ -z "$AUTORECONF" ]]; then
     AUTORECONF=`type -p autoreconf`
 
@@ -1035,6 +1088,8 @@ check_make_target()
   case $1 in
     'self')
       ;;
+    'rpm')
+      ;;
     'gdb')
       ;;
     'clean_op')
@@ -1067,6 +1122,8 @@ check_make_target()
       ;;
     'all')
       ;;
+    'make_default')
+      ;;
     'test-*')
       ;;
     'valgrind-*')
@@ -1088,6 +1145,7 @@ function bootstrap ()
   determine_vcs
 
   # Set up whatever we need to do to use autoreconf later
+  require_libtoolise
   autoreconf_setup
 
   if [ -z "$MAKE_TARGET" ]; then
@@ -1144,9 +1202,8 @@ function bootstrap ()
       'configure')
         run_configure
         ;;
-      'default')
-        make
-        run_configure
+      'make_default')
+        make_default
         ;;
       'mingw')
         make_for_mingw32
@@ -1224,8 +1281,10 @@ main ()
   # If we are running under Jenkins we predetermine what tests we will run against
   # This MAKE_TARGET can be overridden by parse_command_line_options based MAKE_TARGET changes.
   # We don't want Jenkins overriding other variables, so we NULL them.
-  if [ -z "$MAKE_TARGET" -a $jenkins_build_environment ]; then
-    MAKE_TARGET='jenkins'
+  if [ -z "$MAKE_TARGET" ]; then
+    if $jenkins_build_environment; then
+      MAKE_TARGET='jenkins'
+    fi
   fi
 
   bootstrap
@@ -1236,6 +1295,48 @@ main ()
   exit 0
 }
 
+function set_branch ()
+{
+  if [ -z "$BRANCH" ]; then 
+    if [ -z "$CI_PROJECT_TEAM" ]; then 
+      die "Variable CI_PROJECT_TEAM has not been set"
+    fi
+    if [ -z "$PROJECT" ]; then 
+      die "Variable PROJECT has not been set"
+    fi
+    if [ -z "$BUILD_TAG" ]; then 
+      die "Variable BUILD_TAG has not been set"
+    fi
+
+    BRANCH="lp:~$CI_PROJECT_TEAM/$PROJECT/$BUILD_TAG"
+    export BRANCH
+  fi
+
+  if [ -z "$BRANCH" ]; then 
+    die "Missing values required to build BRANCH variable."
+  fi
+}
+
+function merge ()
+{
+  if [ -z "$VCS_CHECKOUT" ]; then
+    die "Merges require VCS_CHECKOUT."
+  fi
+
+  set_branch
+
+  if [[ "$VCS_CHECKOUT" == 'bzr' ]]; then
+    if test -n "$BRANCH_TO_MERGE"; then
+      bzr merge $BRANCH_TO_MERGE
+      bzr commit --message="Merge $BRANCH_TO_MERGE Build: $BUILD_TAG" --unchanged
+    fi
+
+    bzr push "$BRANCH"
+  elif [[ -n "$VCS_CHECKOUT" ]]; then
+    die "Merge attempt occured, current VCS setup does not support this"
+  fi
+}
+
 enable_debug ()
 {
   if ! $DEBUG; then
@@ -1250,6 +1351,18 @@ enable_debug ()
   fi
 }
 
+function usage ()
+{
+  cat << EOF
+  Usage: $program_name [OPTION]..
+
+  Bootstrap this package from the checked-out sources, and optionally walk through CI run.
+
+  Options:
+
+EOF
+}
+
 disable_debug ()
 {
   set +x
@@ -1258,6 +1371,8 @@ disable_debug ()
 
 # Script begins here
 
+program_name=$0
+
 env_debug_enabled=false
 if [[ -n "$JENKINS_HOME" ]]; then 
   declare -r jenkins_build_environment=true
@@ -1265,6 +1380,7 @@ else
   declare -r jenkins_build_environment=false
 fi
 
+export ACLOCAL
 export AUTOCONF
 export AUTOHEADER
 export AUTOM4TE
@@ -1272,6 +1388,8 @@ export AUTOMAKE
 export AUTORECONF
 export DEBUG
 export GNU_BUILD_FLAGS
+export LIBTOOLIZE
+export LIBTOOLIZE_OPTIONS
 export MAKE
 export TESTS_ENVIRONMENT
 export VERBOSE