X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=bootstrap.sh;h=9a549f06cc9994fc41944291ed956778dbc38bbc;hb=b073677225181b9ab525a8304cb2a2cdcaac0277;hp=6a93c970553b2509bb62d47cae14e27017517fdc;hpb=f81967548e849e4a98640f8edcae65839e62ff92;p=m6w6%2Flibmemcached diff --git a/bootstrap.sh b/bootstrap.sh index 6a93c970..9a549f06 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -654,7 +654,7 @@ function make_for_snapshot () assert_no_directory 'autom4te.cache' run_configure - make_target 'dist' + make_target 'all' make_target 'distclean' # We should have a configure, but no Makefile at the end of this exercise @@ -857,6 +857,13 @@ function make_universe () make_install_system } +function check_snapshot () +{ + if [ -n "$BOOTSTRAP_SNAPSHOT_CHECK" ]; then + assert_file "$BOOTSTRAP_SNAPSHOT_CHECK" 'snapshot check failed' + fi +} + function make_for_continuus_integration () { # Setup the environment if we are local @@ -872,9 +879,7 @@ function make_for_continuus_integration () assert_file 'configure' fi - if [ -n "$BOOTSTRAP_SNAPSHOT_CHECK" ]; then - assert_file "$BOOTSTRAP_SNAPSHOT_CHECK" 'snapshot check failed' - fi + check_snapshot else # If we didn't require a snapshot, then we should not have a configure assert_no_file 'configure' @@ -1611,6 +1616,7 @@ function bootstrap () 'snapshot') make_for_snapshot snapshot_run=true + check_snapshot ;; 'rpm') make_rpm