Skip to content
Browse files

Second try to make quiet build work reliably

  • Loading branch information...
1 parent 7c5c56c commit d06470378c9d3834502c1a6ac148632d4c7a5ac5 @marek-safar marek-safar committed
Showing with 6 additions and 80 deletions.
  1. +0 −4 Makefile.am
  2. +2 −12 configure.in
  3. +2 −12 eglib/configure.ac
  4. +2 −5 libgc/configure.in
  5. +0 −1 scripts/Makefile.am
  6. +0 −46 scripts/patch-quiet.sh
View
4 Makefile.am
@@ -129,10 +129,6 @@ win32getdeps:
win32setup:
makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi
-patch-quiet:
- find mono -name Makefile -exec scripts/patch-quiet.sh {} \;
- find libgc -name Makefile -exec scripts/patch-quiet.sh {} \;
-
update-csproj:
-rm msvc/scripts/order
-mkdir msvc/scripts/inputs
View
14 configure.in
@@ -22,6 +22,8 @@ AC_SUBST(API_VER)
AC_PROG_LN_S
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
# In case of cygwin, override LN_S, irrespective of what it determines.
# The build uses cygwin, but the actual runtime doesn't.
case $host_os in
@@ -717,7 +719,6 @@ if test "x$with_xen_opt" = "xyes" -a "x$mono_cv_clang" = "xno"; then
])
fi
-AC_ARG_ENABLE(quiet-build, [ --enable-quiet-build Enable quiet runtime build (on by default)], enable_quiet_build=$enableval, enable_quiet_build=yes)
AC_ARG_ENABLE(small-config, [ --enable-small-config Enable tweaks to reduce requirements (and capabilities)], enable_small_config=$enableval, enable_small_config=no)
if test x$enable_small_config = xyes; then
@@ -3106,17 +3107,6 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/web.config],
cd $depth
],[LN_S='$LN_S'])
-if test x$enable_quiet_build = xyes; then
- AC_CONFIG_COMMANDS([quiet],
-[ for i in `find mono libgc support -name Makefile`; do
- if [ grep -q 'generated by automake' $i ]; then
- $srcdir/scripts/patch-quiet.sh $i;
- fi;
- done
-], [shell=$SHELL])
- AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/echo "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
-fi
-
AC_OUTPUT([
Makefile
mono-core.spec
View
14 eglib/configure.ac
@@ -13,6 +13,8 @@ AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign])
AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
AC_PROG_CC
AM_PROG_LIBTOOL
# Use dolt (http://dolt.freedesktop.org/) instead of libtool for building.
@@ -213,7 +215,6 @@ if test "x$PKG_CONFIG" != "xno"; then
fi
AM_CONDITIONAL(HAVE_GLIB, $have_glib)
-AC_ARG_ENABLE(quiet-build, [ --enable-quiet-build Enable quiet runtime build (on by default)], enable_quiet_build=$enableval, enable_quiet_build=yes)
AC_SUBST(GPOINTER_TO_INT)
AC_SUBST(GPOINTER_TO_UINT)
AC_SUBST(GINT_TO_POINTER)
@@ -225,17 +226,6 @@ AC_SUBST(G_GINT64_FORMAT)
AC_SUBST(G_GUINT32_FORMAT)
AC_SUBST(G_GINT32_FORMAT)
-if test x$enable_quiet_build = xyes; then
- AC_CONFIG_COMMANDS([quiet],
-[ for i in `find mono src test -name Makefile`; do
- if [ grep -q 'generated by automake' $i ]; then
- $srcdir/../scripts/patch-quiet.sh $i;
- fi;
- done
-], [shell=$SHELL])
- AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/$echo "copying selected/$show "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
-fi
-
AC_OUTPUT([
Makefile
m4/Makefile
View
7 libgc/configure.in
@@ -28,6 +28,8 @@ AC_SUBST(GC_VERSION)
AC_PROG_CC
AC_PROG_CXX
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
dnl automake 1.6 and later need the AM_PROG_AS macro.
ifdef([AM_PROG_AS],[AM_PROG_AS],[])
AC_CHECK_TOOL(AR, ar)
@@ -519,11 +521,6 @@ else
multilib_arg=
fi
-if test x$enable_quiet_build = xyes; then
- AC_CONFIG_COMMANDS([quiet], [for i in `find . -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do if test -f $i; then $srcdir/../scripts/patch-quiet.sh $i; fi; done], [shell=$SHELL])
- AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/$echo "copying selected/$show "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
-fi
-
AC_OUTPUT(Makefile
m4/Makefile
include/Makefile
View
1 scripts/Makefile.am
@@ -155,7 +155,6 @@ EXTRA_DIST = \
mono-test-install \
mono-heapviz \
$(MDOC_COMPAT) \
- patch-quiet.sh \
get-cygwin-deps.sh \
mono-configuration-crypto.in
View
46 scripts/patch-quiet.sh
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-#
-# patch-quiet.sh: Shell script to rewrite Makefiles using libtool to be less verbose
-#
-
-if [ "$1" = "" ]; then
- echo "Usage: patch-quiet.sh <path to Makefile>"
- exit 1
-fi
-
-src=$1
-
-if head -n1 $src | grep -q '# Postprocessed with patch-quiet\.sh'; then
- # already handled
- exit 0
-fi
-
-echo "# Postprocessed with patch-quiet.sh" > $src.tmp && cat $src >> $src.tmp && cp $src.tmp $src && rm -f $src.tmp
-# Try to find GNU sed
-SED="sed"
-sed --version >/dev/null 2>&1
-if [ $? -ne 0 ] ; then
- gsed --version > /dev/null 2>&1 && SED="gsed"
-fi
-
-# compile
-${SED} -e 's/^\t\(if \)\?$(COMPILE)/\t$(if $(V),,@echo "CC $@";) \1$(COMPILE)/g' < $src > $src.tmp && cp $src.tmp $src && rm -f $src.tmp
-${SED} -e 's/^\t\(if \)\?$(LTCOMPILE)/\t$(if $(V),,@echo "CC $@";) \1$(LTCOMPILE)/g' < $src > $src.tmp && cp $src.tmp $src && rm -f $src.tmp
-${SED} -e 's/^\t\(if \)\?$(LTCXXCOMPILE)/\t$(if $(V),,@echo "CC $@";) \1$(LTCXXCOMPILE)/g' < $src > $src.tmp && cp $src.tmp $src && rm -f $src.tmp
-${SED} -e 's/^\t\(if \)\?$(LIBTOOL)/\t$(if $(V),,@echo "CC $@";) \1$(LIBTOOL)/g' < $src > $src.tmp && cp $src.tmp $src && rm -f $src.tmp
-# link
-# automake defines multiple symbols ending with LINK
-${SED} -e 's/^\t$(\(.*LINK\))/\t$(if $(V),,@echo "LD $@";) $(\1)/g' < $src > $src.tmp && cp $src.tmp $src && rm -f $src.tmp
-#sed -e 's/LINK = $(LIBTOOL)/LINK = $(if $(V),,@echo "LD $@";) $(LIBTOOL)/g' < $src > $src.tmp && cp $src.tmp $src && rm -f $src.tmp
-# CC
-${SED} -e 's/^\t\(if \)\?$(CC)/\t$(if $(V),,@echo "CC $@";) \1$(CC)/g' < $src > $src.tmp && cp $src.tmp $src && rm -f $src.tmp
-# mv
-${SED} -e 's/^\tmv -f/\t$(if $(V),,@)mv -f/g' < $src > $src.tmp && cp $src.tmp $src && rm -f $src.tmp
-${SED} -e 's/^am__mv = /&$(if $(V),,@)/' < $src > $src.tmp && cp $src.tmp $src && rm -f $src.tmp
-# libtool messages
-${SED} -e 's/\$(LIBTOOL)/$(LIBTOOL) $(if $(V),,--quiet)/g' < $src > $src.tmp && cp $src.tmp $src && rm -f $src.tmp
-
-# This causes this script to be rerun if Makefile.am changes
-${SED} -e 's/am__depfiles_maybe = depfiles/& quiet/g' < $src > $src.tmp && cp $src.tmp $src && rm -f $src.tmp
-

0 comments on commit d064703

Please sign in to comment.
Something went wrong with that request. Please try again.