Merge lp:~brianaker/gearmand/update-bootstrap-june into lp:gearmand

Proposed by Brian Aker on 2013-06-21
Status: Merged
Merged at revision: 779
Proposed branch: lp:~brianaker/gearmand/update-bootstrap-june
Merge into: lp:gearmand
Diff against target: 89 lines (+15/-16)
1 file modified
bootstrap.sh (+15/-16)
To merge this branch: bzr merge lp:~brianaker/gearmand/update-bootstrap-june
Reviewer Review Type Date Requested Status
Tangent Trunk 2013-06-21 Pending
Review via email: mp+170743@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bootstrap.sh'
2--- bootstrap.sh 2013-06-10 06:48:59 +0000
3+++ bootstrap.sh 2013-06-21 06:23:39 +0000
4@@ -430,7 +430,7 @@
5 ret=$?
6 ;;
7 *)
8- run $CONFIGURE $BUILD_CONFIGURE_ARG
9+ run $CONFIGURE "$BUILD_CONFIGURE_ARG"
10 ret=$?
11 ;;
12 esac
13@@ -1507,6 +1507,9 @@
14
15 execute_job ()
16 {
17+ # We should always have a target by this point
18+ assert MAKE_TARGET
19+
20 determine_target_platform
21
22 determine_vcs
23@@ -1518,10 +1521,6 @@
24 return 1
25 fi
26
27- if [ -z "$MAKE_TARGET" ]; then
28- MAKE_TARGET="make_default"
29- fi
30-
31 if $print_setup_opt -o $debug; then
32 echo
33 print_setup
34@@ -1541,9 +1540,6 @@
35 PREFIX_ARG="--prefix=$PREFIX"
36 fi
37
38- # We should always have a target by this point
39- assert MAKE_TARGET
40-
41 if $CLEAN_OPTION; then
42 make_maintainer_clean
43 fi
44@@ -1551,10 +1547,6 @@
45 local MAKE_TARGET_ARRAY
46 MAKE_TARGET_ARRAY=( $MAKE_TARGET )
47
48- if $jenkins_build_environment; then
49- use_banner $target
50- fi
51-
52 for target in "${MAKE_TARGET_ARRAY[@]}"
53 do
54 # If we are running inside of Jenkins, we want to only run some of the possible tests
55@@ -1566,6 +1558,10 @@
56 fi
57 fi
58
59+ if $jenkins_build_environment; then
60+ use_banner $target
61+ fi
62+
63 local snapshot_run=false
64 local valgrind_run=false
65
66@@ -1619,10 +1615,6 @@
67 ;;
68 'mingw')
69 make_distclean
70- if ! check_mingw; then
71- die "mingw was not found"
72- fi
73-
74 if ! make_for_mingw; then
75 die "Failed to build mingw: $?"
76 fi
77@@ -1766,6 +1758,13 @@
78 fi
79 fi
80
81+ if [ -z "$MAKE_TARGET" ]; then
82+ MAKE_TARGET="make_default"
83+ fi
84+
85+ # We should always have a target by this point
86+ assert MAKE_TARGET
87+
88 execute_job
89 local ret=$?
90

Subscribers

People subscribed via source and target branches

to all changes: