diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Extras/Extras.mds | 6 | ||||
| -rw-r--r-- | Extras/GeckoWebBrowser/gtk-gui/generated.cs | 35 | ||||
| -rw-r--r-- | Extras/GeckoWebBrowser/gtk-gui/gui.stetic | 6 | ||||
| -rw-r--r-- | Extras/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 36 |
6 files changed, 83 insertions, 10 deletions
@@ -1,3 +1,11 @@ +2007-11-30 Michael Hutchinson <mhutchinson@novell.com> + + * configure.in: + * Extras/Extras.mds: + * Extras/Makefile.am: Enable the GeckoBrowserBinding. + + * Extras/GeckoWebBrowser: Add svn:ignores. + 2007-11-20 Michael Hutchinson <mhutchinson@novell.com> * Makefile.am: Fix distcheck; update-mime-database leaves "empty" diff --git a/Extras/Extras.mds b/Extras/Extras.mds index 46cb5db632..66da021196 100644 --- a/Extras/Extras.mds +++ b/Extras/Extras.mds @@ -26,6 +26,7 @@ <Entry build="True" name="MonoDevelop.RegexToolkit" configuration="Debug" /> <Entry build="True" name="CBinding" configuration="Debug" /> <Entry build="True" name="BooBinding" configuration="Debug" /> + <Entry build="True" name="GeckoWebBrowser" configuration="Debug" /> </Configuration> <Configuration name="Release" ctype="CombineConfiguration"> <Entry build="True" name="MonoDevelop.NUnit" configuration="Debug" /> @@ -53,6 +54,7 @@ <Entry build="True" name="MonoDevelop.RegexToolkit" configuration="Release" /> <Entry build="True" name="CBinding" configuration="Release" /> <Entry build="True" name="BooBinding" configuration="Release" /> + <Entry build="True" name="GeckoWebBrowser" configuration="Release" /> </Configuration> </Configurations> <StartMode startupentry="MonoDevelop.NUnit" single="True"> @@ -84,6 +86,7 @@ <Execute type="None" entry="MonoDevelop.RegexToolkit" /> <Execute type="None" entry="CBinding" /> <Execute type="None" entry="BooBinding" /> + <Execute type="None" entry="GeckoWebBrowser" /> </StartMode> <Entries> <Entry filename="NUnit/MonoDevelop.NUnit.mdp" /> @@ -111,5 +114,6 @@ <Entry filename="MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.mdp" /> <Entry filename="CBinding/CBinding.mds" /> <Entry filename="BooBinding/BooBinding.mds" /> + <Entry filename="GeckoWebBrowser/GeckoWebBrowser.mdp" /> </Entries> -</Combine>
\ No newline at end of file +</Combine> diff --git a/Extras/GeckoWebBrowser/gtk-gui/generated.cs b/Extras/GeckoWebBrowser/gtk-gui/generated.cs new file mode 100644 index 0000000000..c67023088d --- /dev/null +++ b/Extras/GeckoWebBrowser/gtk-gui/generated.cs @@ -0,0 +1,35 @@ +// ------------------------------------------------------------------------------ +// <autogenerated> +// This code was generated by a tool. +// Mono Runtime Version: 2.0.50727.42 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </autogenerated> +// ------------------------------------------------------------------------------ + +namespace Stetic { + + + internal class Gui { + + private static bool initialized; + + internal static void Initialize(Gtk.Widget iconRenderer) { + if ((Stetic.Gui.initialized == false)) { + Stetic.Gui.initialized = true; + } + } + } + + internal class ActionGroups { + + public static Gtk.ActionGroup GetActionGroup(System.Type type) { + return Stetic.ActionGroups.GetActionGroup(type.FullName); + } + + public static Gtk.ActionGroup GetActionGroup(string name) { + return null; + } + } +} diff --git a/Extras/GeckoWebBrowser/gtk-gui/gui.stetic b/Extras/GeckoWebBrowser/gtk-gui/gui.stetic new file mode 100644 index 0000000000..b33dbb1008 --- /dev/null +++ b/Extras/GeckoWebBrowser/gtk-gui/gui.stetic @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<stetic-interface> + <configuration> + <target-gtk-version>2.10.2</target-gtk-version> + </configuration> +</stetic-interface>
\ No newline at end of file diff --git a/Extras/Makefile.am b/Extras/Makefile.am index 8df8c1f7f2..ce185742df 100644 --- a/Extras/Makefile.am +++ b/Extras/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = MonoDevelop.DesignerSupport Deployment MonoDevelop.SourceEditor MonoDevelop.SourceEditor2 MonoDevelop.Autotools MonoDevelop.Gettext CSharpBinding DebuggerAddIn ILAsmBinding JavaBinding BooBinding NemerleBinding NUnit MonoDeveloperExtensions VersionControl VBNetBinding prj2make-sharp-lib WelcomePage ChangeLogAddIn MonoDevelop.GtkCore AspNetAddIn AspNetEdit MonoDevelop.WebReferences MonoDevelop.RegexToolkit CBinding MonoDevelop.Database +SUBDIRS = MonoDevelop.DesignerSupport Deployment MonoDevelop.SourceEditor MonoDevelop.SourceEditor2 MonoDevelop.Autotools MonoDevelop.Gettext CSharpBinding DebuggerAddIn ILAsmBinding JavaBinding BooBinding NemerleBinding NUnit MonoDeveloperExtensions VersionControl VBNetBinding prj2make-sharp-lib WelcomePage ChangeLogAddIn MonoDevelop.GtkCore GeckoWebBrowser AspNetAddIn AspNetEdit MonoDevelop.WebReferences MonoDevelop.RegexToolkit CBinding MonoDevelop.Database diff --git a/configure.in b/configure.in index 11fde7b274..10b69f2681 100644 --- a/configure.in +++ b/configure.in @@ -93,8 +93,6 @@ PKG_CHECK_MODULES(GCONF_SHARP, gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) AC_SUBST(GCONF_SHARP_LIBS) PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) AC_SUBST(GTKHTML_SHARP_LIBS) -PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION) -AC_SUBST(GECKO_SHARP_LIBS) PKG_CHECK_MODULES(MONODOC, monodoc >= $MONODOC_REQUIRED_VERSION) AC_SUBST(MONODOC_LIBS) PKG_CHECK_MODULES(MONO_CAIRO, mono-cairo >= 1.2) @@ -246,7 +244,22 @@ AC_ARG_ENABLE(aspnet, [enable ASP.NET project support [default=yes]]), enable_aspnet=${enableval}, enable_aspnet=yes) -AM_CONDITIONAL(ENABLE_ASPNET, [test x$enable_aspnet = xyes]) +AM_CONDITIONAL(ENABLE_ASPNET, [test x$enable_aspnet = xyes]) + + +# Optional Mozilla dependency +AC_ARG_ENABLE(geckosharp, + AC_HELP_STRING([--enable-geckosharp], + [enable GeckoSharp Mozilla support [default=yes]]), + enable_geckosharp=${enableval}, enable_geckosharp=yes) + +if test "x$enable_geckosharp" = "xyes"; then + PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION) + AC_SUBST(GECKO_SHARP_LIBS) +fi + +AM_CONDITIONAL(ENABLE_GECKOSHARP, [test x$enable_geckosharp = xyes]) + #We need to know where Mozilla is for launch scripts and possible for AspNetEdit #Check pkg-config first @@ -292,8 +305,9 @@ if test -z "$MOZILLA_HOME"; then MOZILLA_HOME= if test "x$enable_aspnetedit" = "xyes"; then AC_MSG_ERROR([Cannot detect Mozilla library directory. AspNetEdit addin cannot be built.]) - else - AC_MSG_WARN([Cannot detect Mozilla library directory. WelcomePage addin may not be able to function.]) + fi + if test "x$enable_geckosharp" = "xyes"; then + AC_MSG_WARN([Cannot detect Mozilla library directory. Some features may not be available.]) fi fi @@ -305,11 +319,15 @@ AC_ARG_ENABLE(aspnetedit, [enable ASP.NET visual designer support [default=no]]), enable_aspnetedit=yes, enable_aspnetedit=no) -if test "x$enable_aspnet" = "xno"; then - enable_aspnetedit=no - if test "x$enable_aspnetedit" = "xyes"; then +if test "x$enable_aspnetedit" = "xyes"; then + if test "x$enable_aspnet" = "xno"; then + enable_aspnetedit=no AC_MSG_WARN([Cannot enable AspNetEdit without ASP.NET project support.]) fi + if test "x$enable_geckosharp" = "xno"; then + enable_aspnetedit=no + AC_MSG_WARN([Cannot enable AspNetEdit without GeckoSharp support.]) + fi fi if test "x$enable_aspnetedit" = "xyes"; then @@ -465,6 +483,7 @@ Extras/Deployment/MonoDevelop.Deployment.Linux/Makefile Extras/MonoDevelop.Gettext/Makefile Extras/MonoDevelop.RegexToolkit/Makefile Extras/CBinding/Makefile +Extras/GeckoWebBrowser/Makefile Makefile monodevelop mdtool @@ -502,4 +521,5 @@ echo " * ASP.NET Visual Designer: $enable_aspnetedit" echo " * Web References: yes" echo " * C/C++ project support: $enable_c" echo " * GtkSourceView2: $enable_gtksourceview2" +echo " * GeckoSharp: $enable_geckosharp" echo "" |