# HG changeset patch
# User Martin Kobetic
# Date 1384665798 18000
# Node ID bd6be28aa9245abe70c632868a949d018db73613
# Parent  32fad449edbf8a7c91464cc2686710390415b738# Parent  69496d69c4b5bc0cf7337d7b65278f025b400a87
merging

diff -r 32fad449edbf -r bd6be28aa924 transforms/Make.proto
--- a/transforms/Make.proto	Sun Nov 17 00:22:51 2013 -0500
+++ b/transforms/Make.proto	Sun Nov 17 00:23:18 2013 -0500
@@ -21,7 +21,7 @@
 INCLUDE_TOP=$(TOP)/..
 
 # subdirectories where targets are to be made:
-SUBDIRS=
+SUBDIRS= tests
 
 
 # subdirectories where Makefiles are to be made:
@@ -125,12 +125,8 @@
 prereq:
 	cd ../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../support && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../core && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../terminals && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 
 
diff -r 32fad449edbf -r bd6be28aa924 transforms/bc.mak
--- a/transforms/bc.mak	Sun Nov 17 00:22:51 2013 -0500
+++ b/transforms/bc.mak	Sun Nov 17 00:23:18 2013 -0500
@@ -52,12 +52,8 @@
 prereq:
 	pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\support & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\core & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\terminals & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 
diff -r 32fad449edbf -r bd6be28aa924 transforms/bmake.bat
--- a/transforms/bmake.bat	Sun Nov 17 00:22:51 2013 -0500
+++ b/transforms/bmake.bat	Sun Nov 17 00:23:18 2013 -0500
@@ -9,4 +9,11 @@
 @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
 make.exe -N -f bc.mak  %DEFINES% %*
 
+@echo "***********************************"
+@echo "Buildung stx/goodies/xtreams/transforms/tests
+@echo "***********************************"
+@cd tests
+@call bmake %1 %2
+@cd ..
 
+
diff -r 32fad449edbf -r bd6be28aa924 transforms/extensions.st
--- a/transforms/extensions.st	Sun Nov 17 00:22:51 2013 -0500
+++ b/transforms/extensions.st	Sun Nov 17 00:23:18 2013 -0500
@@ -369,20 +369,6 @@
 
 !Xtreams::WriteStream methodsFor:'transforming'!
 
-buffering: bufferSize
-	"Delays committing its content to its underlying stream until it has reached a certain size ,#flush is sent, or the stream is closed."
-	"       bufferSize      <Integer> The size of the buffer to start with.
-		^<PositionWriteStream>"
-	"
-		(ByteArray new writing buffering: 5)
-			write: (ByteArray withAll: (1 to: 11));
-			conclusion
-	"
-	^BufferedWriteStream on: self bufferSize: bufferSize
-! !
-
-!Xtreams::WriteStream methodsFor:'transforming'!
-
 collecting: aBlock
 	"Transform each written element using #collect: style block."
 	"	aBlock	<BlockClosure>	a #collect: style block used to tranform each element
@@ -735,4 +721,4 @@
 extensionsVersion_HG
 
     ^ '$Changeset: <not expanded> $'
-! !
\ No newline at end of file
+! !
diff -r 32fad449edbf -r bd6be28aa924 transforms/lccmake.bat
--- a/transforms/lccmake.bat	Sun Nov 17 00:22:51 2013 -0500
+++ b/transforms/lccmake.bat	Sun Nov 17 00:23:18 2013 -0500
@@ -5,4 +5,11 @@
 @REM -------
 make.exe -N -f bc.mak -DUSELCC=1 %*
 
+@echo "***********************************"
+@echo "Buildung stx/goodies/xtreams/transforms/tests
+@echo "***********************************"
+@cd tests
+@call lccmake %1 %2
+@cd ..
 
+
diff -r 32fad449edbf -r bd6be28aa924 transforms/mingwmake.bat
--- a/transforms/mingwmake.bat	Sun Nov 17 00:22:51 2013 -0500
+++ b/transforms/mingwmake.bat	Sun Nov 17 00:23:18 2013 -0500
@@ -13,4 +13,11 @@
 @popd
 make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
