Author: lluis
Date: 2007-12-04 14:14:02 -0500 (Tue, 04 Dec 2007)
New Revision: 90708

Modified:
   branches/monodevelop/reorg/main/ChangeLog
   branches/monodevelop/reorg/main/configure.in
   branches/monodevelop/reorg/main/src/addins/Makefile.am
   branches/monodevelop/reorg/main/src/addins/SourceEditor2/ChangeLog
   branches/monodevelop/reorg/main/src/addins/SourceEditor2/Makefile.am
   
branches/monodevelop/reorg/main/src/addins/SourceEditor2/MonoDevelop.SourceEditor.mdp
Log:
* configure.in, src/addins/SourceEditor2/Makefile.am,
  src/addins/SourceEditor2/MonoDevelop.SourceEditor.mdp,
  src/addins/Makefile.am: Moved SourceEditor2 back to main.

Modified: branches/monodevelop/reorg/main/ChangeLog
===================================================================
--- branches/monodevelop/reorg/main/ChangeLog   2007-12-04 19:09:07 UTC (rev 
90707)
+++ branches/monodevelop/reorg/main/ChangeLog   2007-12-04 19:14:02 UTC (rev 
90708)
@@ -1,5 +1,9 @@
 2007-12-04  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
+       * configure.in, src/addins/Makefile.am: Moved SourceEditor2 back to 
main.
+
+2007-12-04  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
        * monodevelop-core-addins.pc.in, configure.in, src/tools/Tools.mds,
          src/addins/Addins.mds, src/addins/Extras.mds, src/addins/Makefile.am,
          src/core/Makefile.am, src/core/Core.mds, src/Makefile.am,

Modified: branches/monodevelop/reorg/main/configure.in
===================================================================
--- branches/monodevelop/reorg/main/configure.in        2007-12-04 19:09:07 UTC 
(rev 90707)
+++ branches/monodevelop/reorg/main/configure.in        2007-12-04 19:14:02 UTC 
(rev 90708)
@@ -76,6 +76,7 @@
 MONOADDINS_REQUIRED_VERSION=0.3
 GTKSHARP_REQUIRED_VERSION=2.8.0
 GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.10
+GTKSOURCEVIEW2SHARP_REQUIRED_VERSION=1.9.1
 GECKOSHARP_REQUIRED_VERSION=0.10
 MONODOC_REQUIRED_VERSION=1.0
 
@@ -320,6 +321,8 @@
 src/addins/MonoDevelop.RegexToolkit/Makefile
 src/addins/CBinding/Makefile
 src/addins/GeckoWebBrowser/Makefile
+src/addins/SourceEditor2/AssemblyInfo.cs
+src/addins/SourceEditor2/Makefile
 Makefile
 monodevelop
 mdtool
@@ -342,4 +345,5 @@
 echo "   * ASP.NET project support: $enable_aspnet"
 echo "   * Web References: yes"
 echo "   * C/C++ project support: $enable_c"
+echo "   * GtkSourceView2: $enable_gtksourceview2"
 echo ""

Modified: branches/monodevelop/reorg/main/src/addins/Makefile.am
===================================================================
--- branches/monodevelop/reorg/main/src/addins/Makefile.am      2007-12-04 
19:09:07 UTC (rev 90707)
+++ branches/monodevelop/reorg/main/src/addins/Makefile.am      2007-12-04 
19:14:02 UTC (rev 90708)
@@ -1,2 +1,2 @@
 
-SUBDIRS = MonoDevelop.DesignerSupport Deployment MonoDevelop.SourceEditor 
MonoDevelop.Autotools MonoDevelop.Gettext CSharpBinding ILAsmBinding NUnit 
MonoDeveloperExtensions VersionControl VBNetBinding prj2make-sharp-lib 
WelcomePage ChangeLogAddIn MonoDevelop.GtkCore AspNetAddIn 
MonoDevelop.WebReferences MonoDevelop.RegexToolkit CBinding GeckoWebBrowser
+SUBDIRS = 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 GeckoWebBrowser

