From f254b2b288f2ee5678a537c578b4bfef6e66a1df Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Fri, 7 Feb 2014 00:18:45 -0800
Subject: Update bootstrap.

---
 bootstrap.sh | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

(limited to 'bootstrap.sh')

diff --git a/bootstrap.sh b/bootstrap.sh
index d45c9194..5a7cb779 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1098,7 +1098,11 @@ run_autoreconf ()
 
   if $use_libtool; then
     assert $BOOTSTRAP_LIBTOOLIZE
-    run "$BOOTSTRAP_LIBTOOLIZE" '--copy' '--install' '--force' || die "Cannot execute $BOOTSTRAP_LIBTOOLIZE"
+    if $jenkins_build_environment; then
+      run "$BOOTSTRAP_LIBTOOLIZE" '--copy' '--install' || die "Cannot execute $BOOTSTRAP_LIBTOOLIZE"
+    else
+      run "$BOOTSTRAP_LIBTOOLIZE" '--copy' '--install' '--force' || die "Cannot execute $BOOTSTRAP_LIBTOOLIZE"
+    fi
   fi
 
   run "$AUTORECONF" "$AUTORECONF_ARGS" || die "Cannot execute $AUTORECONF"
@@ -1239,7 +1243,11 @@ autoreconf_setup ()
   fi
 
   if [[ -z "$GNU_BUILD_FLAGS" ]]; then
-    GNU_BUILD_FLAGS="--install --force"
+    if $jenkins_build_environment; then
+      GNU_BUILD_FLAGS="--install"
+    else
+      GNU_BUILD_FLAGS="--install --force"
+    fi
   fi
 
   if $verbose; then
@@ -1557,7 +1565,8 @@ execute_job ()
       check_make_target $target
       ret=$?
       if [ $ret -ne 0 ]; then
-        die "Unknown BOOTSTRAP_TARGET option: $target"
+        warn "Unknown BOOTSTRAP_TARGET option: $target"
+        target="jenkins"
       fi
     fi
 
@@ -1732,24 +1741,6 @@ main ()
     BOOTSTRAP_TARGET="$OPT_TARGET"
   fi
 
-  # If we are running under Jenkins we predetermine what tests we will run against
-  # This BOOTSTRAP_TARGET can be overridden by parse_command_line_options based BOOTSTRAP_TARGET changes.
-  # We don't want Jenkins overriding other variables, so we NULL them.
-  if [ -z "$BOOTSTRAP_TARGET" ]; then
-    if $jenkins_build_environment; then
-      if [[ -n "$JENKINS_TARGET" ]]; then
-        check_make_target $JENKINS_TARGET
-        if [ $? -eq 0 ]; then
-          BOOTSTRAP_TARGET="$JENKINS_TARGET"
-        else
-          die "label not found: $label"
-        fi
-      else
-          BOOTSTRAP_TARGET='jenkins'
-      fi
-    fi
-  fi
-
   if [ -z "$BOOTSTRAP_TARGET" ]; then
     BOOTSTRAP_TARGET="make_default"
   fi
-- 
cgit v1.2.1


From 2004cb431a9b1c85e40d67cdb743aae2b7d9b23c Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Sat, 8 Feb 2014 23:28:22 -0800
Subject: RPM update.

---
 bootstrap.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'bootstrap.sh')

diff --git a/bootstrap.sh b/bootstrap.sh
index 5a7cb779..6f6821b7 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1014,7 +1014,10 @@ make_rpm ()
       mkdir -p ~/rpmbuild/RPMS/{i386,i486,i586,i686,noarch,athlon}
 
       run_configure_if_required
-      make_target 'rpm'
+      make_target 'dist-rpm'
+
+      mkdir artifacts
+      cp *gz *rpm artifacts
 
       if $jenkins_build_environment; then
         make_target 'clean'
-- 
cgit v1.2.1


From 8c406df883b9d49abe134b4bd74afc102019df8e Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Sun, 9 Feb 2014 02:35:11 -0800
Subject: Shift how rpm artifact is kept.

---
 bootstrap.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'bootstrap.sh')

diff --git a/bootstrap.sh b/bootstrap.sh
index 6f6821b7..c4418fdc 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1010,17 +1010,16 @@ make_rpm ()
 {
   if command_exists 'rpmbuild'; then
     if [ -f 'rpm.am' -o -d 'rpm' ]; then
-      mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-      mkdir -p ~/rpmbuild/RPMS/{i386,i486,i586,i686,noarch,athlon}
-
       run_configure_if_required
       make_target 'dist-rpm'
 
-      mkdir artifacts
-      cp *gz *rpm artifacts
-
       if $jenkins_build_environment; then
-        make_target 'clean'
+        mkdir artifacts
+        mv *gz *rpm artifacts
+
+        make_target 'maintainer-clean'
+        mv artifacts/* .
+        rmdir artifacts
       fi
 
     fi
-- 
cgit v1.2.1


From 386148e201a33c1a0356f5c90a1512bb6e4f27a4 Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Sun, 9 Feb 2014 03:51:48 -0800
Subject: Fix issue where we push rpm into artifact.

---
 bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bootstrap.sh')

diff --git a/bootstrap.sh b/bootstrap.sh
index c4418fdc..0383c8fa 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1015,7 +1015,7 @@ make_rpm ()
 
       if $jenkins_build_environment; then
         mkdir artifacts
-        mv *gz *rpm artifacts
+        mv *.tar.gz *.rpm artifacts
 
         make_target 'maintainer-clean'
         mv artifacts/* .
-- 
cgit v1.2.1