[Monodevelop-patches-list] r2104 - in trunk/MonoDevelop: . Core Core/src/AddIns/BackendBindings/CSharpBinding Core/src/AddIns/BackendBindings/NemerleBinding Core/src/AddIns/BackendBindings/VBNetBinding Core/src/AddIns/DisplayBindings/SourceEditor Core/src/MonoDevelop.Base Core/src/MonoDevelop.Core Core/src/MonoDevelop.Startup

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Sun Jan 2 17:46:35 EST 2005 

Author: tberman
Date: 2005-01-02 17:46:35 -0500 (Sun, 02 Jan 2005)
New Revision: 2104

Added:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharp.glade
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Nemerle.glade
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/EditorBindings.glade
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/texteditoraddin.glade
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade
   trunk/MonoDevelop/Core/src/MonoDevelop.Core/AddIn.xsd
   trunk/MonoDevelop/Core/src/MonoDevelop.Startup/SplashScreen.png
Removed:
   trunk/MonoDevelop/Core/data/
Modified:
   trunk/MonoDevelop/Core/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
   trunk/MonoDevelop/Core/src/MonoDevelop.Core/Makefile.am
   trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am
   trunk/MonoDevelop/configure.in
Log:
Remove Core/data, and put resource files into their proper place.


Modified: trunk/MonoDevelop/Core/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/Makefile.am	2005-01-02 22:31:41 UTC (rev 2103)
+++ trunk/MonoDevelop/Core/Makefile.am	2005-01-02 22:46:35 UTC (rev 2104)
@@ -1 +1 @@
-SUBDIRS= gdldock src data
+SUBDIRS= gdldock src

Copied: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharp.glade (from rev 2099, trunk/MonoDevelop/Core/data/resources/glade/CSharp.glade)

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am	2005-01-02 22:31:41 UTC (rev 2103)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am	2005-01-02 22:46:35 UTC (rev 2104)
@@ -39,9 +39,9 @@
 
 all: $(ASSEMBLY)
 
-$(ASSEMBLY): $(build_sources)
+$(ASSEMBLY): $(build_sources) $(srcdir)/CSharp.glade
 	$(CSC) /out:$(ASSEMBLY) /target:library $(DLLS) \
-		/resource:$(srcdir)/../../../../data/resources/glade/CSharp.glade,CSharp.glade \
+		/resource:$(srcdir)/CSharp.glade,CSharp.glade \
 		$(build_sources) \
 	&& cp $(ASSEMBLY) ../../../../../build/AddIns/AddIns/BackendBindings/.
 
@@ -52,5 +52,5 @@
 
 DISTCLEANFILES = CSharpBindingExecutionManager.cs
 
-EXTRA_DIST = $(FILES) CSharpBindingExecutionManager.cs.in
+EXTRA_DIST = $(FILES) CSharpBindingExecutionManager.cs.in CSharp.glade
 

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am	2005-01-02 22:31:41 UTC (rev 2103)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am	2005-01-02 22:46:35 UTC (rev 2104)
@@ -21,9 +21,9 @@
 
 all: $(ASSEMBLY)
 
-$(ASSEMBLY): $(FILES) $(srcdir)/../../../../data/resources/glade/Nemerle.glade
+$(ASSEMBLY): $(FILES) $(srcdir)/Nemerle.glade
 	$(CSC) $(DLLS) $(build_sources) /out:$(ASSEMBLY) /target:library \
-	/resource:$(srcdir)/../../../../data/resources/glade/Nemerle.glade,Nemerle.glade \
+	/resource:$(srcdir)/Nemerle.glade,Nemerle.glade \
 	&& cp $(ASSEMBLY) ../../../../../build/AddIns/AddIns/BackendBindings/.
 
 assemblydir = $(libdir)/monodevelop/AddIns/AddIns/BackendBindings/
@@ -31,4 +31,4 @@
 
 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
 DISTCLEANFILES = NemerleBindingExecutionServices.cs
-EXTRA_DIST = $(FILES) NemerleBindingExecutionServices.cs.in
+EXTRA_DIST = $(FILES) NemerleBindingExecutionServices.cs.in Nemerle.glade

Copied: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Nemerle.glade (from rev 2099, trunk/MonoDevelop/Core/data/resources/glade/Nemerle.glade)

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am	2005-01-02 22:31:41 UTC (rev 2103)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am	2005-01-02 22:46:35 UTC (rev 2104)
@@ -43,10 +43,10 @@
 
 all: $(ASSEMBLY)
 
-$(ASSEMBLY): $(build_sources)
+$(ASSEMBLY): $(build_sources) $(srcdir)/VB.glade
 	cd SharpRefactoryVB && make
 	$(CSC) /out:$(ASSEMBLY) /target:library $(DLLS) \
-		/resource:$(srcdir)/../../../../data/resources/glade/VB.glade,VB.glade \
+		/resource:$(srcdir)/VB.glade,VB.glade \
 		$(build_sources) \
 	&& cp $(ASSEMBLY) ../../../../../build/AddIns/AddIns/BackendBindings/.
 
@@ -57,5 +57,5 @@
 
 DISTCLEANFILES =
 
-EXTRA_DIST = $(FILES)
+EXTRA_DIST = $(FILES) VB.glade
 

Copied: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/EditorBindings.glade (from rev 2099, trunk/MonoDevelop/Core/data/resources/glade/EditorBindings.glade)

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2005-01-02 22:31:41 UTC (rev 2103)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2005-01-02 22:46:35 UTC (rev 2104)
@@ -86,10 +86,10 @@
 
 all : $(DLL)
 
