[Monodevelop-patches-list] r2612 - in trunk/MonoDevelop: . Core/src/AddIns/DebuggerAddIn Core/src/AddIns/DisplayBindings/SourceEditor Core/src/AddIns/prj2make-sharp-lib Core/src/MonoDevelop.Base Core/src/MonoDevelop.Gui.Utils Core/src/MonoDevelop.Gui.Widgets Core/src/MonoDevelop.Startup

Raja R Harinath <rharinath@novell.com> raja at mono-cvs.ximian.com
Tue Jun 28 07:24:08 EDT 2005 

Author: raja
Date: 2005-06-28 07:24:08 -0400 (Tue, 28 Jun 2005)
New Revision: 2612

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am
   trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am
   trunk/MonoDevelop/Makefile.include
Log:
In .:
	* Makefile.include (build_sources): Allow Makefiles to define
	GENERATED_FILES that are picked up from builddir.

In Core/src/MonoDevelop.Gui.Widgets:
	* Makefile.am (FILES): Move AssemblyInfo.cs ...
	(GENERATED_FILES): ... here.

In Core/src/MonoDevelop.Base:
	* Makefile.am (FILES): Move AssemblyInfo.cs ...
	(GENERATED_FILES): ... here.

In Core/src/AddIns/DisplayBindings/SourceEditor:
	* Makefile.am (FILES): Move AssemblyInfo.cs ...
	(GENERATED_FILES): ... here.

In Core/src/AddIns/DebuggerAddIn:
	* Makefile.am (DebuggerPaths.cs): Fix for srcdir != builddir.
	($(ADDIN_BUILD)/$(ADDIN)): Likewise.

In Core/src/AddIns/prj2make-sharp-lib:
	* Makefile.am (FILES): Move AssemblyInfo.cs ...
	(GENERATED_FILES): ... here.

In Core/src/MonoDevelop.Startup:
	* Makefile.am (FILES): Move AssemblyInfo.cs ...
	(GENERATED_FILES): ... here.

In Core/src/MonoDevelop.Gui.Utils:
	* Makefile.am (FILES): Move AssemblyInfo.cs ...
	(GENERATED_FILES): ... here.



Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/ChangeLog	2005-06-28 11:24:08 UTC (rev 2612)
@@ -1,3 +1,8 @@
+2005-06-28  Raja R Harinath  <rharinath at novell.com>
+
+	* Makefile.include (build_sources): Allow Makefiles to define
+	GENERATED_FILES that are picked up from builddir.
+
 2005-06-22  Joshua Tauberer  <tauberer at for.net>
 	* configure.in: Added Extras/VersionControl automake files to the
 	  build.

Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog	2005-06-28 11:24:08 UTC (rev 2612)
@@ -1,3 +1,8 @@
+2005-06-28  Raja R Harinath  <rharinath at novell.com>
+
+	* Makefile.am (DebuggerPaths.cs): Fix for srcdir != builddir.
+	($(ADDIN_BUILD)/$(ADDIN)): Likewise.
+
 2005-06-09  Chris Toshok  <toshok at ximian.com>
 
 	* DebuggingService.cs (DebuggingService..ctor): remove the call to

Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am	2005-06-28 11:24:08 UTC (rev 2612)
@@ -31,12 +31,12 @@
 build_sources = $(addprefix $(srcdir)/, $(FILES)) DebuggerPaths.cs
 
 DebuggerPaths.cs: $(srcdir)/DebuggerPaths.cs.in
-	sed -e 's,@''pkglibdir@,$(pkglibdir),g' $(srcdir)/$< > $@.tmp
+	sed -e 's,@''pkglibdir@,$(pkglibdir),g' $(srcdir)/DebuggerPaths.cs.in > $@.tmp
 	mv $@.tmp $@
 
 $(ADDIN_BUILD)/$(ADDIN): $(srcdir)/$(ADDIN)
 	mkdir -p $(ADDIN_BUILD)
-	cp $(ADDIN) $(ADDIN_BUILD)/.
+	cp $(srcdir)/$(ADDIN) $@
 
 $(ASSEMBLY): $(build_sources)
 	mkdir -p $(ADDIN_BUILD)

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-06-28 11:24:08 UTC (rev 2612)
@@ -1,3 +1,8 @@
+2005-06-28  Raja R Harinath  <rharinath at novell.com>
+
+	* Makefile.am (FILES): Move AssemblyInfo.cs ...
+	(GENERATED_FILES): ... here.
+
 2005-06-27  Lluis Sanchez Gual  <lluis at novell.com> 
 
 	* Gui/SourceEditorWidget.cs: Added some imports.

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2005-06-28 11:24:08 UTC (rev 2612)
@@ -3,7 +3,6 @@
 DLL = $(top_builddir)/build/bin/$(DLLNAME)
 
 FILES = \
-AssemblyInfo.cs \
 CodeCompletion/CodeCompletionData.cs \
 CodeCompletion/ICompletionData.cs \
 CodeCompletion/CompletionWindow.cs \
@@ -40,6 +39,9 @@
 Codons/EditActionCodon.cs \
 Services/SourceViewService.cs
 
+GENERATED_FILES = \
+AssemblyInfo.cs
+
 REFS = /r:System.Drawing.dll \
 	/r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	/r:$(top_builddir)/build/bin/MonoDevelop.Base.dll \

