Author: mkrueger
Date: 2008-02-09 08:07:00 -0500 (Sat, 09 Feb 2008)
New Revision: 95330
Modified:
trunk/monodevelop/main/ChangeLog
trunk/monodevelop/main/configure.in
trunk/monodevelop/main/src/addins/Addins.mds
trunk/monodevelop/main/src/addins/Makefile.am
trunk/monodevelop/main/src/addins/MonoDevelop.RegexToolkit/ChangeLog
trunk/monodevelop/main/src/addins/MonoDevelop.RegexToolkit/Makefile.am
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor/ChangeLog
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor/Makefile.am
trunk/monodevelop/main/src/addins/SourceEditor2/ChangeLog
trunk/monodevelop/main/src/addins/SourceEditor2/Makefile.am
Log:
* configure.in, src/addins/Addins.mds,
src/addins/SourceEditor2/Makefile.am,
src/addins/MonoDevelop.SourceEditor/Makefile.am,
src/addins/MonoDevelop.RegexToolkit/Makefile.am,
src/addins/Makefile.am: Managed texteditor is now standard - the
gtksourceview1&2 are now optional.
Modified: trunk/monodevelop/main/ChangeLog
===================================================================
--- trunk/monodevelop/main/ChangeLog 2008-02-09 12:34:42 UTC (rev 95329)
+++ trunk/monodevelop/main/ChangeLog 2008-02-09 13:07:00 UTC (rev 95330)
@@ -1,5 +1,10 @@
2008-02-09 Mike Krüger <[EMAIL PROTECTED]>
+ * configure.in, src/addins/Addins.mds, src/addins/Makefile.am: Managed
+ texteditor is now standard - the gtksourceview1&2 are now optional.
+
+2008-02-09 Mike Krüger <[EMAIL PROTECTED]>
+
* configure.in, src/addins/Makefile.am: Added managed texteditor to the
default build.
Modified: trunk/monodevelop/main/configure.in
===================================================================
--- trunk/monodevelop/main/configure.in 2008-02-09 12:34:42 UTC (rev 95329)
+++ trunk/monodevelop/main/configure.in 2008-02-09 13:07:00 UTC (rev 95330)
@@ -126,6 +126,19 @@
gtksharp_prefix="`$PKG_CONFIG --variable=prefix gtk-sharp-2.0`"
AC_SUBST(gtksharp_prefix)
+## gtksourceview1-sharp
+AC_ARG_ENABLE(gtksourceview,
+ AC_HELP_STRING([--enable-gtksourceview],
+ [use GtkSourceView 2 [default=no]]),
+ enable_gtksourceview=${enableval}, enable_gtksourceview=no)
+
+if test "x$enable_gtksourceview" = "xyes"; then
+ PKG_CHECK_MODULES(GTKSOURCEVIEW_SHARP, gtksourceview-sharp-2.0 >=
$GTKSOURCEVIEWSHARP_REQUIRED_VERSION)
+ AC_SUBST(GTKSOURCEVIEW_SHARP_LIBS)
+fi
+
+AM_CONDITIONAL(ENABLE_GTKSOURCEVIEW, test x$enable_gtksourceview = xyes)
+
## gtksourceview2-sharp
AC_ARG_ENABLE(gtksourceview2,
AC_HELP_STRING([--enable-gtksourceview2],
@@ -135,9 +148,6 @@
if test "x$enable_gtksourceview2" = "xyes"; then
PKG_CHECK_MODULES(GTKSOURCEVIEW2_SHARP, gtksourceview2-sharp >=
$GTKSOURCEVIEW2SHARP_REQUIRED_VERSION)
AC_SUBST(GTKSOURCEVIEW2_SHARP_LIBS)
-else
- PKG_CHECK_MODULES(GTKSOURCEVIEW_SHARP, gtksourceview-sharp-2.0 >=
$GTKSOURCEVIEWSHARP_REQUIRED_VERSION)
- AC_SUBST(GTKSOURCEVIEW_SHARP_LIBS)
fi
AM_CONDITIONAL(ENABLE_GTKSOURCEVIEW2, test x$enable_gtksourceview2 = xyes)
@@ -383,6 +393,7 @@
echo " * ASP.NET project support: $enable_aspnet"
echo " * Web References: yes"
echo " * C/C++ project support: $enable_c"
+echo " * GtkSourceView1: $enable_gtksourceview"
echo " * GtkSourceView2: $enable_gtksourceview2"
echo " * Platform bindings: $platform_bindings"
echo ""
Modified: trunk/monodevelop/main/src/addins/Addins.mds
===================================================================
--- trunk/monodevelop/main/src/addins/Addins.mds 2008-02-09 12:34:42 UTC
(rev 95329)
+++ trunk/monodevelop/main/src/addins/Addins.mds 2008-02-09 13:07:00 UTC
(rev 95330)
@@ -4,7 +4,6 @@
<Entry build="True" name="MonoDevelop.NUnit" configuration="Debug" />
<Entry build="True" name="ILAsmBinding" configuration="Debug" />
<Entry build="True" name="VersionControl" configuration="Debug" />
- <Entry build="True" name="MonoDevelop.SourceEditor"
configuration="Debug" />
<Entry build="True" name="MonoDevelop.GtkCore" configuration="Debug" />
<Entry build="True" name="WelcomePage" configuration="Debug" />
<Entry build="True" name="MonoDevelop.MsVisualStudio"
configuration="Debug" />
@@ -29,7 +28,6 @@
<Entry build="True" name="MonoDevelop.NUnit" configuration="Debug" />
<Entry build="True" name="ILAsmBinding" configuration="Debug" />
<Entry build="True" name="VersionControl" configuration="Debug" />
- <Entry build="True" name="MonoDevelop.SourceEditor"
configuration="Debug" />
<Entry build="True" name="MonoDevelop.GtkCore" configuration="Debug" />
<Entry build="True" name="WelcomePage" configuration="Debug" />
<Entry build="True" name="MonoDevelop.MsVisualStudio"
configuration="Debug" />
@@ -84,7 +82,6 @@
<Entry filename="NUnit/MonoDevelop.NUnit.mdp" />
<Entry filename="ILAsmBinding/ILAsmBinding.mdp" />
<Entry filename="VersionControl/VersionControl.mds" />
- <Entry filename="MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.mdp" />
<Entry filename="MonoDevelop.GtkCore/MonoDevelop.GtkCore.mds" />
<Entry filename="WelcomePage/WelcomePage.mdp" />
<Entry filename="prj2make-sharp-lib/prj2make-sharp-lib.mdp" />
Modified: trunk/monodevelop/main/src/addins/Makefile.am
===================================================================
--- trunk/monodevelop/main/src/addins/Makefile.am 2008-02-09 12:34:42 UTC
(rev 95329)
+++ trunk/monodevelop/main/src/addins/Makefile.am 2008-02-09 13:07:00 UTC
(rev 95330)
@@ -1,2 +1,13 @@
-SUBDIRS = MacPlatform GnomePlatform MonoDevelop.DesignerSupport Deployment
MonoDevelop.SourceEditor SourceEditor2 MonoDevelop.Autotools
MonoDevelop.Gettext CSharpBinding ILAsmBinding NUnit MonoDeveloperExtensions
VersionControl VBNetBinding prj2make-sharp-lib WelcomePage ChangeLogAddIn
MonoDevelop.GtkCore AspNetAddIn MonoDevelop.WebReferences
MonoDevelop.RegexToolkit CBinding MonoDevelop.AssemblyBrowser Mono.Texteditor
MonoDevelop.SourceEditor2
+DEFAULTSUBDIRS = MacPlatform GnomePlatform MonoDevelop.DesignerSupport
Deployment MonoDevelop.Autotools MonoDevelop.Gettext CSharpBinding ILAsmBinding
NUnit MonoDeveloperExtensions VersionControl VBNetBinding prj2make-sharp-lib
WelcomePage ChangeLogAddIn MonoDevelop.GtkCore AspNetAddIn
MonoDevelop.WebReferences MonoDevelop.RegexToolkit CBinding
MonoDevelop.AssemblyBrowser Mono.Texteditor
+
+if ENABLE_GTKSOURCEVIEW
+SUBDIRS = $(DEFAULTSUBDIRS) MonoDevelop.SourceEditor
+else
+if ENABLE_GTKSOURCEVIEW2
+SUBDIRS = $(DEFAULTSUBDIRS) SourceEditor2
+else
+SUBDIRS = $(DEFAULTSUBDIRS) MonoDevelop.SourceEditor2
+endif
+endif
+
Modified: trunk/monodevelop/main/src/addins/MonoDevelop.RegexToolkit/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.RegexToolkit/ChangeLog
2008-02-09 12:34:42 UTC (rev 95329)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.RegexToolkit/ChangeLog
2008-02-09 13:07:00 UTC (rev 95330)
@@ -1,3 +1,8 @@
+2008-02-09 Mike Krüger <[EMAIL PROTECTED]>
+
+ * Makefile.am: Managed texteditor is now standard - the
gtksourceview1&2 are
+ now optional.
+
2008-01-29 Marcos David Marín Amador <[EMAIL PROTECTED]>
* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: Small workaround to be
Modified: trunk/monodevelop/main/src/addins/MonoDevelop.RegexToolkit/Makefile.am
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.RegexToolkit/Makefile.am
2008-02-09 12:34:42 UTC (rev 95329)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.RegexToolkit/Makefile.am
2008-02-09 13:07:00 UTC (rev 95330)
@@ -13,10 +13,7 @@
-r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Projects.Gui.dll \
- -r:gdk-sharp \
- -r:gtk-sharp \
-r:Mono.Posix \
- -r:pango-sharp \
-r:System \
-r:System.Data \
-r:System.Web \
Modified: trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor/ChangeLog
2008-02-09 12:34:42 UTC (rev 95329)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor/ChangeLog
2008-02-09 13:07:00 UTC (rev 95330)
@@ -1,3 +1,8 @@
+2008-02-09 Mike Krüger <[EMAIL PROTECTED]>
+
+ * Makefile.am: Managed texteditor is now standard - the
gtksourceview1&2 are
+ now optional.
+
2008-02-06 Michael Hutchinson <[EMAIL PROTECTED]>
* MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs: Tidy up
Modified: trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor/Makefile.am
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor/Makefile.am
2008-02-09 12:34:42 UTC (rev 95329)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor/Makefile.am
2008-02-09 13:07:00 UTC (rev 95330)
@@ -54,21 +54,14 @@
ADDIN_BUILD = $(top_builddir)/build/AddIns
-if ENABLE_GTKSOURCEVIEW2
- all:
-else
- all: $(ASSEMBLY)
-endif
+all: $(ASSEMBLY)
$(ASSEMBLY) : $(build_sources) $(build_resources)
mkdir -p $(top_builddir)/build/bin
$(CSC) $(CSC_FLAGS) $(build_resources:%=/resource:%) $(build_sources)
-out:$@ -t:library $(REFS)
-if ENABLE_GTKSOURCEVIEW2
-else
- assemblydir = $(MD_ADDIN_DIR)
- assembly_DATA = $(ASSEMBLY)
-endif
+assemblydir = $(MD_ADDIN_DIR)
+assembly_DATA = $(ASSEMBLY)
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
Modified: trunk/monodevelop/main/src/addins/SourceEditor2/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/SourceEditor2/ChangeLog 2008-02-09
12:34:42 UTC (rev 95329)
+++ trunk/monodevelop/main/src/addins/SourceEditor2/ChangeLog 2008-02-09
13:07:00 UTC (rev 95330)
@@ -1,3 +1,8 @@
+2008-02-09 Mike Krüger <[EMAIL PROTECTED]>
+
+ * Makefile.am: Managed texteditor is now standard - the
gtksourceview1&2 are
+ now optional.
+
2008-02-06 Michael Hutchinson <[EMAIL PROTECTED]>
* MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs: Tidy up
Modified: trunk/monodevelop/main/src/addins/SourceEditor2/Makefile.am
===================================================================
--- trunk/monodevelop/main/src/addins/SourceEditor2/Makefile.am 2008-02-09
12:34:42 UTC (rev 95329)
+++ trunk/monodevelop/main/src/addins/SourceEditor2/Makefile.am 2008-02-09
13:07:00 UTC (rev 95330)
@@ -58,23 +58,14 @@
ADDIN_BUILD = $(top_builddir)/build/AddIns
-if ENABLE_GTKSOURCEVIEW2
- all: $(ASSEMBLY)
-else
- all:
-endif
-
all: $(ASSEMBLY)
$(ASSEMBLY) : $(build_sources) $(build_resources)
mkdir -p $(top_builddir)/build/bin
$(CSC) $(CSC_FLAGS) $(build_resources:%=/resource:%) $(build_sources)
-out:$@ -t:library $(REFS)
-if ENABLE_GTKSOURCEVIEW2
- assemblydir = $(MD_ADDIN_DIR)
- assembly_DATA = $(ASSEMBLY)
-else
-endif
+assemblydir = $(MD_ADDIN_DIR)
+assembly_DATA = $(ASSEMBLY)
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
