projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge tree from intel box.
[m6w6/libmemcached]
/
bootstrap.sh
diff --git
a/bootstrap.sh
b/bootstrap.sh
index 65cbbc2a5910d9bc2007c5e28f8b7ee5b87abd7a..ae25df01761669faee11cf1633c2e0add072119c 100755
(executable)
--- a/
bootstrap.sh
+++ b/
bootstrap.sh
@@
-234,6
+234,8
@@
function set_VENDOR_RELEASE ()
VENDOR_RELEASE="precise"
elif [[ "x$VENDOR_RELEASE" == 'x12.10' ]]; then
VENDOR_RELEASE="quantal"
VENDOR_RELEASE="precise"
elif [[ "x$VENDOR_RELEASE" == 'x12.10' ]]; then
VENDOR_RELEASE="quantal"
+ elif [[ "x$VENDOR_RELEASE" == 'x13.04' ]]; then
+ VENDOR_RELEASE="raring"
fi
;;
opensuse)
fi
;;
opensuse)
@@
-445,7
+447,7
@@
function setup_gdb_command () {
function setup_valgrind_command () {
VALGRIND_PROGRAM=`type -p valgrind`
if [[ -n "$VALGRIND_PROGRAM" ]]; then
function setup_valgrind_command () {
VALGRIND_PROGRAM=`type -p valgrind`
if [[ -n "$VALGRIND_PROGRAM" ]]; then
- VALGRIND_COMMAND="$VALGRIND_PROGRAM --error-exitcode=1 --leak-check=yes --
show-reachable=yes --
malloc-fill=A5 --free-fill=DE --xml=yes --xml-file=\"valgrind-%p.xml\""
+ VALGRIND_COMMAND="$VALGRIND_PROGRAM --error-exitcode=1 --leak-check=yes --malloc-fill=A5 --free-fill=DE --xml=yes --xml-file=\"valgrind-%p.xml\""
fi
}
fi
}
@@
-893,21
+895,16
@@
function make_for_continuus_integration ()
assert_exec_file 'configure'
assert_file 'Makefile'
assert_exec_file 'configure'
assert_file 'Makefile'
- make_target 'all'
-
# make rpm includes "make distcheck"
if [[ -f rpm.am ]]; then
# make rpm includes "make distcheck"
if [[ -f rpm.am ]]; then
+ make_target 'all'
make_rpm
elif [[ -d rpm ]]; then
make_rpm
elif [[ -d rpm ]]; then
+ make_target 'all'
make_rpm
else
make_distcheck
fi
make_rpm
else
make_distcheck
fi
-
- assert_exec_file 'configure'
- assert_file 'Makefile'
-
- make_install_system
;;
*-precise-*)
run_configure
;;
*-precise-*)
run_configure
@@
-915,19
+912,23
@@
function make_for_continuus_integration ()
assert_exec_file 'configure'
assert_file 'Makefile'
assert_exec_file 'configure'
assert_file 'Makefile'
- make_target 'all'
-
make_distcheck
make_distcheck
+ ;;
+ *-quantal-*)
+ run_configure
assert_exec_file 'configure'
assert_file 'Makefile'
assert_exec_file 'configure'
assert_file 'Makefile'
- make_valgrind
+ make_distcheck
+ ;;
+ *-raring-*)
+ run_configure
assert_exec_file 'configure'
assert_file 'Makefile'
assert_exec_file 'configure'
assert_file 'Makefile'
- make_
install_system
+ make_
distcheck
;;
*)
make_jenkins_default
;;
*)
make_jenkins_default