-$(DLL) : $(build_sources)
+$(DLL) : $(build_sources) $(srcdir)/EditorBindings.glade $(srcdir)/texteditoraddin.glade
 	$(CSC) $(build_sources) /debug /out:$(DLL) /t:library $(REFS) \
-	/resource:$(srcdir)/../../../../data/resources/glade/EditorBindings.glade,EditorBindings.glade \
-	/resource:$(srcdir)/../../../../data/resources/glade/texteditoraddin.glade,texteditoraddin.glade \
+	/resource:$(srcdir)/EditorBindings.glade,EditorBindings.glade \
+	/resource:$(srcdir)/texteditoraddin.glade,texteditoraddin.glade \
 	&& cp $(DLL) ../../../../../build/bin/. && cp $(DLL).config ../../../../../build/bin/.
 
 assemblydir = $(libdir)/monodevelop/bin
@@ -98,4 +98,4 @@
 CLEANFILES = $(DLL) $(DLL).mdb
 DISTCLEANFILES = $(DLL).config
 
-EXTRA_DIST = $(FILES) $(DLL).config.in
+EXTRA_DIST = $(FILES) $(DLL).config.in EditorBindings.glade texteditoraddin.glade

Copied: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/texteditoraddin.glade (from rev 2099, trunk/MonoDevelop/Core/data/resources/glade/texteditoraddin.glade)

Copied: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade (from rev 2099, trunk/MonoDevelop/Core/data/resources/glade/Base.glade)

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am	2005-01-02 22:31:41 UTC (rev 2103)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am	2005-01-02 22:46:35 UTC (rev 2104)
@@ -386,9 +386,9 @@
 
 all: $(ASSEMBLY)
 
-$(ASSEMBLY): $(build_sources) ../../data/resources/glade/Base.glade
+$(ASSEMBLY): $(build_sources) $(srcdir)/Base.glade
 	$(CSC) $(MONO_POSIX_OEE) -codepage:utf8 /out:$(ASSEMBLY) /target:library $(DLLS) \
-		/resource:$(srcdir)/../../data/resources/glade/Base.glade,Base.glade \
+		/resource:$(srcdir)/Base.glade,Base.glade \
 		$(monodoc_libflags) \
 		$(build_sources) \
 	&& cp $(ASSEMBLY) ../../../build/bin/. \
@@ -403,5 +403,5 @@
 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
 DISTCLEANFILES = $(ASSEMBLY).config
 
-EXTRA_DIST = $(FILES) ./Services/process-icons.pl $(ASSEMBLY).config.in
+EXTRA_DIST = $(FILES) ./Services/process-icons.pl $(ASSEMBLY).config.in Base.glade
 

Copied: trunk/MonoDevelop/Core/src/MonoDevelop.Core/AddIn.xsd (from rev 2099, trunk/MonoDevelop/Core/data/resources/AddIn.xsd)

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Core/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Core/Makefile.am	2005-01-02 22:31:41 UTC (rev 2103)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Core/Makefile.am	2005-01-02 22:46:35 UTC (rev 2104)
@@ -60,7 +60,7 @@
 build_sources = $(addprefix $(srcdir)/, $(FILES)) Services/GettextCatalog.cs
 
 RESOURCES = \
-../../data/resources/AddIn.xsd
+AddIn.xsd
 
 build_resources = $(addprefix $(srcdir)/, $(RESOURCES))
 
@@ -88,5 +88,5 @@
 CLEANFILES = $(DLL) $(DLL).mdb
 DISTCLEANFILES = Services/GettextCatalog.cs
 
-EXTRA_DIST = $(FILES) Services/GettextCatalog.cs.in
+EXTRA_DIST = $(FILES) Services/GettextCatalog.cs.in AddIn.xsd
 

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am	2005-01-02 22:31:41 UTC (rev 2103)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am	2005-01-02 22:46:35 UTC (rev 2104)
@@ -21,7 +21,7 @@
 	$(CSC) /out:$(DLL) \
 		/define:GTK $(REFS) \
 		$(build_sources) \
-		/resource:../../data/resources/SplashScreen.png,SplashScreen.png \
+		/resource:SplashScreen.png,SplashScreen.png \
 	&& cp $(DLL) ../../../build/bin/.
 
 assemblydir = $(libdir)/monodevelop/bin
@@ -29,4 +29,4 @@
 
 CLEANFILES=$(DLL) $(DLL).mdb
 
-EXTRA_DIST = $(FILES)
+EXTRA_DIST = $(FILES) SplashScreen.png

Copied: trunk/MonoDevelop/Core/src/MonoDevelop.Startup/SplashScreen.png (from rev 2099, trunk/MonoDevelop/Core/data/resources/SplashScreen.png)

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2005-01-02 22:31:41 UTC (rev 2103)
+++ trunk/MonoDevelop/configure.in	2005-01-02 22:46:35 UTC (rev 2104)
@@ -193,9 +193,6 @@
 build/AddIns/AddIns/Misc/Makefile
 build/AddIns/AddIns/Misc/StartPage/Makefile
 build/AddIns/AddIns/Misc/Sonata/Makefile
-Core/data/Makefile
-Core/data/resources/Makefile
-Core/data/resources/glade/Makefile
 Core/src/AddIns/DebuggerAddIn/AssemblyInfo.cs
 Core/src/AddIns/DisplayBindings/SourceEditor/AssemblyInfo.cs
 Core/src/AddIns/Misc/StartPage/AssemblyInfo.cs

More information about the Monodevelop-patches-list mailing list