From: mquinson Date: Tue, 18 Sep 2007 09:00:56 +0000 (+0000) Subject: Add a compilation mode suited to build daemons. It's ways more permissive than regula... X-Git-Tag: v3.3~1154 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2b470fc7653464e7e6cb440ca449beb41b5c9df1 Add a compilation mode suited to build daemons. It's ways more permissive than regular mode git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4637 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/Makefile.in b/Makefile.in index a3bc7f59c3..f9b832ff90 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,11 +40,9 @@ target_triplet = @target@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/acmacro/dist-files.mk \ $(top_srcdir)/configure $(top_srcdir)/src/smpi/smpicc.in \ - $(top_srcdir)/src/smpi/smpirun.in \ - $(top_srcdir)/testsuite/gras/trp_file_usage.in \ - $(top_srcdir)/testsuite/gras/trp_tcp_usage.in AUTHORS COPYING \ - ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \ - install-sh ltmain.sh missing + $(top_srcdir)/src/smpi/smpirun.in AUTHORS COPYING ChangeLog \ + INSTALL NEWS TODO config.guess config.sub depcomp install-sh \ + ltmain.sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acmacro/ac_func_snprintf.m4 \ @@ -61,8 +59,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/gras_config.h -CONFIG_CLEAN_FILES = testsuite/gras/trp_tcp_usage \ - testsuite/gras/trp_file_usage src/smpi/smpicc src/smpi/smpirun +CONFIG_CLEAN_FILES = src/smpi/smpicc src/smpi/smpirun SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -273,10 +270,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -testsuite/gras/trp_tcp_usage: $(top_builddir)/config.status $(top_srcdir)/testsuite/gras/trp_tcp_usage.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -testsuite/gras/trp_file_usage: $(top_builddir)/config.status $(top_srcdir)/testsuite/gras/trp_file_usage.in - cd $(top_builddir) && $(SHELL) ./config.status $@ src/smpi/smpicc: $(top_builddir)/config.status $(top_srcdir)/src/smpi/smpicc.in cd $(top_builddir) && $(SHELL) ./config.status $@ src/smpi/smpirun: $(top_builddir)/config.status $(top_srcdir)/src/smpi/smpirun.in diff --git a/configure b/configure index 1944cd8bf3..b823d7b07b 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 4581 . +# From configure.ac Revision: 4603 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for simgrid 3.3-cvs. # @@ -910,6 +910,8 @@ abs_builddir abs_srcdir abs_top_builddir abs_top_srcdir +BOTBUILD_MODE_TRUE +BOTBUILD_MODE_FALSE JAVAC JAVA JAR @@ -1538,6 +1540,7 @@ Optional Features: --disable-compile-optimizations use compiler optimizations (default=yes, unless if CFLAGS is explicitly set) + --enable-botbuild Compilation mode for build daemons -- do not use it --disable-java To not compile the Java bindings even if the tools are found @@ -4593,7 +4596,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4596 "configure"' > conftest.$ac_ext + echo '#line 4599 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7355,11 +7358,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7358: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7361: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7362: \$? = $ac_status" >&5 + echo "$as_me:7365: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7623,11 +7626,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7626: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7629: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7630: \$? = $ac_status" >&5 + echo "$as_me:7633: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7727,11 +7730,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7730: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7733: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7734: \$? = $ac_status" >&5 + echo "$as_me:7737: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10024,7 +10027,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12466: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12467: \$? = $ac_status" >&5 + echo "$as_me:12470: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12564,11 +12567,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12567: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12570: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12571: \$? = $ac_status" >&5 + echo "$as_me:12574: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14125,11 +14128,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14128: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14131: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14132: \$? = $ac_status" >&5 + echo "$as_me:14135: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14229,11 +14232,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14232: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14235: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14236: \$? = $ac_status" >&5 + echo "$as_me:14239: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16416,11 +16419,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16419: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16422: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16423: \$? = $ac_status" >&5 + echo "$as_me:16426: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16684,11 +16687,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16687: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16690: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16691: \$? = $ac_status" >&5 + echo "$as_me:16694: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16788,11 +16791,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16791: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16794: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16795: \$? = $ac_status" >&5 + echo "$as_me:16798: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -25978,6 +25981,34 @@ echo "${ECHO_T}$optCFLAGS" >&6; } +############################################## +## Specific mode for build daemons. +## (they compile the SVN without having the autotools installed) +# Check whether --enable-botbuild was given. +if test "${enable_botbuild+set}" = set; then + enableval=$enable_botbuild; botbuild=$enableval +else + botbuild=no +fi + + if test x$botbuild != xno; then + BOTBUILD_MODE_TRUE= + BOTBUILD_MODE_FALSE='#' +else + BOTBUILD_MODE_TRUE='#' + BOTBUILD_MODE_FALSE= +fi + + +if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild != yes ; then + echo "ERROR:" + echo "ERROR: You have to enable the maintainer mode to compile the SVN." + echo "ERROR: For this, just call configure this way:" + echo "ERROR:" + echo "ERROR: ./configure '--enable-maintainer-mode' $ac_configure_args" + echo "ERROR:" + exit 1 +fi @@ -27030,6 +27061,13 @@ echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${BOTBUILD_MODE_TRUE}" && test -z "${BOTBUILD_MODE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"BOTBUILD_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"BOTBUILD_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${HAVE_JAVA_TRUE}" && test -z "${HAVE_JAVA_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"HAVE_JAVA\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -27795,6 +27833,8 @@ abs_builddir!$abs_builddir$ac_delim abs_srcdir!$abs_srcdir$ac_delim abs_top_builddir!$abs_top_builddir$ac_delim abs_top_srcdir!$abs_top_srcdir$ac_delim +BOTBUILD_MODE_TRUE!$BOTBUILD_MODE_TRUE$ac_delim +BOTBUILD_MODE_FALSE!$BOTBUILD_MODE_FALSE$ac_delim JAVAC!$JAVAC$ac_delim JAVA!$JAVA$ac_delim JAR!$JAR$ac_delim @@ -27816,7 +27856,7 @@ build_id!$build_id$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -28637,16 +28677,15 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name ( Context backend: ${with_context} " - -if test -e CVS && test x$USE_MAINTAINER_MODE != xyes ; then +if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild = yes ; then echo "WARNING:" - echo "WARNING: you seem to compile the CVS version without the maintainer mode." - echo "WARNING: You won't be able to build archives that way (make dist is likely to fail). " - echo "WARNING: If you want to enable the maintainer mode, juste specify it like this:" + echo "WARNING: You are compiling the SVN in botbuild mode. If you are not a daemon, don't do so. " + echo "WARNING: Remove the --enable-botbuild from your configure line, and add --enable-maintainer-mode instead." echo "WARNING:" - echo "WARNING: ./configure '--enable-maintainer-mode' $ac_configure_args" + echo "WARNING: You won't be able to build archives until then (make dist is likely to fail). " echo "WARNING:" fi + echo $build_id > stamp.configure exit 0; diff --git a/configure.ac b/configure.ac index 6ace0d8dda..3532750546 100644 --- a/configure.ac +++ b/configure.ac @@ -335,6 +335,23 @@ AC_SUBST([abs_srcdir]) AC_SUBST([abs_top_builddir]) AC_SUBST([abs_top_srcdir]) +############################################## +## Specific mode for build daemons. +## (they compile the SVN without having the autotools installed) +AC_ARG_ENABLE(botbuild, + AS_HELP_STRING([--enable-botbuild], [Compilation mode for build daemons -- do not use it]), + botbuild=$enableval,botbuild=no) +AM_CONDITIONAL(BOTBUILD_MODE,test x$botbuild != xno) + +if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild != yes ; then + echo "ERROR:" + echo "ERROR: You have to enable the maintainer mode to compile the SVN." + echo "ERROR: For this, just call configure this way:" + echo "ERROR:" + echo "ERROR: ./configure '--enable-maintainer-mode' $ac_configure_args" + echo "ERROR:" + exit 1 +fi SG_CONFIGURE_PART(Check for Java bindings...) @@ -544,16 +561,15 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name ( Context backend: ${with_context} " - -if test -e CVS && test x$USE_MAINTAINER_MODE != xyes ; then +if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild = yes ; then echo "WARNING:" - echo "WARNING: you seem to compile the CVS version without the maintainer mode." - echo "WARNING: You won't be able to build archives that way (make dist is likely to fail). " - echo "WARNING: If you want to enable the maintainer mode, juste specify it like this:" + echo "WARNING: You are compiling the SVN in botbuild mode. If you are not a daemon, don't do so. " + echo "WARNING: Remove the --enable-botbuild from your configure line, and add --enable-maintainer-mode instead." echo "WARNING:" - echo "WARNING: ./configure '--enable-maintainer-mode' $ac_configure_args" + echo "WARNING: You won't be able to build archives until then (make dist is likely to fail). " echo "WARNING:" fi + echo $build_id > stamp.configure exit 0; diff --git a/src/Makefile.am b/src/Makefile.am index f694bbf25f..14e3b9ba81 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -413,12 +413,17 @@ clean-units: done else +if BOTBUILD_MODE +$(TEST_UNITS) simgrid_units_main.c clean-units: + @echo "WARNING: Test units not generated, but touched instead since this is a bot build." + touch $@ +else $(TEST_UNITS) simgrid_units_main.c clean-units: @echo "ERROR: Test units not generated." - @echo "ERROR: If you are using a CVS checkout, configure with the --enable-maintainer-mode flag" + @echo "ERROR: If you are using a SVN checkout, configure with the --enable-maintainer-mode flag" @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list." @exit 1 - +endif endif ### diff --git a/src/Makefile.in b/src/Makefile.in index 11473d35df..2863ff1397 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -2330,11 +2330,14 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ rm -vf $$dep @srcdir@/$$dep; touch $$dep; \ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ done -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units: -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: Test units not generated." -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If you are using a CVS checkout, configure with the --enable-maintainer-mode flag" -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list." -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @exit 1 +@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units: +@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "WARNING: Test units not generated, but touched instead since this is a bot build." +@BOTBUILD_MODE_TRUE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ touch $@ +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@$(TEST_UNITS) simgrid_units_main.c clean-units: +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: Test units not generated." +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If you are using a SVN checkout, configure with the --enable-maintainer-mode flag" +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list." +@BOTBUILD_MODE_FALSE@@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_FALSE@ @exit 1 ### ### Regenerate what needs to with flex & flexml