--- a/terminals/tests/bc.mak	Fri Mar 15 19:17:42 2013 -0400
+++ b/terminals/tests/bc.mak	Fri Mar 15 19:39:10 2013 -0400
@@ -1,20 +1,21 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_goodies_xtreams_terminals_tests at 2012-01-30 17:29:44.448.
+# automagically generated from the projectDefinition: stx_goodies_xtreams_terminals_tests.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
 #
-# This file contains make rules for the win32 platform (using borland-bcc or visual-c).
+# Notice, that the name bc.mak is historical (from times, when only borland c was supported).
+# This file contains make rules for the win32 platform using either borland-bcc or visual-c.
 # It shares common definitions with the unix-make in Make.spec.
-# The nt.mak supports the following targets:
+# The bc.mak supports the following targets:
 #    bmake         - compile all st-files to a classLib (dll)
 #    bmake clean   - clean all temp files
 #    bmake clobber - clean all
 #
 # Historic Note:
-#  this used to contain only rules to make with borland 
+#  this used to contain only rules to make with borland
 #    (called via bmake, by "make.exe -f bc.mak")
 #  this has changed; it is now also possible to build using microsoft visual c
 #    (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
@@ -29,11 +30,11 @@
 !INCLUDE Make.spec
 
 LIBNAME=libstx_goodies_xtreams_terminals_tests
-RESFILES=tests.res
+RESFILES=tests.$(RES)
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\xtreams\core\tests -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\goodies\xtreams\core -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\goodies\xtreams\core\tests -I$(INCLUDE_TOP)\stx\goodies\xtreams\core -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\goodies\xtreams\support -I$(INCLUDE_TOP)\stx\goodies\sunit
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -50,20 +51,49 @@
 # build all prerequisite packages for this package
 prereq:
 	pushd ..\..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\support & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\core & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\substreams & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\core\tests & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\..\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
 
 
 
 
 
+test: $(TOP)\goodies\builder\reports\NUL
+	pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
+	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
+        
+clean::
+	del *.$(CSUFFIX)
+
+
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)Xtreams__BlockClosureReadingWritingTest.$(O) Xtreams__BlockClosureReadingWritingTest.$(H): Xtreams__BlockClosureReadingWritingTest.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__FiniteReadingWritingTests.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__ReadingWritingTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__BlockClosureTest.$(O) Xtreams__BlockClosureTest.$(H): Xtreams__BlockClosureTest.st $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__BufferReadingWritingTest.$(O) Xtreams__BufferReadingWritingTest.$(H): Xtreams__BufferReadingWritingTest.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__FiniteReadingWritingTests.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__ReadingWritingTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__BufferedWriteStreamTest.$(O) Xtreams__BufferedWriteStreamTest.$(H): Xtreams__BufferedWriteStreamTest.st $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__CollectionReadingWritingTest.$(O) Xtreams__CollectionReadingWritingTest.$(H): Xtreams__CollectionReadingWritingTest.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__FiniteReadingWritingTests.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__ReadingWritingTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__ElasticBufferReadingWritingTest.$(O) Xtreams__ElasticBufferReadingWritingTest.$(H): Xtreams__ElasticBufferReadingWritingTest.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__FiniteReadingWritingTests.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__ReadingWritingTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__FileReadingWritingTest.$(O) Xtreams__FileReadingWritingTest.$(H): Xtreams__FileReadingWritingTest.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\XtreamsPool.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__FiniteReadingWritingTests.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__ReadingWritingTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__PipeReadingWritingTest.$(O) Xtreams__PipeReadingWritingTest.$(H): Xtreams__PipeReadingWritingTest.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\XtreamsPool.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__FiniteReadingWritingTests.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__ReadingWritingTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__RingBufferReadingWritingTest.$(O) Xtreams__RingBufferReadingWritingTest.$(H): Xtreams__RingBufferReadingWritingTest.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__FiniteReadingWritingTests.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__ReadingWritingTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__SocketReadingWritingTest.$(O) Xtreams__SocketReadingWritingTest.$(H): Xtreams__SocketReadingWritingTest.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\XtreamsPool.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__FiniteReadingWritingTests.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\tests\Xtreams__ReadingWritingTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)stx_goodies_xtreams_terminals_tests.$(O) stx_goodies_xtreams_terminals_tests.$(H): stx_goodies_xtreams_terminals_tests.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
+
+# **Must be at end**
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+!IFDEF HGROOT
+$(OUTDIR)stx_goodies_xtreams_terminals_tests.$(O): $(HGROOT)\.hg\dirstate
+!ENDIF