Modified: branches/monodevelop/reorg/main/src/addins/SourceEditor2/ChangeLog
===================================================================
--- branches/monodevelop/reorg/main/src/addins/SourceEditor2/ChangeLog  
2007-12-04 19:09:07 UTC (rev 90707)
+++ branches/monodevelop/reorg/main/src/addins/SourceEditor2/ChangeLog  
2007-12-04 19:14:02 UTC (rev 90708)
@@ -1,5 +1,10 @@
 2007-12-04  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
+       * Makefile.am, MonoDevelop.SourceEditor.mdp: Moved SourceEditor2 back to
+         main.
+
+2007-12-04  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
        * MonoDevelop.SourceEditor.mdp: Directory reorganization.
 
 2007-11-19  Zach Lute <[EMAIL PROTECTED]>

Modified: branches/monodevelop/reorg/main/src/addins/SourceEditor2/Makefile.am
===================================================================
--- branches/monodevelop/reorg/main/src/addins/SourceEditor2/Makefile.am        
2007-12-04 19:09:07 UTC (rev 90707)
+++ branches/monodevelop/reorg/main/src/addins/SourceEditor2/Makefile.am        
2007-12-04 19:14:02 UTC (rev 90708)
@@ -43,7 +43,7 @@
        $(GNOME_VFS_SHARP_LIBS) \
        $(GTK_SHARP_LIBS) \
        $(GTKSOURCEVIEW2_SHARP_LIBS) \
-       -r:$(top_builddir)/build/bin/Mono.Addins.dll \
+       $(MONO_ADDINS_LIBS) \
        -r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
        -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
        -r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \

Modified: 
branches/monodevelop/reorg/main/src/addins/SourceEditor2/MonoDevelop.SourceEditor.mdp
===================================================================
--- 
branches/monodevelop/reorg/main/src/addins/SourceEditor2/MonoDevelop.SourceEditor.mdp
       2007-12-04 19:09:07 UTC (rev 90707)
+++ 
branches/monodevelop/reorg/main/src/addins/SourceEditor2/MonoDevelop.SourceEditor.mdp
       2007-12-04 19:14:02 UTC (rev 90708)
@@ -35,7 +35,6 @@
     <File name="ChangeLog" subtype="Code" buildaction="Nothing" />
     <File name="MonoDevelop.SourceEditor.addin.xml" subtype="Code" 
buildaction="EmbedAsResource" />
     <File name="bookmark.png" subtype="Code" buildaction="EmbedAsResource" />
-    <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
     <File 
name="MonoDevelop.SourceEditor.FormattingStrategy/IFormattingStrategy.cs" 
subtype="Code" buildaction="Compile" />
     <File 
name="MonoDevelop.SourceEditor.FormattingStrategy/DefaultFormattingStrategy.cs" 
subtype="Code" buildaction="Compile" />
     <File 
name="MonoDevelop.SourceEditor.Gui.OptionPanels/BehaviorTextEditorPanel.cs" 
subtype="Code" buildaction="Compile" />
@@ -45,6 +44,7 @@
     <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
     <File name="gtk-gui/objects.xml" subtype="Code" 
buildaction="EmbedAsResource" />
     <File name="Makefile.am" subtype="Code" buildaction="Nothing" />
+    <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Project" localcopy="False" 
refto="MonoDevelop.Core" />
@@ -57,10 +57,19 @@
     <ProjectReference type="Gac" localcopy="True" refto="System.Drawing, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Xml, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp-peditors, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, 
Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
-  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" 
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" 
SyncReferences="True" IsAutotoolsProject="True" 
RelativeConfigureInPath="../../">
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" 
RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" 
SyncReferences="True" IsAutotoolsProject="True" 
RelativeConfigureInPath="../../..">
     <ExcludedFiles>
       <File>AssemblyInfo.cs</File>
     </ExcludedFiles>

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to