beagle r4626 - in trunk/beagle/BeagleClient: . generated

[dbera svn gnome org]

Author: dbera
Date: Fri Mar 21 01:07:24 2008
New Revision: 4626
URL: http://svn.gnome.org/viewvc/beagle?rev=4626&view=rev

Log:
Explicitly add the types that need to be serialized.


Modified:
   trunk/beagle/BeagleClient/Makefile.am
   trunk/beagle/BeagleClient/generated/Makefile

Modified: trunk/beagle/BeagleClient/Makefile.am
==============================================================================
--- trunk/beagle/BeagleClient/Makefile.am	(original)
+++ trunk/beagle/BeagleClient/Makefile.am	Fri Mar 21 01:07:24 2008
@@ -58,6 +58,10 @@
 
 $(TARGET): $(CSFILES) $(LOCAL_ASSEMBLIES) $(RESOURCES) $(GENERATED_TARGET)
 	$(CSC) -out:$@ $(CSFLAGS) $(CSFILES) $(ASSEMBLIES) $(RESOURCES) $(GENERATED_DIR)/*.cs
+	@echo ""
+	@echo "WARNING! Keep an eye on the warning messages."
+	@echo "If some methods of the generated files are unused, make sure they only relate to writing of Enum variables."
+	@echo "Make sure all the required types have their serializer generated."
 
 all: $(TARGET)
 

Modified: trunk/beagle/BeagleClient/generated/Makefile
==============================================================================
--- trunk/beagle/BeagleClient/generated/Makefile	(original)
+++ trunk/beagle/BeagleClient/generated/Makefile	Fri Mar 21 01:07:24 2008
@@ -1,13 +1,38 @@
 GENERATED_TARGET = $(DUMMY_TARGET:%.dll=%.XmlSerializers.dll)
 
+TYPES =						\
+	Beagle.CountMatchQuery			\
+	Beagle.DaemonInformationRequest		\
+	Beagle.IndexingServiceRequest		\
+	Beagle.InformationalMessagesRequest	\
+	Beagle.OptimizeIndexesRequest		\
+	Beagle.Query				\
+	Beagle.ReloadConfigRequest		\
+	Beagle.ShutdownRequest			\
+	Beagle.SnippetRequest			\
+	Beagle.EmptyResponse			\
+	Beagle.ErrorResponse			\
+	Beagle.FinishedResponse			\
+	Beagle.HitsAddedResponse		\
+	Beagle.HitsSubtractedResponse		\
+	Beagle.IndexingStatusResponse		\
+	Beagle.SearchTermResponse		\
+	Beagle.DaemonInformationResponse	\
+	Beagle.SnippetResponse			\
+	Beagle.CountMatchQueryResponse		\
+	Beagle.Hit				\
+	Beagle.Indexable
+
+TYPES_SGEN_PARAMS = $(TYPES:%=--type:%)
+
 all:
 	@echo "Generating serializer files"
 	@rm -rf *.cs *.dll *.mdb
-	MONO_PATH=../../Util mono ../../Util/sgen.exe ../$(DUMMY_TARGET) --debug --keep --out:.
+	MONO_PATH=../../Util mono ../../Util/sgen.exe ../$(DUMMY_TARGET) $(TYPES_SGEN_PARAMS) --debug --keep --out:.
 	@test -f $(GENERATED_TARGET) \
 		|| { \
 			echo "ERROR in generating serializer assembly." ; \
-			echo "Run manually \"MONO_PATH=../../Util mono ../../Util/sgen.exe ../$(DUMMY_TARGET) --debug --keep --out:. \"."; \
+			echo "Run manually \"MONO_PATH=../../Util mono ../../Util/sgen.exe ../$(DUMMY_TARGET) $(TYPES_SGEN_PARAMS) --debug --keep --out:. \"."; \
 			exit 1; \
 		}
 	@echo "Patching generated file to change the namespace."