--- a/terminals/extensions.st Mon Nov 21 06:02:29 2011 +0000
+++ b/terminals/extensions.st Mon Nov 21 06:03:03 2011 +0000
@@ -133,3 +133,8 @@
"
^BufferedWriteStream on: self bufferSize: bufferSize
! !
+!stx_goodies_xtreams_terminals class methodsFor:'documentation'!
+
+extensionsVersion_SVN
+ ^ '$Id$'
+! !
--- a/terminals/stx_goodies_xtreams_terminals.st Mon Nov 21 06:02:29 2011 +0000
+++ b/terminals/stx_goodies_xtreams_terminals.st Mon Nov 21 06:03:03 2011 +0000
@@ -27,9 +27,12 @@
exclude individual packages in the #excludedFromPrerequisites method."
^ #(
- #'stx:goodies/xtreams/core' "Xtreams::WriteStream - superclass of Xtreams::SequenceableCollectionWriteStream "
- #'stx:libbasic' "Object - superclass of Xtreams::BufferReadStream "
+ #'stx:goodies/xtreams/core' "Xtreams::ReadStream - superclass of Xtreams::BlockClosureReadStream "
+ #'stx:libbasic' "NonPositionableExternalStream - superclass of extended Socket "
+ #'stx:libbasic2' "Queue - superclass of extended SharedQueue "
#'stx:libcompat' "IOAccessor - referenced by Filename>>reading "
+ #'stx:libview' "GraphicsContext - superclass of extended View "
+ #'stx:libwidg' "TextView - superclass of extended TextCollector "
)
! !
--- a/terminals/tests/Make.proto Mon Nov 21 06:02:29 2011 +0000
+++ b/terminals/tests/Make.proto Mon Nov 21 06:03:03 2011 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_goodies_xtreams_terminals_tests.
+# automagically generated from the projectDefinition: stx_goodies_xtreams_terminals_tests at 2011-11-21 00:52:34.713.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -68,14 +68,18 @@
update-svn-revision:
- if [ ! -r .svnversion -o "$(shell svnversion -n)" != "$(shell cat .svnversion)" ]; then \
- svnversion -n > .svnversion; \
- sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"'$(shell svnversion -n)'\"\$$\"/g" \
- stx_goodies_xtreams_terminals_tests.st; \
+ if [ -d .svn ]; then \
+ if [ ! -r .svnversion -o "$(shell svnversion -n)" != "$(shell cat .svnversion)" ]; then \
+ svnversion -n > .svnversion; \
+ sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"'$(shell svnversion -n)'\"\$$\"/g" \
+ stx_goodies_xtreams_terminals_tests.st; \
+ fi \
fi
.PHONY: update-svn-revision
+
+
# add more install actions here
install::
@@ -113,6 +117,7 @@
cleanjunk::
+ -rm -f *.s *.s2
clean::
-rm -f *.o *.H
@@ -122,6 +127,7 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)Xtreams__stx_goodies_xtreams_terminals_tests.$(O) Xtreams__stx_goodies_xtreams_terminals_tests.$(H): Xtreams__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)
$(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
--- a/terminals/tests/Make.spec Mon Nov 21 06:02:29 2011 +0000
+++ b/terminals/tests/Make.spec Mon Nov 21 06:03:03 2011 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_goodies_xtreams_terminals_tests.
+# automagically generated from the projectDefinition: stx_goodies_xtreams_terminals_tests at 2011-11-21 00:52:34.705.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -51,12 +51,14 @@
COMMON_CLASSES= \
stx_goodies_xtreams_terminals_tests \
+ Xtreams::stx_goodies_xtreams_terminals_tests \
COMMON_OBJS= \
$(OUTDIR)stx_goodies_xtreams_terminals_tests.$(O) \
+ $(OUTDIR)Xtreams__stx_goodies_xtreams_terminals_tests.$(O) \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/terminals/tests/Xtreams__stx_goodies_xtreams_terminals_tests.st Mon Nov 21 06:03:03 2011 +0000
@@ -0,0 +1,130 @@
+"{ Package: 'stx:goodies/xtreams/terminals/tests' }"
+
+"{ NameSpace: Xtreams }"
+
+LibraryDefinition subclass:#stx_goodies_xtreams_terminals_tests
+ instanceVariableNames:''
+ classVariableNames:''
+ poolDictionaries:''
+ category:'* Projects & Packages *'
+!
+
+
+!stx_goodies_xtreams_terminals_tests class methodsFor:'description'!
+
+excludedFromPreRequisites
+ "list all packages which should be ignored in the automatic
+ preRequisites scan. See #preRequisites for more."
+
+ ^ #(
+ )
+!
+
+preRequisites
+ "list all required packages.
+ This list can be maintained manually or (better) generated and
+ updated by scanning the superclass hierarchies and looking for
+ global variable accesses. (the browser has a menu function for that)
+ Howevery, often too much is found, and you may want to explicitely
+ exclude individual packages in the #excludedFromPrerequisites method."
+
+ ^ #(
+ #'stx:goodies/sunit' "TestAsserter - superclass of Xtreams::ElasticBufferReadingWritingTest "
+ #'stx:goodies/xtreams/core' "Xtreams::Incomplete - referenced by Xtreams::PointerReadStreamTest>>testReadingChars "
+ #'stx:goodies/xtreams/core/tests' "Xtreams::ReadingWritingTest - superclass of Xtreams::BufferReadingWritingTest "
+ #'stx:libbasic' "Object - superclass of stx_goodies_xtreams_terminals_tests "
+ #'stx:libbasic2' "SharedQueue - referenced by Xtreams::SharedQueueReadingWritingTest>>setUp "
+ )
+! !
+
+!stx_goodies_xtreams_terminals_tests class methodsFor:'description - contents'!
+
+classNamesAndAttributes
+ "lists the classes which are to be included in the project.
+ Each entry in the list may be: a single class-name (symbol),
+ or an array-literal consisting of class name and attributes.
+ Attributes are: #autoload or #<os> where os is one of win32, unix,..."
+
+ ^ #(
+ "<className> or (<className> attributes...) in load order"
+ (#'Xtreams::BlockClosureReadingWritingTest' autoload)
+ (#'Xtreams::BlockClosureTest' autoload)
+ (#'Xtreams::BufferReadingWritingTest' autoload)
+ (#'Xtreams::BufferedWriteStreamTest' autoload)
+ (#'Xtreams::CollectionReadingWritingTest' autoload)
+ (#'Xtreams::ElasticBufferReadingWritingTest' autoload)
+ (#'Xtreams::FileReadingWritingTest' autoload)
+ (#'Xtreams::PipeReadingWritingTest' autoload)
+ (#'Xtreams::PointerReadStreamTest' autoload)
+ (#'Xtreams::PointerReadingWritingTest' autoload)
+ (#'Xtreams::PointerWriteStreamTest' autoload)
+ (#'Xtreams::RingBufferReadingWritingTest' autoload)
+ (#'Xtreams::SharedQueueReadingWritingTest' autoload)
+ (#'Xtreams::SocketReadingWritingTest' autoload)
+ #'stx_goodies_xtreams_terminals_tests'
+ )
+!
+
+extensionMethodNames
+ "lists the extension methods which are to be included in the project.
+ Entries are 2-element array literals, consisting of class-name and selector."
+
+ ^ #(
+ )
+! !
+
+!stx_goodies_xtreams_terminals_tests class methodsFor:'description - project information'!
+
+applicationIconFileName
+ "Return the name (without suffix) of an icon-file (the app's icon); will be included in the rc-resource file"
+
+ ^ nil
+ "/ ^ self applicationName
+!
+
+companyName
+ "Return a companyname which will appear in <lib>.rc"
+
+ ^ 'eXept Software AG'
+!
+
+description
+ "Return a description string which will appear in vc.def / bc.def"
+
+ ^ 'Smalltalk/X Class library'
+!
+
+legalCopyright
+ "Return a copyright string which will appear in <lib>.rc"
+
+ ^ 'Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011'
+!
+
+productName
+ "Return a product name which will appear in <lib>.rc"
+
+ ^ 'Smalltalk/X'
+! !
+
+!stx_goodies_xtreams_terminals_tests class methodsFor:'description - svn'!
+
+svnRepositoryUrlString
+ "Return a SVN repository URL of myself.
+ (Generated since 2011-04-08)
+ "
+
+ ^ '$URL$'
+!
+
+svnRevisionNr
+ "Return a SVN revision number of myself.
+ This number is updated after a commit"
+
+ ^ "$SVN-Revision:"'nil'"$"
+! !
+
+!stx_goodies_xtreams_terminals_tests class methodsFor:'documentation'!
+
+version_SVN
+ ^ '$Id$'
+! !
--- a/terminals/tests/abbrev.stc Mon Nov 21 06:02:29 2011 +0000
+++ b/terminals/tests/abbrev.stc Mon Nov 21 06:03:03 2011 +0000
@@ -1,3 +1,4 @@
+stx_goodies_xtreams_terminals_tests stx_goodies_xtreams_terminals_tests stx:goodies/xtreams/terminals/tests '* Projects & Packages *' 3
Xtreams::BlockClosureReadingWritingTest Xtreams__BlockClosureReadingWritingTest stx:goodies/xtreams/terminals/tests 'Xtreams' 1
Xtreams::BlockClosureTest Xtreams__BlockClosureTest stx:goodies/xtreams/terminals/tests 'Xtreams' 1
Xtreams::BufferReadingWritingTest Xtreams__BufferReadingWritingTest stx:goodies/xtreams/terminals/tests 'Xtreams' 1
@@ -12,4 +13,4 @@
Xtreams::RingBufferReadingWritingTest Xtreams__RingBufferReadingWritingTest stx:goodies/xtreams/terminals/tests 'Xtreams' 1
Xtreams::SharedQueueReadingWritingTest Xtreams__SharedQueueReadingWritingTest stx:goodies/xtreams/terminals/tests 'Xtreams' 1
Xtreams::SocketReadingWritingTest Xtreams__SocketReadingWritingTest stx:goodies/xtreams/terminals/tests 'Xtreams' 1
-stx_goodies_xtreams_terminals_tests stx_goodies_xtreams_terminals_tests stx:goodies/xtreams/terminals/tests '* Projects & Packages *' 3
+Xtreams::stx_goodies_xtreams_terminals_tests Xtreams__stx_goodies_xtreams_terminals_tests stx:goodies/xtreams/terminals/tests '* Projects & Packages *' 3
--- a/terminals/tests/bc.mak Mon Nov 21 06:02:29 2011 +0000
+++ b/terminals/tests/bc.mak Mon Nov 21 06:03:03 2011 +0000
@@ -1,18 +1,23 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_goodies_xtreams_terminals_tests.
+# automagically generated from the projectDefinition: stx_goodies_xtreams_terminals_tests at 2011-11-21 00:52:34.720.
#
# 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).
+# This file contains make rules for the win32 platform (using borland-bcc or visual-c).
# It shares common definitions with the unix-make in Make.spec.
# The nt.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
+# (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")
#
TOP=..\..\..\..
INCLUDE_TOP=$(TOP)\..
@@ -68,7 +73,9 @@
+
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)Xtreams__stx_goodies_xtreams_terminals_tests.$(O) Xtreams__stx_goodies_xtreams_terminals_tests.$(H): Xtreams__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)
$(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
--- a/terminals/tests/bmake.bat Mon Nov 21 06:02:29 2011 +0000
+++ b/terminals/tests/bmake.bat Mon Nov 21 06:03:03 2011 +0000
@@ -3,6 +3,6 @@
@REM type bmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak %1 %2
+make.exe -N -f bc.mak %*
--- a/terminals/tests/libInit.cc Mon Nov 21 06:02:29 2011 +0000
+++ b/terminals/tests/libInit.cc Mon Nov 21 06:03:03 2011 +0000
@@ -27,6 +27,7 @@
void _libstx_goodies_xtreams_terminals_tests_Init(pass, __pRT__, snd)
OBJ snd; struct __vmData__ *__pRT__; {
__BEGIN_PACKAGE2__("libstx_goodies_xtreams_terminals_tests", _libstx_goodies_xtreams_terminals_tests_Init, "stx:goodies/xtreams/terminals/tests");
+_Xtreams__stx_137goodies_137xtreams_137terminals_137tests_Init(pass,__pRT__,snd);
_stx_137goodies_137xtreams_137terminals_137tests_Init(pass,__pRT__,snd);
--- a/terminals/tests/tests.rc Mon Nov 21 06:02:29 2011 +0000
+++ b/terminals/tests/tests.rc Mon Nov 21 06:03:03 2011 +0000
@@ -3,13 +3,15 @@
// automagically generated from the projectDefinition: stx_goodies_xtreams_terminals_tests.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,0,1
+ FILEVERSION 6,2,10,10
PRODUCTVERSION 6,2,1,1
+#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE VS_USER_DEFINED
+#endif
BEGIN
BLOCK "StringFileInfo"
@@ -18,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
- VALUE "FileVersion", "6.2.0.1\0"
+ VALUE "FileVersion", "6.2.10.10\0"
VALUE "InternalName", "stx:goodies/xtreams/terminals/tests\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.1.1\0"
- VALUE "ProductDate", "Mon, 22 Aug 2011 16:03:17 GMT\0"
+ VALUE "ProductDate", "Mon, 21 Nov 2011 05:52:34 GMT\0"
END
END
--- a/terminals/tests/vcmake.bat Mon Nov 21 06:02:29 2011 +0000
+++ b/terminals/tests/vcmake.bat Mon Nov 21 06:03:03 2011 +0000
@@ -3,6 +3,10 @@
@REM type vcmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak -DUSEVC %1 %2
+
+@if not defined VSINSTALLDIR (
+ call "C:\Program Files\Microsoft Visual Studio 10.0"\VC\bin\vcvars32.bat
+)
+make.exe -N -f bc.mak -DUSEVC %*