[Monodevelop-patches-list] r2094 - in trunk/MonoDevelop: . Core Core/po Core/src/AddIns Extras Extras/DebuggerAddIn
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Wed Dec 29 15:54:09 EST 2004
Author: tberman
Date: 2004-12-29 15:54:09 -0500 (Wed, 29 Dec 2004)
New Revision: 2094
Added:
trunk/MonoDevelop/Extras/DebuggerAddIn/
trunk/MonoDevelop/Extras/DebuggerAddIn/AUTHORS
trunk/MonoDevelop/Extras/DebuggerAddIn/COPYING
trunk/MonoDevelop/Extras/DebuggerAddIn/INSTALL
trunk/MonoDevelop/Extras/DebuggerAddIn/NEWS
trunk/MonoDevelop/Extras/DebuggerAddIn/README
trunk/MonoDevelop/Extras/DebuggerAddIn/autogen.sh
trunk/MonoDevelop/Extras/DebuggerAddIn/configure.in
Removed:
trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/
Modified:
trunk/MonoDevelop/Core/configure.in
trunk/MonoDevelop/Core/po/POTFILES.in
trunk/MonoDevelop/Core/src/AddIns/Makefile.am
trunk/MonoDevelop/Extras/DebuggerAddIn/Makefile.am
trunk/MonoDevelop/Makefile.am
trunk/MonoDevelop/autogen.sh
trunk/MonoDevelop/configure.in
Log:
Moving the debugger addin. This is potentially broken, hasnt really been tested.
Modified: trunk/MonoDevelop/Core/configure.in
===================================================================
--- trunk/MonoDevelop/Core/configure.in 2004-12-29 20:19:22 UTC (rev 2093)
+++ trunk/MonoDevelop/Core/configure.in 2004-12-29 20:54:09 UTC (rev 2094)
@@ -99,12 +99,6 @@
GLIB_MKENUMS="`$PKG_CONFIG --variable=glib_mkenums glib-2.0`"
AC_SUBST(GLIB_MKENUMS)
-dnl find mono debugger
-dnl MONO_DEBUGGER_REQUIRED_VERSION=0.9
-dnl PKG_CHECK_MODULES(MONO_DEBUGGER, mono-debugger >= $MONO_DEBUGGER_REQUIRED_VERSION, enable_debugger=yes, enable_debugger=no)
-dnl AC_SUBST(MONO_DEBUGGER_LIBS)
-enable_debugger=no
-
MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
AC_SUBST(MOZILLA_HOME)
@@ -122,7 +116,6 @@
enable_xdgmime="yes"
fi
-AM_CONDITIONAL(ENABLE_DEBUGGER, test "x$enable_debugger" = "xyes")
AM_CONDITIONAL(ENABLE_XDGMIME, test "x$enable_xdgmime" = "xyes")
AC_ARG_ENABLE(update-mimedb,
@@ -166,7 +159,6 @@
src/AddIns/Misc/Makefile
src/AddIns/Misc/StartPage/Makefile
src/AddIns/Misc/Sonata/Makefile
-src/AddIns/DebuggerAddIn/Makefile
src/Main/Makefile
src/Main/Base/Makefile
src/Main/Base/MonoDevelop.Base.dll.config
@@ -198,7 +190,6 @@
data/Makefile
data/resources/Makefile
data/resources/glade/Makefile
-src/AddIns/DebuggerAddIn/AssemblyInfo.cs
src/AddIns/DisplayBindings/SourceEditor/AssemblyInfo.cs
src/AddIns/Misc/StartPage/AssemblyInfo.cs
src/Main/StartUp/AssemblyInfo.cs
Modified: trunk/MonoDevelop/Core/po/POTFILES.in
===================================================================
--- trunk/MonoDevelop/Core/po/POTFILES.in 2004-12-29 20:19:22 UTC (rev 2093)
+++ trunk/MonoDevelop/Core/po/POTFILES.in 2004-12-29 20:54:09 UTC (rev 2094)
@@ -4,7 +4,6 @@
build/AddIns/AddIns/BackendBindings/BackendBindings.addin.xml
build/AddIns/AddIns/Misc/StartPage/StartPage.addin.xml
build/AddIns/AddIns/Misc/Sonata/Sonata.addin.xml
-src/AddIns/DebuggerAddIn/MonoDevelopDebugger.addin.xml
data/resources/glade/Base.glade
data/resources/glade/CSharp.glade
data/resources/glade/EditorBindings.glade
Modified: trunk/MonoDevelop/Core/src/AddIns/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/Makefile.am 2004-12-29 20:19:22 UTC (rev 2093)
+++ trunk/MonoDevelop/Core/src/AddIns/Makefile.am 2004-12-29 20:54:09 UTC (rev 2094)
@@ -1 +1 @@
-SUBDIRS = DisplayBindings BackendBindings Misc DebuggerAddIn prj2make-sharp-lib
+SUBDIRS = DisplayBindings BackendBindings Misc prj2make-sharp-lib
Copied: trunk/MonoDevelop/Extras/DebuggerAddIn (from rev 2087, trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn)
Property changes on: trunk/MonoDevelop/Extras/DebuggerAddIn
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
MonoDevelop.Debugger.dll
AssemblyInfo.cs
configure
config.log
config.status
autom4te.cache
missing
aclocal.m4
install-sh
Added: trunk/MonoDevelop/Extras/DebuggerAddIn/AUTHORS
===================================================================
Added: trunk/MonoDevelop/Extras/DebuggerAddIn/COPYING
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/COPYING 2004-12-21 11:35:44 UTC (rev 2087)
+++ trunk/MonoDevelop/Extras/DebuggerAddIn/COPYING 2004-12-29 20:54:09 UTC (rev 2094)
@@ -0,0 +1 @@
+link /usr/share/automake-1.9/COPYING
\ No newline at end of file
Property changes on: trunk/MonoDevelop/Extras/DebuggerAddIn/COPYING
___________________________________________________________________
Name: svn:special
+ *
Added: trunk/MonoDevelop/Extras/DebuggerAddIn/INSTALL
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/INSTALL 2004-12-21 11:35:44 UTC (rev 2087)
+++ trunk/MonoDevelop/Extras/DebuggerAddIn/INSTALL 2004-12-29 20:54:09 UTC (rev 2094)
@@ -0,0 +1 @@
+link /usr/share/automake-1.9/INSTALL
\ No newline at end of file
Property changes on: trunk/MonoDevelop/Extras/DebuggerAddIn/INSTALL
___________________________________________________________________
Name: svn:special
+ *
Modified: trunk/MonoDevelop/Extras/DebuggerAddIn/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am 2004-12-21 11:35:44 UTC (rev 2087)
+++ trunk/MonoDevelop/Extras/DebuggerAddIn/Makefile.am 2004-12-29 20:54:09 UTC (rev 2094)
@@ -4,8 +4,8 @@
DLLS = $(BASE_DEPENDENCIES_LIBS) \
$(MONO_DEBUGGER_LIBS) \
- /r:../../../build/bin/MonoDevelop.Base.dll \
- /r:../../../build/bin/MonoDevelop.Core.dll
+ /r:../../Core/build/bin/MonoDevelop.Base.dll \
+ /r:../../Core/build/bin/MonoDevelop.Core.dll
FILES = \
DebuggerCommands.cs \
@@ -15,7 +15,6 @@
Gui/DebuggerStackTracePad.cs \
Gui/DebuggerThreadPad.cs
-
EXTRA_DIST = $(FILES) $(ADDIN)
if ENABLE_DEBUGGER
@@ -25,13 +24,13 @@
build_sources = $(addprefix $(srcdir)/, $(FILES))
-../../../build/AddIns/$(ADDIN):
- cp $(ADDIN) ../../../build/AddIns/.
+../../Core/build/AddIns/$(ADDIN):
+ cp $(ADDIN) ../../Core/build/AddIns/.
$(ASSEMBLY): $(build_sources) ../../../build/AddIns/$(ADDIN)
$(CSC) /out:$(ASSEMBLY) /target:library \
- $(build_sources) $(DLLS)\
- && cp $(ASSEMBLY) ../../../build/AddIns/
+ $(build_sources) $(DLLS) \
+ && cp $(ASSEMBLY) ../../Core/build/AddIns/
assemblydir = $(libdir)/monodevelop/AddIns
assembly_DATA = $(ASSEMBLY) $(ADDIN)
Added: trunk/MonoDevelop/Extras/DebuggerAddIn/NEWS
===================================================================
Added: trunk/MonoDevelop/Extras/DebuggerAddIn/README
===================================================================
Copied: trunk/MonoDevelop/Extras/DebuggerAddIn/autogen.sh (from rev 2092, trunk/MonoDevelop/autogen.sh)
===================================================================
--- trunk/MonoDevelop/autogen.sh 2004-12-29 19:58:50 UTC (rev 2092)
+++ trunk/MonoDevelop/Extras/DebuggerAddIn/autogen.sh 2004-12-29 20:54:09 UTC (rev 2094)
@@ -0,0 +1,88 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+# Ripped off from GNOME macros version
+
+DIE=0
+
+PKG_NAME=MonoDevelop-Debugger
+WANT_AUTOCONF="2.5"
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`autoconf' installed to compile MonoDevelop."
+ 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 "**Error**: You must have \`automake' installed to compile MonoDevelop."
+ echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+ echo "(or a newer version if it is available)"
+ DIE=1
+ NO_AUTOMAKE=yes
+}
+
+# if no automake, don't bother testing for aclocal
+test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: Missing \`aclocal'. The version of \`automake'"
+ echo "installed doesn't appear recent enough."
+ echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+ echo "(or a newer version if it is available)"
+ DIE=1
+}
+
+if test "$DIE" -eq 1; then
+ exit 1
+fi
+
+if test -z "$*"; then
+ echo "**Warning**: I am going to run \`configure' with no arguments."
+ echo "If you wish to pass any to it, please specify them on the"
+ echo \`$0\'" command line."
+ echo
+fi
+
+case $CC in
+xlc )
+ am_opt=--include-deps;;
+esac
+
+
+echo "Running aclocal $ACLOCAL_FLAGS ..."
+aclocal $ACLOCAL_FLAGS || {
+ echo
+ echo "**Error**: aclocal failed. This may mean that you have not"
+ echo "installed all of the packages you need, or you may need to"
+ echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
+ echo "for the prefix where you installed the packages whose"
+ echo "macros were not found"
+ exit 1
+}
+
+if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+ echo "Running autoheader..."
+ autoheader || { echo "**Error**: autoheader failed."; exit 1; }
+fi
+
+echo "Running automake --gnu $am_opt ..."
+automake --add-missing --gnu $am_opt ||
+ { echo "**Error**: automake failed."; exit 1; }
+
+echo "Running autoconf ..."
+WANT_AUTOCONF="2.5" autoconf || { echo "**Error**: autoconf failed."; exit 1; }
+
+
+conf_flags="--enable-maintainer-mode --enable-compile-warnings"
+
+if test x$NOCONFIGURE = x; then
+ echo Running $srcdir/configure $conf_flags "$@" ...
+ $srcdir/configure $conf_flags "$@" \
+ && echo Now type \`make\' to compile $PKG_NAME || exit 1
+else
+ echo Skipping configure process.
+fi
Added: trunk/MonoDevelop/Extras/DebuggerAddIn/configure.in
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/configure.in 2004-12-21 11:35:44 UTC (rev 2087)
+++ trunk/MonoDevelop/Extras/DebuggerAddIn/configure.in 2004-12-29 20:54:09 UTC (rev 2094)
@@ -0,0 +1,61 @@
+AC_INIT([monodevelop-debugger], 0.5.99, README)
+AC_CONFIG_AUX_DIR(.)
+AM_INIT_AUTOMAKE([1.9 tar-ustar])
+AM_MAINTAINER_MODE
+
+AC_PATH_PROG(MONO, mono)
+AC_PATH_PROG(MCS, mcs)
+
+if test "x$MONO" = "x" ; then
+ AC_PATH_PROG(MINT, mint)
+ if test "x$MINT" = "x" ; then
+ AC_MSG_ERROR([Can't find "mono" or "mint" in your PATH])
+ fi
+fi
+
+if test "x$MCS" = "x" ; then
+ AC_MSG_ERROR([Can't find "mcs" in your PATH])
+fi
+
+MONO_REQUIRED_VERSION=1.0
+
+PKG_CHECK_MODULES(UNMANAGED_DEPENDENCIES_MONO,mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
+PKG_CHECK_MODULES(UNMANAGED_DEPENDENCIES_MINT,mint >= $MONO_REQUIRED_VERSION, has_mint=true, has_mint=false)
+
+if test "x$has_mono" = "xtrue"; then
+ if test `uname -s` = "Darwin"; then
+ AC_PATH_PROG(RUNTIME, mono, no)
+ AC_PATH_PROG(CSC, mcs, no)
+ LIB_PREFIX=
+ LIB_SUFFIX=.dylib
+ else
+ AC_PATH_PROG(RUNTIME, mono, no)
+ AC_PATH_PROG(CSC, mcs, no)
+ LIB_PREFIX=.so
+ LIB_SUFFIX=
+ fi
+else
+ if test "x$has_mint" = "xtrue"; then
+ AC_PATH_PROG(RUNTIME, mint, no)
+ AC_PATH_PROG(CSC, mcs, no)
+ LIB_PREFIX=.so
+ LIB_SUFFIX=
+ fi
+fi
+
+GTKSHARP_REQUIRED_VERSION=1.0
+
+PKG_CHECK_MODULES(BASE_DEPENDENCIES, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gtkhtml-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
+AC_SUBST(BASE_DEPENDENCIES_LIBS)
+
+dnl find mono debugger
+dnl MONO_DEBUGGER_REQUIRED_VERSION=0.9
+dnl PKG_CHECK_MODULES(MONO_DEBUGGER, mono-debugger >= $MONO_DEBUGGER_REQUIRED_VERSION, enable_debugger=yes, enable_debugger=no)
+dnl AC_SUBST(MONO_DEBUGGER_LIBS)
+enable_debugger=no
+
+AM_CONDITIONAL(ENABLE_DEBUGGER, test "x$enable_debugger" = "xyes")
+
+AC_OUTPUT([
+Makefile
+])
Modified: trunk/MonoDevelop/Makefile.am
===================================================================
--- trunk/MonoDevelop/Makefile.am 2004-12-29 20:19:22 UTC (rev 2093)
+++ trunk/MonoDevelop/Makefile.am 2004-12-29 20:54:09 UTC (rev 2094)
@@ -1,4 +1,4 @@
-SUBDIRS= Core
+SUBDIRS= Core Extras/DebuggerAddIn
all:
Modified: trunk/MonoDevelop/autogen.sh
===================================================================
--- trunk/MonoDevelop/autogen.sh 2004-12-29 20:19:22 UTC (rev 2093)
+++ trunk/MonoDevelop/autogen.sh 2004-12-29 20:54:09 UTC (rev 2094)
@@ -82,6 +82,8 @@
if test x$NOCONFIGURE = x; then
echo Running Core/autogen.sh "$@" ...
cd $srcdir/Core && NOCONFIGURE=yes ./autogen.sh "$@" && cd - > /dev/null 2>&1
+ echo Running Extras/DebuggerAddIn/autogen.sh "$@" ...
+ cd $srcdir/Extras/DebuggerAddIn && NOCONFIGURE=yes ./autogen.sh "$@" && cd - > /dev/null 2>&1
echo Running $srcdir/configure $conf_flags "$@" ...
$srcdir/configure $conf_flags "$@" \
&& echo Now type \`make\' to compile $PKG_NAME || exit 1
Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in 2004-12-29 20:19:22 UTC (rev 2093)
+++ trunk/MonoDevelop/configure.in 2004-12-29 20:54:09 UTC (rev 2094)
@@ -1,8 +1,9 @@
-AC_INIT(README)
-AM_INIT_AUTOMAKE(monodevelop, 0.5.1)
+AC_INIT([monodevelop], 0.5.99, README)
+AM_INIT_AUTOMAKE([1.9 tar-ustar])
AM_MAINTAINER_MODE
AC_CONFIG_SUBDIRS(Core)
+AC_CONFIG_SUBDIRS(Extras/DebuggerAddIn)
AC_OUTPUT([
Makefile
More information about the Monodevelop-patches-list
mailing list