diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | Mono.Profiler/adjust-makefiles.sh | 6 | ||||
| -rwxr-xr-x | Mono.Profiler/autogen.sh | 83 | ||||
| -rw-r--r-- | Mono.Profiler/configure.ac | 66 | ||||
| -rw-r--r-- | configure.in | 28 |
6 files changed, 42 insertions, 150 deletions
@@ -1,3 +1,10 @@ +2008-08-12 Massimiliano Mantione <massi@ximian.com> + * Makefile.am, configure.in: Integrated Mono.Profiler in the build. + * Mono.Profiler/configure.ac, Mono.Profiler/autogen.sh: + Deleted (no longer needed). + * Mono.Profiler/adjust-makefiles.sh: Added this script to fix the + makefiles again if they are regenerated from Monodevelop. + 2008-08-11 Sebastien Pouliot <sebastien@ximian.com> * configure.in: Bump Gendarme version to match the Mono release. diff --git a/Makefile.am b/Makefile.am index 43b46c96..396d0cb7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS= po gnunit docbrowser asn1view create-native-map ilcontrast gui-compare gendarme +SUBDIRS= po gnunit docbrowser asn1view create-native-map ilcontrast gui-compare gendarme Mono.Profiler diff --git a/Mono.Profiler/adjust-makefiles.sh b/Mono.Profiler/adjust-makefiles.sh new file mode 100755 index 00000000..81bdca0d --- /dev/null +++ b/Mono.Profiler/adjust-makefiles.sh @@ -0,0 +1,6 @@ +#!/bin/bash +for MF in ./*/Makefile.am; do +sed -i -e 's/include $(top_srcdir)\/Makefile.include/include $(top_srcdir)\/Mono.Profiler\/Makefile.include/' $MF; +sed -i -e 's/GTK_SHARP_20_LIBS/GTK_SHARP_LIBS/' $MF; +done +rm autogen.sh configure.ac; diff --git a/Mono.Profiler/autogen.sh b/Mono.Profiler/autogen.sh deleted file mode 100755 index b94eae29..00000000 --- a/Mono.Profiler/autogen.sh +++ /dev/null @@ -1,83 +0,0 @@ -#! /bin/sh - -PROJECT=Mono.Profiler -FILE= -CONFIGURE=configure.ac - -: ${AUTOCONF=autoconf} -: ${AUTOHEADER=autoheader} -: ${AUTOMAKE=automake} -: ${LIBTOOLIZE=libtoolize} -: ${ACLOCAL=aclocal} -: ${LIBTOOL=libtool} - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir -TEST_TYPE=-f -aclocalinclude="-I . $ACLOCAL_FLAGS" - -DIE=0 - -($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $PROJECT." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have automake installed to compile $PROJECT." - echo "Get ftp://sourceware.cygnus.com/pub/automake/automake-1.4.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 -} - -(grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null) && { - ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`libtool' installed to compile $PROJECT." - echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - } -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -#test $TEST_TYPE $FILE || { -# echo "You must run this script in the top-level $PROJECT directory" -# exit 1 -#} - -if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." -fi - -case $CC in -*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;; -esac - -(grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null) && { - echo "Running $LIBTOOLIZE ..." - $LIBTOOLIZE --force --copy -} - -echo "Running $ACLOCAL $aclocalinclude ..." -$ACLOCAL $aclocalinclude - -echo "Running $AUTOMAKE --gnu $am_opt ..." -$AUTOMAKE --add-missing --gnu $am_opt - -echo "Running $AUTOCONF ..." -$AUTOCONF - -echo Running $srcdir/configure $conf_flags "$@" ... -$srcdir/configure --enable-maintainer-mode $conf_flags "$@" \ diff --git a/Mono.Profiler/configure.ac b/Mono.Profiler/configure.ac deleted file mode 100644 index d44ae0b6..00000000 --- a/Mono.Profiler/configure.ac +++ /dev/null @@ -1,66 +0,0 @@ -dnl Warning: This is an automatically generated file, do not edit! -dnl Process this file with autoconf to produce a configure script. -AC_PREREQ([2.54]) -AC_INIT([Mono.Profiler], [0.1]) -AM_INIT_AUTOMAKE([foreign]) - -dnl pkg-config -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -if test "x$PKG_CONFIG" = "xno"; then - AC_MSG_ERROR([You need to install pkg-config]) -fi - -SHAMROCK_EXPAND_LIBDIR -SHAMROCK_EXPAND_BINDIR -SHAMROCK_EXPAND_DATADIR - -AC_PROG_INSTALL - -AC_PATH_PROG(GMCS, gmcs, no) -if test "x$GMCS" = "xno"; then - AC_MSG_ERROR([gmcs Not found]) -fi - - -AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug], - [Use 'DEBUG' Configuration [default=YES]]), - enable_debug=yes, enable_debug=no) -AM_CONDITIONAL(ENABLE_DEBUG, test x$enable_debug = xyes) -if test "x$enable_debug" = "xyes" ; then - CONFIG_REQUESTED="yes" -fi -AC_ARG_ENABLE(release, - AC_HELP_STRING([--enable-release], - [Use 'RELEASE' Configuration [default=NO]]), - enable_release=yes, enable_release=no) -AM_CONDITIONAL(ENABLE_RELEASE, test x$enable_release = xyes) -if test "x$enable_release" = "xyes" ; then - CONFIG_REQUESTED="yes" -fi -if test -z "$CONFIG_REQUESTED" ; then - AM_CONDITIONAL(ENABLE_DEBUG, true) - enable_debug=yes -fi - - -dnl package checks, common for all configs -PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0]) -PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0]) -PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0]) - -dnl package checks, per config - - -AC_CONFIG_FILES([ -profiler-file-decoder/Makefile -heap-snapshot-viewer/mprof-heap-viewer -Makefile -heap-snapshot-viewer/Makefile -profiler-decoder-library/Makefile -profiler-file-decoder/mprof-decoder -heap-snapshot-explorer/Makefile - -]) - -AC_OUTPUT diff --git a/configure.in b/configure.in index 98ae9394..9d27c9d4 100644 --- a/configure.in +++ b/configure.in @@ -95,6 +95,27 @@ if test "x$enable_gtkhtml$enable_gecko$enable_monowebbrowser$enable_webkit" = "x AC_MSG_ERROR([no HTML display found. You need either gtkhtml, gecko, WebKit or Mono.WebBrowser]) fi +AC_ARG_ENABLE(debug, + AC_HELP_STRING([--enable-debug], + [Use 'DEBUG' Configuration [default=YES]]), + enable_debug=yes, enable_debug=no) +AM_CONDITIONAL(ENABLE_DEBUG, test x$enable_debug = xyes) +if test "x$enable_debug" = "xyes" ; then + CONFIG_REQUESTED="yes" +fi +AC_ARG_ENABLE(release, + AC_HELP_STRING([--enable-release], + [Use 'RELEASE' Configuration [default=NO]]), + enable_release=yes, enable_release=no) +AM_CONDITIONAL(ENABLE_RELEASE, test x$enable_release = xyes) +if test "x$enable_release" = "xyes" ; then + CONFIG_REQUESTED="yes" +fi +if test -z "$CONFIG_REQUESTED" ; then + AM_CONDITIONAL(ENABLE_DEBUG, true) + enable_debug=yes +fi + dnl dnl I hate PKG_CONFIG_MODULES, that is for the weak dnl @@ -200,6 +221,13 @@ gendarme/rules/Gendarme.Rules.Maintainability/Makefile gendarme/rules/Gendarme.Rules.Maintainability/Test/Makefile gendarme/swf-wizard-runner/Makefile gendarme/win32-setup/Makefile +Mono.Profiler/profiler-file-decoder/Makefile +Mono.Profiler/Makefile +Mono.Profiler/heap-snapshot-viewer/mprof-heap-viewer +Mono.Profiler/heap-snapshot-viewer/Makefile +Mono.Profiler/profiler-decoder-library/Makefile +Mono.Profiler/profiler-file-decoder/mprof-decoder +Mono.Profiler/heap-snapshot-explorer/Makefile ]) echo "---" |