[Csp-commits] svn:csp r1083 - in trunk/CSP/SimData: . Include/SimData SimData/Tests

[<sv...@ww...>]

Author: mkrose
Date: 2004-06-27 17:43:19 -0700 (Sun, 27 Jun 2004)
New Revision: 1083

Modified:
   trunk/CSP/SimData/CHANGES.current
   trunk/CSP/SimData/Include/SimData/TaggedRecord.h
   trunk/CSP/SimData/Makefile
   trunk/CSP/SimData/SimData/Tests/Makefile
Log:
Small fixes to the main makefile and the unit test makefile.
Small fixes to TaggedRecord.h

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1083

Modified: trunk/CSP/SimData/CHANGES.current
===================================================================
--- trunk/CSP/SimData/CHANGES.current	2004-06-28 00:38:49 UTC (rev 1082)
+++ trunk/CSP/SimData/CHANGES.current	2004-06-28 00:43:19 UTC (rev 1083)
@@ -9,6 +9,10 @@
   * Clean up base class construction of ThreadLog, removing suspect
     references to 'this' in ctor initializer list.
 
+  * Small fixes to the main makefile and the unit test makefile.
+
+  * Small fixes to TaggedRecord.h
+
 2004-06-26: onsight
   * Remove superflous logging in interface registry, and suppress
     swig warnings.

Modified: trunk/CSP/SimData/Include/SimData/TaggedRecord.h
===================================================================
--- trunk/CSP/SimData/Include/SimData/TaggedRecord.h	2004-06-28 00:38:49 UTC (rev 1082)
+++ trunk/CSP/SimData/Include/SimData/TaggedRecord.h	2004-06-28 00:43:19 UTC (rev 1083)
@@ -127,7 +127,7 @@
 		_buffer.append(x);
 		return *this;
 	}
-	std::string str() const {
+	std::string const & str() const {
 		return _buffer;
 	}
 };
@@ -327,6 +327,7 @@
  */
 class TaggedRecord: public Referenced {
 public:
+	typedef Ref<TaggedRecord> Ref;
 	typedef int64 Id;
 	virtual void serialize(TagReader &reader) = 0;
 	virtual void serialize(TagWriter &writer) const = 0;

Modified: trunk/CSP/SimData/Makefile
===================================================================
--- trunk/CSP/SimData/Makefile	2004-06-28 00:38:49 UTC (rev 1082)
+++ trunk/CSP/SimData/Makefile	2004-06-28 00:43:19 UTC (rev 1083)
@@ -1,6 +1,6 @@
 SUBDIRS = Source 
 
-export PYTHON_INCLUDE := $(shell python setup.py python_include_path)
+export PYTHON_INCLUDE = $(shell python setup.py python_include_path)
 export GSWOPTS = $(shell python setup.py swigopts)
 export GLDOPTS = $(shell python setup.py ldopts)
 
@@ -32,7 +32,7 @@
 
 tests:
 	@$(MAKE) --no-print-directory -C SimData/Tests all
-	python SimData/Tests/RunTests.py
+	@SIMDATA_LOGFILE=SimData/Tests/.testlog python SimData/Tests/RunTests.py
 
 tests-clean:
 	@$(MAKE) --no-print-directory -C SimData/Tests clean

Modified: trunk/CSP/SimData/SimData/Tests/Makefile
===================================================================
--- trunk/CSP/SimData/SimData/Tests/Makefile	2004-06-28 00:38:49 UTC (rev 1082)
+++ trunk/CSP/SimData/SimData/Tests/Makefile	2004-06-28 00:43:19 UTC (rev 1083)
@@ -46,7 +46,7 @@
 %: %.cpp 
 	@echo -n "Building $@..."
 	@for foo in a; do \
-		$(CXX) -o $@ $(CFLAGS) $(@:=.cpp) -L$(TOPDIR)/SimData -lSimData 2>.buildlog 1>/dev/null; \
+		$(CXX) -o $@ $(CFLAGS) $(@:=.cpp) -L$(TOPDIR)/SimData -lSimData -lpthread 2>.buildlog 1>/dev/null; \
 		if [ $$? = "0" ]; then echo "ok"; else echo "failed!"; exit 1; fi; \
 	done
 	$