+@echo "***********************************"
+@echo "Buildung stx/goodies/xtreams/transforms/tests
+@echo "***********************************"
+@cd tests
+@call mingwmake %1 %2
+@cd ..
 
+
diff -r 32fad449edbf -r bd6be28aa924 transforms/stx_goodies_xtreams_transforms.st
--- a/transforms/stx_goodies_xtreams_transforms.st	Sun Nov 17 00:22:51 2013 -0500
+++ b/transforms/stx_goodies_xtreams_transforms.st	Sun Nov 17 00:23:18 2013 -0500
@@ -179,6 +179,21 @@
     )
 !
 
+mandatoryPreRequisites
+    "list all required mandatory packages.
+     Packages are mandatory, if they contain superclasses of the package's classes
+     or classes which are extended by this package.
+     This list can be maintained manually or (better) generated and
+     updated by scanning the superclass hierarchies
+     (the browser has a menu function for that)"
+
+    ^ #(
+        #'stx:goodies/xtreams/core'    "Xtreams::ReadStream - extended "
+        #'stx:goodies/xtreams/support'    "Xtreams::Encoder - superclass of Xtreams::ASCIIEncoder "
+        #'stx:libbasic'    "LibraryDefinition - superclass of stx_goodies_xtreams_transforms "
+    )
+!
+
 preRequisites
     "list all required packages.
      This list can be maintained manually or (better) generated and
@@ -194,6 +209,30 @@
         #'stx:libbasic'    "ProjectDefinition - superclass of stx_goodies_xtreams_transforms "
         #'stx:libbasic2'    "IntegerArray - referenced by Xtreams::MessagePackMarshaler>>initializeMarshaling "
     )
+!
+
+referencedPreRequisites
+    "list all packages containing classes referenced by the packages's members.
+     This list can be maintained manually or (better) generated and
+     updated by looking for global variable accesses
+     (the browser has a menu function for that)
+     However, often too much is found, and you may want to explicitely
+     exclude individual packages in the #excludedFromPreRequisites method."
+
+    ^ #(
+        #'stx:libbasic2'    "IntegerArray - referenced by Xtreams::MessagePackMarshaler>>initializeMarshaling "
+    )
+!
+
+subProjects
+    "list packages which are known as subprojects.
+     The generated makefile will enter those and make there as well.
+     However: they are not forced to be loaded when a package is loaded;
+     for those, redefine requiredPrerequisites"
+
+    ^ #(
+        #'stx:goodies/xtreams/transforms/tests'
+    )
 ! !
 
 !stx_goodies_xtreams_transforms class methodsFor:'description - contents'!
@@ -271,7 +310,6 @@
         #'Xtreams::WriteStream' selecting:
         #'Xtreams::WriteStream' transforming:
         #'Xtreams::ReadStream' positioning
-        #'Xtreams::WriteStream' buffering:
         #'Xtreams::WriteStream' positioning
     )
 ! !
diff -r 32fad449edbf -r bd6be28aa924 transforms/transforms.rc
--- a/transforms/transforms.rc	Sun Nov 17 00:22:51 2013 -0500
+++ b/transforms/transforms.rc	Sun Nov 17 00:23:18 2013 -0500
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright 2010-2013 Cincom Systems, Martin Kobetic and Michael Lucas-Smith\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.957\0"
-      VALUE "ProductDate", "Sun, 17 Nov 2013 05:02:59 GMT\0"
+      VALUE "ProductDate", "Sun, 17 Nov 2013 05:08:00 GMT\0"
     END
 
   END
diff -r 32fad449edbf -r bd6be28aa924 transforms/vcmake.bat
--- a/transforms/vcmake.bat	Sun Nov 17 00:22:51 2013 -0500
+++ b/transforms/vcmake.bat	Sun Nov 17 00:23:18 2013 -0500
@@ -17,4 +17,11 @@
 
 
 
+@echo "***********************************"
+@echo "Buildung stx/goodies/xtreams/transforms/tests
+@echo "***********************************"
+@cd tests
+@call vcmake %1 %2
+@cd ..
 
+