--- a/support/Make.proto Sun Nov 17 00:21:48 2013 -0500
+++ b/support/Make.proto Sun Nov 17 00:22:00 2013 -0500
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic
# if you need any additional defines for embedded C code,
@@ -99,12 +99,18 @@
# add more postMake actions here
postMake:: cleanjunk
-prereq: $(REQUIRED_SUPPORT_DIRS)
+# build all mandatory prerequisite packages (containing superclasses) for this package
+prereq:
cd ../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+# build all packages containing referenced classes for this package
+# they are nor needed to compile the package
+references:
+
+
cleanjunk::
-rm -f *.s *.s2
--- a/support/Make.spec Sun Nov 17 00:21:48 2013 -0500
+++ b/support/Make.spec Sun Nov 17 00:22:00 2013 -0500
@@ -50,22 +50,22 @@
STCWARNINGS=-warnNonStandard
COMMON_CLASSES= \
+ Xtreams::Encoder \
+ XtreamsPool \
stx_goodies_xtreams_support \
- XtreamsPool \
Xtreams::InterpretedBytes \
Xtreams::RecyclingCenter \
- Xtreams::Encoder \
Xtreams::STXEncoder \
COMMON_OBJS= \
+ $(OUTDIR_SLASH)Xtreams__Encoder.$(O) \
+ $(OUTDIR_SLASH)XtreamsPool.$(O) \
$(OUTDIR_SLASH)stx_goodies_xtreams_support.$(O) \
- $(OUTDIR_SLASH)XtreamsPool.$(O) \
$(OUTDIR_SLASH)Xtreams__InterpretedBytes.$(O) \
$(OUTDIR_SLASH)Xtreams__RecyclingCenter.$(O) \
- $(OUTDIR_SLASH)Xtreams__Encoder.$(O) \
$(OUTDIR_SLASH)Xtreams__STXEncoder.$(O) \
$(OUTDIR_SLASH)extensions.$(O) \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/support/Makefile.init Sun Nov 17 00:22:00 2013 -0500
@@ -0,0 +1,27 @@
+#
+# DO NOT EDIT
+#
+# make uses this file (Makefile) only, if there is no
+# file named "makefile" (lower-case m) in the same directory.
+# My only task is to generate the real makefile and call make again.
+# Thereafter, I am no longer used and needed.
+#
+# MACOSX caveat:
+# as filenames are not case sensitive (in a default setup),
+# we cannot use the above trick. Therefore, this file is now named
+# "Makefile.init", and you have to execute "make -f Makefile.init" to
+# get the initial makefile. This is now also done by the toplevel CONFIG
+# script.
+
+.PHONY: run
+
+run: makefile
+ $(MAKE) -f makefile
+
+#only needed for the definition of $(TOP)
+include Make.proto
+
+makefile: mf
+
+mf:
+ $(TOP)/rules/stmkmf
--- a/support/bc.mak Sun Nov 17 00:21:48 2013 -0500
+++ b/support/bc.mak Sun Nov 17 00:22:00 2013 -0500
@@ -34,7 +34,7 @@
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
@@ -48,7 +48,7 @@
!INCLUDE $(TOP)\rules\stdRules_bc
-# build all prerequisite packages for this package
+# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -58,6 +58,7 @@
+
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)
--- a/support/mingwmake.bat Sun Nov 17 00:21:48 2013 -0500
+++ b/support/mingwmake.bat Sun Nov 17 00:22:00 2013 -0500
@@ -11,6 +11,6 @@
@pushd ..\..\..\rules
@call find_mingw.bat
@popd
-make.exe -N -f bc.mak %USEMINGW_ARG% %*
+make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
--- a/support/stx_goodies_xtreams_support.st Sun Nov 17 00:21:48 2013 -0500
+++ b/support/stx_goodies_xtreams_support.st Sun Nov 17 00:22:00 2013 -0500
@@ -68,6 +68,13 @@
)
! !
+!stx_goodies_xtreams_support class methodsFor:'description - project information'!
+
+legalCopyright
+
+ ^'Copyright 2010-2013 Cincom Systems, Martin Kobetic and Michael Lucas-Smith'
+! !
+
!stx_goodies_xtreams_support class methodsFor:'documentation'!
version_HG
--- a/support/support.rc Sun Nov 17 00:21:48 2013 -0500
+++ b/support/support.rc Sun Nov 17 00:22:00 2013 -0500
@@ -4,7 +4,7 @@
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 6,2,32767,32767
- PRODUCTVERSION 6,2,3,0
+ PRODUCTVERSION 6,2,3,957
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
@@ -22,10 +22,10 @@
VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
VALUE "FileVersion", "6.2.32767.32767\0"
VALUE "InternalName", "stx:goodies/xtreams/support\0"
- VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2013\nCopyright eXept Software AG 1998-2013\0"
+ VALUE "LegalCopyright", "Copyright 2010-2013 Cincom Systems, Martin Kobetic and Michael Lucas-Smith\0"
VALUE "ProductName", "Smalltalk/X\0"
- VALUE "ProductVersion", "6.2.3.0\0"
- VALUE "ProductDate", "Fri, 15 Mar 2013 22:26:20 GMT\0"
+ VALUE "ProductVersion", "6.2.3.957\0"
+ VALUE "ProductDate", "Sun, 17 Nov 2013 05:02:04 GMT\0"
END
END