--- a/transforms/Make.proto Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/Make.proto Wed Feb 01 00:34:28 2012 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_goodies_xtreams_transforms.
+# automagically generated from the projectDefinition: stx_goodies_xtreams_transforms at 2012-02-01 00:34:32.532.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/goodies/xtreams/core -I$(INCLUDE_TOP)/stx/libcompat -I$(INCLUDE_TOP)/stx/goodies/xtreams/substreams -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/goodies/xtreams/support
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/goodies/xtreams/core -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/goodies/xtreams/support -I$(INCLUDE_TOP)/stx/goodies/xtreams/terminals
# if you need any additional defines for embedded C code,
@@ -44,7 +44,7 @@
LOCALDEFINES=
LIBNAME=libstx_goodies_xtreams_transforms
-STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -H. -varPrefix=$(LIBNAME)
+STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=. -varPrefix=$(LIBNAME)
# ********** OPTIONAL: MODIFY the next line ***
@@ -68,14 +68,20 @@
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_transforms.st; \
+ if [ -d .svn ]; then \
+ rev=$(shell svnversion -n); \
+ if [ ! -r .svnversion -o "$$rev" != "$$(cat .svnversion)" ]; then \
+ echo -n $$rev > .svnversion; \
+ rev2=$$(printf "%15s" \'$$rev\'); \
+ sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"$$rev2\"\$$\"/g" \
+ stx_goodies_xtreams_transforms.st; \
+ fi \
fi
.PHONY: update-svn-revision
+
+
# add more install actions here
install::
@@ -90,28 +96,18 @@
prereq: $(REQUIRED_SUPPORT_DIRS)
cd ../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../core && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../support && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libwidg3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libcompat && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../support && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/../exept/ctypes && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../terminals && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../substreams && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../../librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cleanjunk::
+ -rm -f *.s *.s2
clean::
-rm -f *.o *.H
@@ -122,22 +118,22 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)Xtreams__ASCIIEncoder.$(O) Xtreams__ASCIIEncoder.$(H): Xtreams__ASCIIEncoder.st $(INCLUDE_TOP)/stx/goodies/xtreams/support/Xtreams__Encoder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__CollectReadStream.$(O) Xtreams__CollectReadStream.$(H): Xtreams__CollectReadStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__CollectWriteStream.$(O) Xtreams__CollectWriteStream.$(H): Xtreams__CollectWriteStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__CollectReadStream.$(O) Xtreams__CollectReadStream.$(H): Xtreams__CollectReadStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/support/Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__CollectWriteStream.$(O) Xtreams__CollectWriteStream.$(H): Xtreams__CollectWriteStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/support/Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Xtreams__DuplicateReadStream.$(O) Xtreams__DuplicateReadStream.$(H): Xtreams__DuplicateReadStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Xtreams__DuplicateWriteStream.$(O) Xtreams__DuplicateWriteStream.$(H): Xtreams__DuplicateWriteStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__EncodeReadStream.$(O) Xtreams__EncodeReadStream.$(H): Xtreams__EncodeReadStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__EncodeWriteStream.$(O) Xtreams__EncodeWriteStream.$(H): Xtreams__EncodeWriteStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__EncodeReadStream.$(O) Xtreams__EncodeReadStream.$(H): Xtreams__EncodeReadStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/support/Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__EncodeWriteStream.$(O) Xtreams__EncodeWriteStream.$(H): Xtreams__EncodeWriteStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/support/Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Xtreams__ISO8859L1Encoder.$(O) Xtreams__ISO8859L1Encoder.$(H): Xtreams__ISO8859L1Encoder.st $(INCLUDE_TOP)/stx/goodies/xtreams/support/Xtreams__Encoder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__InterpretedReadStream.$(O) Xtreams__InterpretedReadStream.$(H): Xtreams__InterpretedReadStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__InterpretedWriteStream.$(O) Xtreams__InterpretedWriteStream.$(H): Xtreams__InterpretedWriteStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__MessagePackMarshaler.$(O) Xtreams__MessagePackMarshaler.$(H): Xtreams__MessagePackMarshaler.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__InterpretedReadStream.$(O) Xtreams__InterpretedReadStream.$(H): Xtreams__InterpretedReadStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/support/Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__InterpretedWriteStream.$(O) Xtreams__InterpretedWriteStream.$(H): Xtreams__InterpretedWriteStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/support/Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__MessagePackMarshaler.$(O) Xtreams__MessagePackMarshaler.$(H): Xtreams__MessagePackMarshaler.st $(INCLUDE_TOP)/stx/goodies/xtreams/support/Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Xtreams__ObjectAnalyseStream.$(O) Xtreams__ObjectAnalyseStream.$(H): Xtreams__ObjectAnalyseStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__ObjectMarshaler.$(O) Xtreams__ObjectMarshaler.$(H): Xtreams__ObjectMarshaler.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__ObjectMarshaler.$(O) Xtreams__ObjectMarshaler.$(H): Xtreams__ObjectMarshaler.st $(INCLUDE_TOP)/stx/goodies/xtreams/support/Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Xtreams__ObjectReadStream.$(O) Xtreams__ObjectReadStream.$(H): Xtreams__ObjectReadStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Xtreams__ObjectWriteStream.$(O) Xtreams__ObjectWriteStream.$(H): Xtreams__ObjectWriteStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__TransformReadStream.$(O) Xtreams__TransformReadStream.$(H): Xtreams__TransformReadStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__TransformWriteStream.$(O) Xtreams__TransformWriteStream.$(H): Xtreams__TransformWriteStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__TransformReadStream.$(O) Xtreams__TransformReadStream.$(H): Xtreams__TransformReadStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/support/Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__TransformWriteStream.$(O) Xtreams__TransformWriteStream.$(H): Xtreams__TransformWriteStream.st $(INCLUDE_TOP)/stx/goodies/xtreams/support/Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)stx_goodies_xtreams_transforms.$(O) stx_goodies_xtreams_transforms.$(H): stx_goodies_xtreams_transforms.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/goodies/xtreams/core/Xtreams__WriteStream.$(H) $(STCHDR)
--- a/transforms/Make.spec Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/Make.spec Wed Feb 01 00:34:28 2012 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_goodies_xtreams_transforms.
+# automagically generated from the projectDefinition: stx_goodies_xtreams_transforms at 2012-02-01 00:34:32.232.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -18,7 +18,7 @@
# Argument(s) to the stc compiler (stc --usage).
-# -H. : create header files locally
+# -headerDir=. : create header files locally
# (if removed, they will be created as common
# -Pxxx : defines the package
# -Zxxx : a prefix for variables within the classLib
--- a/transforms/Xtreams__CollectReadStream.st Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/Xtreams__CollectReadStream.st Wed Feb 01 00:34:28 2012 +0000
@@ -5,7 +5,7 @@
ReadStream subclass:#CollectReadStream
instanceVariableNames:'block cache contentsSpecies direct'
classVariableNames:''
- poolDictionaries:'XtreamsPool'
+ poolDictionaries:'Xtreams::XtreamsPool'
category:'Xtreams-Transforms'
!
--- a/transforms/Xtreams__CollectWriteStream.st Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/Xtreams__CollectWriteStream.st Wed Feb 01 00:34:28 2012 +0000
@@ -5,7 +5,7 @@
WriteStream subclass:#CollectWriteStream
instanceVariableNames:'block cache'
classVariableNames:''
- poolDictionaries:'XtreamsPool'
+ poolDictionaries:'Xtreams::XtreamsPool'
category:'Xtreams-Transforms'
!
--- a/transforms/Xtreams__EncodeReadStream.st Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/Xtreams__EncodeReadStream.st Wed Feb 01 00:34:28 2012 +0000
@@ -6,7 +6,7 @@
instanceVariableNames:'transparent crPreceeding encoder buffer bufferWriting
bufferReading'
classVariableNames:''
- poolDictionaries:'XtreamsPool'
+ poolDictionaries:'Xtreams::XtreamsPool'
category:'Xtreams-Transforms'
!
--- a/transforms/Xtreams__EncodeWriteStream.st Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/Xtreams__EncodeWriteStream.st Wed Feb 01 00:34:28 2012 +0000
@@ -6,7 +6,7 @@
instanceVariableNames:'encoder buffer bufferReading bufferWriting decodedLineEnd
encodedLineEnd'
classVariableNames:''
- poolDictionaries:'XtreamsPool'
+ poolDictionaries:'Xtreams::XtreamsPool'
category:'Xtreams-Transforms'
!
--- a/transforms/Xtreams__InterpretedReadStream.st Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/Xtreams__InterpretedReadStream.st Wed Feb 01 00:34:28 2012 +0000
@@ -5,7 +5,7 @@
ReadStream subclass:#InterpretedReadStream
instanceVariableNames:'elementSize cache cacheSize operation contentsSpecies'
classVariableNames:''
- poolDictionaries:'XtreamsPool'
+ poolDictionaries:'Xtreams::XtreamsPool'
category:'Xtreams-Transforms'
!
--- a/transforms/Xtreams__InterpretedWriteStream.st Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/Xtreams__InterpretedWriteStream.st Wed Feb 01 00:34:28 2012 +0000
@@ -5,7 +5,7 @@
WriteStream subclass:#InterpretedWriteStream
instanceVariableNames:'elementSize cache cacheSize operation contentsSpecies'
classVariableNames:''
- poolDictionaries:'XtreamsPool'
+ poolDictionaries:'Xtreams::XtreamsPool'
category:'Xtreams-Transforms'
!
--- a/transforms/Xtreams__MessagePackMarshaler.st Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/Xtreams__MessagePackMarshaler.st Wed Feb 01 00:34:28 2012 +0000
@@ -5,7 +5,7 @@
Object subclass:#MessagePackMarshaler
instanceVariableNames:'unmarshaling marshaling analysing'
classVariableNames:''
- poolDictionaries:'XtreamsPool'
+ poolDictionaries:'Xtreams::XtreamsPool'
category:'Xtreams-Transforms'
!
--- a/transforms/Xtreams__ObjectMarshaler.st Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/Xtreams__ObjectMarshaler.st Wed Feb 01 00:34:28 2012 +0000
@@ -5,7 +5,7 @@
Object subclass:#ObjectMarshaler
instanceVariableNames:'classes read write version rehash analyse immediate classesMutex'
classVariableNames:''
- poolDictionaries:'XtreamsPool'
+ poolDictionaries:'Xtreams::XtreamsPool'
category:'Xtreams-Transforms'
!
--- a/transforms/Xtreams__TransformReadStream.st Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/Xtreams__TransformReadStream.st Wed Feb 01 00:34:28 2012 +0000
@@ -5,7 +5,7 @@
ReadStream subclass:#TransformReadStream
instanceVariableNames:'buffer bufferWriting sourceAtEnd block closeBlock'
classVariableNames:''
- poolDictionaries:'XtreamsPool'
+ poolDictionaries:'Xtreams::XtreamsPool'
category:'Xtreams-Transforms'
!
--- a/transforms/Xtreams__TransformWriteStream.st Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/Xtreams__TransformWriteStream.st Wed Feb 01 00:34:28 2012 +0000
@@ -6,7 +6,7 @@
instanceVariableNames:'buffer block closeBlock process incompleteCount readReady
writeReady closeReady'
classVariableNames:''
- poolDictionaries:'XtreamsPool'
+ poolDictionaries:'Xtreams::XtreamsPool'
category:'Xtreams-Transforms'
!
--- a/transforms/abbrev.stc Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/abbrev.stc Wed Feb 01 00:34:28 2012 +0000
@@ -1,18 +1,21 @@
-Xtreams::ASCIIEncoder Xtreams__ASCIIEncoder stx:goodies/xtreams/transforms 'Xtreams' 0
-Xtreams::CollectReadStream Xtreams__CollectReadStream stx:goodies/xtreams/transforms 'My Classes' 0
-Xtreams::CollectWriteStream Xtreams__CollectWriteStream stx:goodies/xtreams/transforms 'My Classes' 0
-Xtreams::DuplicateReadStream Xtreams__DuplicateReadStream stx:goodies/xtreams/transforms 'Xtreams' 0
-Xtreams::DuplicateWriteStream Xtreams__DuplicateWriteStream stx:goodies/xtreams/transforms 'Xtreams' 0
-Xtreams::EncodeReadStream Xtreams__EncodeReadStream stx:goodies/xtreams/transforms 'Xtreams' 0
-Xtreams::EncodeWriteStream Xtreams__EncodeWriteStream stx:goodies/xtreams/transforms 'Xtreams' 0
-Xtreams::ISO8859L1Encoder Xtreams__ISO8859L1Encoder stx:goodies/xtreams/transforms 'Xtreams' 0
-Xtreams::InterpretedReadStream Xtreams__InterpretedReadStream stx:goodies/xtreams/transforms 'My Classes' 0
-Xtreams::InterpretedWriteStream Xtreams__InterpretedWriteStream stx:goodies/xtreams/transforms 'My Classes' 0
-Xtreams::MessagePackMarshaler Xtreams__MessagePackMarshaler stx:goodies/xtreams/transforms 'My Classes' 0
-Xtreams::ObjectAnalyseStream Xtreams__ObjectAnalyseStream stx:goodies/xtreams/transforms 'My Classes' 0
-Xtreams::ObjectMarshaler Xtreams__ObjectMarshaler stx:goodies/xtreams/transforms 'My Classes' 0
-Xtreams::ObjectReadStream Xtreams__ObjectReadStream stx:goodies/xtreams/transforms 'My Classes' 0
-Xtreams::ObjectWriteStream Xtreams__ObjectWriteStream stx:goodies/xtreams/transforms 'My Classes' 0
-Xtreams::TransformReadStream Xtreams__TransformReadStream stx:goodies/xtreams/transforms 'My Classes' 0
-Xtreams::TransformWriteStream Xtreams__TransformWriteStream stx:goodies/xtreams/transforms 'My Classes' 0
+# automagically generated by the project definition
+# this file is needed for stc to be able to compile modules independently.
+# it provides information about a classes filename, category and especially namespace.
+Xtreams::ASCIIEncoder Xtreams__ASCIIEncoder stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::CollectReadStream Xtreams__CollectReadStream stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::CollectWriteStream Xtreams__CollectWriteStream stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::DuplicateReadStream Xtreams__DuplicateReadStream stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::DuplicateWriteStream Xtreams__DuplicateWriteStream stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::EncodeReadStream Xtreams__EncodeReadStream stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::EncodeWriteStream Xtreams__EncodeWriteStream stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::ISO8859L1Encoder Xtreams__ISO8859L1Encoder stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::InterpretedReadStream Xtreams__InterpretedReadStream stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::InterpretedWriteStream Xtreams__InterpretedWriteStream stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::MessagePackMarshaler Xtreams__MessagePackMarshaler stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::ObjectAnalyseStream Xtreams__ObjectAnalyseStream stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::ObjectMarshaler Xtreams__ObjectMarshaler stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::ObjectReadStream Xtreams__ObjectReadStream stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::ObjectWriteStream Xtreams__ObjectWriteStream stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::TransformReadStream Xtreams__TransformReadStream stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
+Xtreams::TransformWriteStream Xtreams__TransformWriteStream stx:goodies/xtreams/transforms 'Xtreams-Transforms' 0
stx_goodies_xtreams_transforms stx_goodies_xtreams_transforms stx:goodies/xtreams/transforms '* Projects & Packages *' 3
--- a/transforms/bc.mak Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/bc.mak Wed Feb 01 00:34:28 2012 +0000
@@ -1,18 +1,24 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_goodies_xtreams_transforms.
+# automagically generated from the projectDefinition: stx_goodies_xtreams_transforms at 2012-02-01 00:34:32.654.
#
# 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).
+# 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
+# (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)\..
@@ -28,10 +34,10 @@
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\goodies\xtreams\core -I$(INCLUDE_TOP)\stx\libcompat -I$(INCLUDE_TOP)\stx\goodies\xtreams\substreams -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\goodies\xtreams\support
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\goodies\xtreams\core -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\goodies\xtreams\support -I$(INCLUDE_TOP)\stx\goodies\xtreams\terminals
LOCALDEFINES=
-STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
+STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
LOCALLIBS=
OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
@@ -45,46 +51,36 @@
# build all prerequisite packages for this package
prereq:
pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\core & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\support & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libwidg3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libcompat & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\support & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\..\exept\ctypes & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\terminals & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\substreams & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)Xtreams__ASCIIEncoder.$(O) Xtreams__ASCIIEncoder.$(H): Xtreams__ASCIIEncoder.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\Xtreams__Encoder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__CollectReadStream.$(O) Xtreams__CollectReadStream.$(H): Xtreams__CollectReadStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__CollectWriteStream.$(O) Xtreams__CollectWriteStream.$(H): Xtreams__CollectWriteStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__CollectReadStream.$(O) Xtreams__CollectReadStream.$(H): Xtreams__CollectReadStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__CollectWriteStream.$(O) Xtreams__CollectWriteStream.$(H): Xtreams__CollectWriteStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Xtreams__DuplicateReadStream.$(O) Xtreams__DuplicateReadStream.$(H): Xtreams__DuplicateReadStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Xtreams__DuplicateWriteStream.$(O) Xtreams__DuplicateWriteStream.$(H): Xtreams__DuplicateWriteStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__EncodeReadStream.$(O) Xtreams__EncodeReadStream.$(H): Xtreams__EncodeReadStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__EncodeWriteStream.$(O) Xtreams__EncodeWriteStream.$(H): Xtreams__EncodeWriteStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__EncodeReadStream.$(O) Xtreams__EncodeReadStream.$(H): Xtreams__EncodeReadStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__EncodeWriteStream.$(O) Xtreams__EncodeWriteStream.$(H): Xtreams__EncodeWriteStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Xtreams__ISO8859L1Encoder.$(O) Xtreams__ISO8859L1Encoder.$(H): Xtreams__ISO8859L1Encoder.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\Xtreams__Encoder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__InterpretedReadStream.$(O) Xtreams__InterpretedReadStream.$(H): Xtreams__InterpretedReadStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__InterpretedWriteStream.$(O) Xtreams__InterpretedWriteStream.$(H): Xtreams__InterpretedWriteStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__MessagePackMarshaler.$(O) Xtreams__MessagePackMarshaler.$(H): Xtreams__MessagePackMarshaler.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__InterpretedReadStream.$(O) Xtreams__InterpretedReadStream.$(H): Xtreams__InterpretedReadStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__InterpretedWriteStream.$(O) Xtreams__InterpretedWriteStream.$(H): Xtreams__InterpretedWriteStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__MessagePackMarshaler.$(O) Xtreams__MessagePackMarshaler.$(H): Xtreams__MessagePackMarshaler.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Xtreams__ObjectAnalyseStream.$(O) Xtreams__ObjectAnalyseStream.$(H): Xtreams__ObjectAnalyseStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__ObjectMarshaler.$(O) Xtreams__ObjectMarshaler.$(H): Xtreams__ObjectMarshaler.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__ObjectMarshaler.$(O) Xtreams__ObjectMarshaler.$(H): Xtreams__ObjectMarshaler.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Xtreams__ObjectReadStream.$(O) Xtreams__ObjectReadStream.$(H): Xtreams__ObjectReadStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Xtreams__ObjectWriteStream.$(O) Xtreams__ObjectWriteStream.$(H): Xtreams__ObjectWriteStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__TransformReadStream.$(O) Xtreams__TransformReadStream.$(H): Xtreams__TransformReadStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Xtreams__TransformWriteStream.$(O) Xtreams__TransformWriteStream.$(H): Xtreams__TransformWriteStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__TransformReadStream.$(O) Xtreams__TransformReadStream.$(H): Xtreams__TransformReadStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Xtreams__TransformWriteStream.$(O) Xtreams__TransformWriteStream.$(H): Xtreams__TransformWriteStream.st $(INCLUDE_TOP)\stx\goodies\xtreams\support\Xtreams__XtreamsPool.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)stx_goodies_xtreams_transforms.$(O) stx_goodies_xtreams_transforms.$(H): stx_goodies_xtreams_transforms.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\goodies\xtreams\core\Xtreams__WriteStream.$(H) $(STCHDR)
--- a/transforms/bmake.bat Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/bmake.bat Wed Feb 01 00:34:28 2012 +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/transforms/extensions.st Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/extensions.st Wed Feb 01 00:34:28 2012 +0000
@@ -691,8 +691,3 @@
"
^TransformWriteStream on: self block: aBlock
! !
-!stx_goodies_xtreams_transforms class methodsFor:'documentation'!
-
-extensionsVersion_SVN
- ^ '$Id$'
-! !
--- a/transforms/transforms.rc Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/transforms.rc Wed Feb 01 00:34:28 2012 +0000
@@ -3,13 +3,15 @@
// automagically generated from the projectDefinition: stx_goodies_xtreams_transforms.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,0,1
+ FILEVERSION 6,2,19,19
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.19.19\0"
VALUE "InternalName", "stx:goodies/xtreams/transforms\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:07:09 GMT\0"
+ VALUE "ProductDate", "Wed, 01 Feb 2012 00:34:32 GMT\0"
END
END
--- a/transforms/vcmake.bat Wed Feb 01 00:32:16 2012 +0000
+++ b/transforms/vcmake.bat Wed Feb 01 00:34:28 2012 +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 %*