Modified: trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/ChangeLog	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/ChangeLog	2005-06-28 11:24:08 UTC (rev 2612)
@@ -1,3 +1,8 @@
+2005-06-28  Raja R Harinath  <rharinath at novell.com>
+
+	* Makefile.am (FILES): Move AssemblyInfo.cs ...
+	(GENERATED_FILES): ... here.
+
 2005-04-25  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* prj2make-sharp-lib.addin.xml:

Modified: trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am	2005-06-28 11:24:08 UTC (rev 2612)
@@ -19,9 +19,11 @@
 sharp_d_cmbx.cs \
 sharp_d_prjx.cs \
 csproj_ver2003.cs \
-AssemblyInfo.cs \
 prj2make-sharp-lib-Commands.cs
-	
+
+GENERATED_FILES = \
+AssemblyInfo.cs
+
 EXTRA_DIST = $(FILES) $(ADDIN)
 
 all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN)

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-06-28 11:24:08 UTC (rev 2612)
@@ -1,3 +1,8 @@
+2005-06-28  Raja R Harinath  <rharinath at novell.com>
+
+	* Makefile.am (FILES): Move AssemblyInfo.cs ...
+	(GENERATED_FILES): ... here.
+
 2005-06-27  Lluis Sanchez Gual  <lluis at novell.com> 
 
 	* Services/ParserService/DefaultParserService.cs: Don't get the current

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am	2005-06-28 11:24:08 UTC (rev 2612)
@@ -489,7 +489,9 @@
 Internal/Serialization/EnumDataType.cs \
 Internal/Serialization/PrimitiveDataType.cs \
 Internal/Serialization/XmlDataSerializer.cs \
-Internal/Serialization/DataSerializer.cs \
+Internal/Serialization/DataSerializer.cs
+
+GENERATED_FILES = \
 AssemblyInfo.cs
 
 OPTIONS = \

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog	2005-06-28 11:24:08 UTC (rev 2612)
@@ -1,3 +1,8 @@
+2005-06-28  Raja R Harinath  <rharinath at novell.com>
+
+	* Makefile.am (FILES): Move AssemblyInfo.cs ...
+	(GENERATED_FILES): ... here.
+
 2005-06-01  John Luke  <john.luke at gmail.com>
 
 	* FileIcons/FileIconLoader.cs: add back one try/catch

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am	2005-06-28 11:24:08 UTC (rev 2612)
@@ -8,7 +8,6 @@
 
 FILES = \
 FileIcons/FileIconLoader.cs \
-AssemblyInfo.cs \
 ReportingStream/ReportingStream.cs \
 DirectoryArchive/Decompressor.cs \
 DirectoryArchive/TarDecompressor.cs \
@@ -16,6 +15,9 @@
 DirectoryArchive/Bz2Support.cs \
 DirectoryArchive/GzSupport.cs
 
+GENERATED_FILES = \
+AssemblyInfo.cs
+
 all: $(DLL)
 
 $(DLL): $(build_sources)

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog	2005-06-28 11:24:08 UTC (rev 2612)
@@ -1,3 +1,8 @@
+2005-06-28  Raja R Harinath  <rharinath at novell.com>
+
+	* Makefile.am (FILES): Move AssemblyInfo.cs ...
+	(GENERATED_FILES): ... here.
+
 2005-06-09  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* DockToolbars/*: Docking toolbars!

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am	2005-06-28 11:24:08 UTC (rev 2612)
@@ -13,7 +13,6 @@
 Tree/TreeNodeCollection.cs \
 Tree/TreeNode.cs \
 IconView/IconView.cs \
-AssemblyInfo.cs \
 FileBrowser/FileBrowser.cs \
 FileSelector/FileSelector.cs \
 FolderDialog/FolderDialog.cs \
@@ -68,6 +67,8 @@
 DockToolbars/IDockBar.cs \
 DockToolbars/PlaceholderWindow.cs
 
+GENERATED_FILES = \
+AssemblyInfo.cs
 
 all: $(DLL)
 
@@ -76,7 +77,7 @@
 
 assemblydir = $(MD_ASSEMBLY_DIR)
 assembly_DATA = $(DLL)
-  
+
 CLEANFILES = $(DLL) $(DLL).mdb
 
 EXTRA_DIST = $(FILES)

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog	2005-06-28 11:24:08 UTC (rev 2612)
@@ -1,3 +1,8 @@
+2005-06-28  Raja R Harinath  <rharinath at novell.com>
+
+	* Makefile.am (FILES): Move AssemblyInfo.cs ...
+	(GENERATED_FILES): ... here.
+
 2005-04-17  John Luke  <john.luke at gmail.com>
 
 	* Makefile.am: fix distcheck

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am	2005-06-28 11:24:08 UTC (rev 2612)
@@ -5,7 +5,9 @@
 FILES= \
 MonoDevelopMain.cs \
 MonoDevelopOptions.cs \
-Dialogs/AddInTreeSettingsHandler.cs \
+Dialogs/AddInTreeSettingsHandler.cs
+
+GENERATED_FILES = \
 AssemblyInfo.cs
 
 all: $(ASSEMBLY $(ASSEMBLY).config

Modified: trunk/MonoDevelop/Makefile.include
===================================================================
--- trunk/MonoDevelop/Makefile.include	2005-06-28 02:42:15 UTC (rev 2611)
+++ trunk/MonoDevelop/Makefile.include	2005-06-28 11:24:08 UTC (rev 2612)
@@ -1,3 +1,3 @@
 
-build_sources = $(addprefix $(srcdir)/, $(FILES))
+build_sources = $(addprefix $(srcdir)/, $(FILES)) $(GENERATED_FILES)

More information about the Monodevelop-patches-list mailing list