--- a/AbstractOperatingSystem.st Thu Jan 19 11:46:00 2012 +0000
+++ b/AbstractOperatingSystem.st Sun Jan 22 23:07:15 2012 +0000
@@ -1824,9 +1824,11 @@
OperatingSystem canExecuteCommand:'cvs'
OperatingSystem canExecuteCommand:'diff'
OperatingSystem canExecuteCommand:'cvs.exe'
- "
-
- "Created: 4.11.1995 / 19:13:54 / cg"
+ OperatingSystem canExecuteCommand:'hg'
+ OperatingSystem pathOfCommand:'hg'
+ "
+
+ "Created: / 04-11-1995 / 19:13:54 / cg"
!
commandAndArgsForOSCommand:aCommandString
@@ -1872,11 +1874,17 @@
Usually, '.../stx' is returned -
but may be different for standAlone apps (or winstx.exe)."
- ^ self pathOfCommand:(self nameOfSTXExecutable)
+ |path|
+
+ path := self pathOfCommand:(self nameOfSTXExecutable).
+ self assert:(path notNil).
+ ^ path
"
OperatingSystem pathOfSTXExecutable
"
+
+ "Modified: / 20-01-2012 / 12:52:46 / cg"
! !
!AbstractOperatingSystem class methodsFor:'executing OS commands-wrappers'!
@@ -7096,15 +7104,15 @@
!AbstractOperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.217 2012/01/05 14:29:48 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.219 2012/01/20 12:33:14 cg Exp $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.217 2012/01/05 14:29:48 cg Exp '
+ ^ 'Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.219 2012/01/20 12:33:14 cg Exp '
!
version_SVN
- ^ '$Id: AbstractOperatingSystem.st 10761 2012-01-19 11:46:00Z vranyj1 $'
+ ^ '$Id: AbstractOperatingSystem.st 10763 2012-01-22 23:07:15Z vranyj1 $'
! !
AbstractOperatingSystem initialize!
@@ -7112,3 +7120,4 @@
+
--- a/ApplicationDefinition.st Thu Jan 19 11:46:00 2012 +0000
+++ b/ApplicationDefinition.st Sun Jan 22 23:07:15 2012 +0000
@@ -1534,6 +1534,12 @@
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
#
+# 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")
+#
!!ifndef USEBC
!! ifndef USEVC
@@ -1586,16 +1592,26 @@
STCLOCALOPT=''-package=$(PACKAGE)'' $(LOCALDEFINES) $(LOCALINCLUDES) %(HEADEROUTPUTARG) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMFLAG) -varPrefix=$(LIBNAME)
!!ifdef USEBC
+OBJDIR=objbc
+LIBDIR=libbc
+
LINKER=$(BCB)\BIN\ilink32
-# LFLAGS = -L$(TOP)\libbc;$(BCB)\lib;$(DEBUGLIBPATH) -H:0x400000 -Hc:0x100000 -S:0x40000 -Sc:0x10000 -ap -Tpe -x -Gn -v -Ao:0x10000
-LFLAGS = -L$(TOP)\libbc;$(BCB)\lib -S:0x40000 -Sc:0x10000 $(LFLAGS_APPTYPE) -Tpe -x -Gn -v -Ao:0x10000
-!!endif
-
-!!ifdef USEVC
+# LFLAGS = -L$(TOP)\$(LIBDIR);$(BCB)\lib;$(DEBUGLIBPATH) -H:0x400000 -Hc:0x100000 -S:0x40000 -Sc:0x10000 -ap -Tpe -x -Gn -v -Ao:0x10000
+LFLAGS = -L$(TOP)\$(LIBDIR);$(BCB)\lib -S:0x40000 -Sc:0x10000 $(LFLAGS_APPTYPE) -Tpe -x -Gn -v -Ao:0x10000
+USE_ARG=-DUSEBC
+!!else
+!! ifdef USEVC
+OBJDIR=objvc
+LIBDIR=libvc
+
LINKER = $(LINK32)
CRT_STARTUP=
RT_LIB =
LFLAGS = /nologo /DEBUG /DYNAMICBASE:NO /MACHINE:X86 /ERRORREPORT:PROMPT
+USE_ARG=-DUSEVC
+!! else
+error error
+!! endif
!!endif
PROJECT_NOCONSOLE = %(NOCONSOLE_APPLICATION)
@@ -1605,18 +1621,14 @@
ALLOBJ = $(CRT_STARTUP) $(ALLOBJFILES) $(OBJS)
DEFFILE=$(TOP)\rules\bc_exe.def
+LIBFILES=$(TOP)\$(LIBDIR)\librun.lib
+
!!ifdef USEBC
-LIBFILES=$(TOP)\libbc\librun.lib
ALLLIB=$(LIBFILES) import32.lib $(RT_LIB)
-USE_ARG=-DUSEBC
-!!else
-!! ifdef USEVC
-LIBFILES=$(TOP)\libvc\librun.lib
+!!endif
+
+!!ifdef USEVC
ALLLIB=$(LIBFILES) kernel32.lib
-USE_ARG=-DUSEVC
-!! else
-error error
-!! endif
!!endif
REQUIRED_LIBS=librun.dll %(REQUIRED_LIBS)
@@ -1739,8 +1751,8 @@
buildDate.h: $(TOP)\librun\genDate.exe
$(TOP)\librun\genDate.exe
-librun.dll: $(TOP)\librun\librun.dll
- copy $(TOP)\librun\librun.dll librun.dll
+librun.dll: $(TOP)\librun\$(OBJDIR)\librun.dll
+ copy $(TOP)\librun\$(OBJDIR)\librun.dll librun.dll
cs3245.dll: $(TOP)\support\win32\borland\cs3245.dll
copy $(TOP)\support\win32\borland\cs3245.dll cs3245.dll
@@ -1773,7 +1785,7 @@
-del *.log
-del *.res
-rmdir /S /Q resources
- -rmdir /S /Q objbc
+ -rmdir /S /Q $(OBJDIR)
clobber:: clean
-del *.dll *.exe *.com
@@ -1787,7 +1799,7 @@
# ENDMAKEDEPEND --- do not remove this line
'.
- "Modified: / 28-09-2011 / 16:37:33 / cg"
+ "Modified: / 20-01-2012 / 13:56:17 / cg"
"Modified: / 28-09-2011 / 13:30:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -2836,18 +2848,19 @@
!ApplicationDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.188 2011/12/23 14:09:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.190 2012/01/20 12:56:44 cg Exp $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.188 2011/12/23 14:09:06 cg Exp '
+ ^ 'Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.190 2012/01/20 12:56:44 cg Exp '
!
version_SVN
- ^ '$Id: ApplicationDefinition.st 10761 2012-01-19 11:46:00Z vranyj1 $'
+ ^ '$Id: ApplicationDefinition.st 10763 2012-01-22 23:07:15Z vranyj1 $'
! !
+
--- a/ConfigurableFeatures.st Thu Jan 19 11:46:00 2012 +0000
+++ b/ConfigurableFeatures.st Sun Jan 22 23:07:15 2012 +0000
@@ -82,7 +82,9 @@
^ self class methodDictionary keys
collect:[:each |
(each startsWith:'has') ifTrue:[
- each copyFrom:4
+ (each endsWith:':') ifFalse:[
+ each copyFrom:4
+ ]
] ifFalse:[
nil
].
@@ -237,18 +239,19 @@
!ConfigurableFeatures class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ConfigurableFeatures.st,v 1.5 2012/01/18 10:00:40 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ConfigurableFeatures.st,v 1.6 2012/01/19 12:09:48 cg Exp $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libbasic/ConfigurableFeatures.st,v 1.5 2012/01/18 10:00:40 cg Exp '
+ ^ 'Header: /cvs/stx/stx/libbasic/ConfigurableFeatures.st,v 1.6 2012/01/19 12:09:48 cg Exp '
!
version_SVN
- ^ '$Id: ConfigurableFeatures.st 10761 2012-01-19 11:46:00Z vranyj1 $'
+ ^ '$Id: ConfigurableFeatures.st 10763 2012-01-22 23:07:15Z vranyj1 $'
! !
+
--- a/Filename.st Thu Jan 19 11:46:00 2012 +0000
+++ b/Filename.st Sun Jan 22 23:07:15 2012 +0000
@@ -2855,56 +2855,6 @@
"
!
-new_recursiveRemoveAll
- "Remove all of my subfiles/subdirectories.
- Raise an error if not successful.
- This one walks down the directory hierarchy, not using any OS
- command to do the remove."
-
- |files toRemove fileToRemove|
-
- self isDirectory ifFalse:[^ self].
- files := self directoryContentsAsFilenames.
- files isEmpty ifTrue:[^ self].
-
- toRemove := OrderedCollection new.
- toRemove addAll:files.
- [ toRemove notEmpty ] whileTrue:[
- fileToRemove := toRemove removeLast.
- Error handle:[:ex |
- |children|
-
- fileToRemove isDirectory ifTrue:[
- children := fileToRemove directoryContentsAsFilenames.
- children isEmpty ifTrue:[
- fileToRemove remove
- ] ifFalse:[
- toRemove add:fileToRemove.
- toRemove addAll:children.
- ].
- ] ifFalse:[
- ex reject
- ].
- ] do:[
- "/ Transcript showCR:('remove: ', fileToRemove pathName).
- fileToRemove remove.
- ].
- ].
-
- "
- 'foo' asFilename makeDirectory.
- 'foo/bar' asFilename writeStream close.
- 'foo' asFilename remove
- "
- "
- 'foo' asFilename makeDirectory.
- 'foo/bar' asFilename writeStream close.
- 'foo' asFilename recursiveRemove
- "
-
- "Created: / 11-10-2011 / 10:28:09 / cg"
-!
-
recursiveCopyTo:destination
"if I represent a regular file, copy it.
Otherwise, copy the directory and recursively
@@ -3058,7 +3008,8 @@
f := self construct:aFilenameString.
Error handle:[:ex |
f isDirectory ifFalse:[ ex reject ].
- f recursiveRemoveWithoutOSCommand
+ f recursiveRemoveAll.
+ f removeDirectory
] do:[
f remove
].
@@ -3093,8 +3044,7 @@
This one walks down the directory hierarchy, not using any OS
command to do the remove."
- self new_recursiveRemoveAll.
- "/ self recursiveRemoveAll.
+ self recursiveRemoveAll.
self remove
"
@@ -3109,7 +3059,7 @@
"
"Created: / 25-02-1998 / 19:50:40 / cg"
- "Modified: / 11-10-2011 / 10:29:20 / cg"
+ "Modified: / 19-01-2012 / 17:18:28 / cg"
!
remove
@@ -5929,15 +5879,15 @@
!Filename class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.372 2011/12/25 10:35:01 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.373 2012/01/19 16:20:58 cg Exp $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libbasic/Filename.st,v 1.372 2011/12/25 10:35:01 cg Exp '
+ ^ 'Header: /cvs/stx/stx/libbasic/Filename.st,v 1.373 2012/01/19 16:20:58 cg Exp '
!
version_SVN
- ^ '$Id: Filename.st 10761 2012-01-19 11:46:00Z vranyj1 $'
+ ^ '$Id: Filename.st 10763 2012-01-22 23:07:15Z vranyj1 $'
! !
Filename initialize!
@@ -5945,3 +5895,4 @@
+
--- a/LibraryDefinition.st Thu Jan 19 11:46:00 2012 +0000
+++ b/LibraryDefinition.st Sun Jan 22 23:07:15 2012 +0000
@@ -275,9 +275,10 @@
# 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
@@ -330,7 +331,7 @@
"Created: / 09-08-2006 / 11:44:20 / fm"
"Modified: / 09-08-2006 / 19:59:32 / fm"
- "Modified: / 07-10-2011 / 21:22:58 / cg"
+ "Modified: / 20-01-2012 / 12:18:24 / cg"
!
extensionLine_libInit_dot_cc
@@ -699,16 +700,17 @@
!LibraryDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.106 2011/10/07 22:48:00 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.107 2012/01/20 11:24:54 cg Exp $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.106 2011/10/07 22:48:00 cg Exp '
+ ^ 'Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.107 2012/01/20 11:24:54 cg Exp '
!
version_SVN
- ^ '$Id: LibraryDefinition.st 10761 2012-01-19 11:46:00Z vranyj1 $'
+ ^ '$Id: LibraryDefinition.st 10763 2012-01-22 23:07:15Z vranyj1 $'
! !
+
--- a/Make.proto Thu Jan 19 11:46:00 2012 +0000
+++ b/Make.proto Sun Jan 22 23:07:15 2012 +0000
@@ -1,7 +1,7 @@
-# $Header: /cvs/stx/stx/libbasic/Make.proto,v 1.245 2011/10/31 16:22:25 vrany Exp $
+# $Header: /cvs/stx/stx/libbasic/Make.proto,v 1.247 2012/01/20 15:29:28 cg Exp $
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libbasic at 2011-10-02 18:41:44.324.
+# automagically generated from the projectDefinition: stx_libbasic at 2012-01-20 16:24:09.507.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -44,7 +44,7 @@
LOCALDEFINES=
LIBNAME=libstx_libbasic
-STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -H. $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
+STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=. $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
# ********** OPTIONAL: MODIFY the next line ***
@@ -101,6 +101,7 @@
cleanjunk::
+ -rm -f *.s *.s2
clean::
-rm -f *.o *.H
@@ -216,7 +217,6 @@
$(OUTDIR)CharacterEncoderImplementations__ISO8859_2.$(O) CharacterEncoderImplementations__ISO8859_2.$(H): CharacterEncoderImplementations__ISO8859_2.st $(INCLUDE_TOP)/stx/libbasic/CharacterEncoderImplementations__SingleByteEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)CharacterEncoderImplementations__ISO8859_5.$(O) CharacterEncoderImplementations__ISO8859_5.$(H): CharacterEncoderImplementations__ISO8859_5.st $(INCLUDE_TOP)/stx/libbasic/CharacterEncoderImplementations__SingleByteEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)CharacterEncoderImplementations__ISO8859_7.$(O) CharacterEncoderImplementations__ISO8859_7.$(H): CharacterEncoderImplementations__ISO8859_7.st $(INCLUDE_TOP)/stx/libbasic/CharacterEncoderImplementations__SingleByteEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)CharacterEncoderImplementations__JIS0208_to_SJIS.$(O) CharacterEncoderImplementations__JIS0208_to_SJIS.$(H): CharacterEncoderImplementations__JIS0208_to_SJIS.st $(INCLUDE_TOP)/stx/libbasic/CharacterEncoderImplementations__TwoByteEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)CharacterEncoderImplementations__MS_Ansi.$(O) CharacterEncoderImplementations__MS_Ansi.$(H): CharacterEncoderImplementations__MS_Ansi.st $(INCLUDE_TOP)/stx/libbasic/CharacterEncoderImplementations__SingleByteEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterEncoder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)ClassDescription.$(O) ClassDescription.$(H): ClassDescription.st $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(STCHDR)
$(OUTDIR)Complex.$(O) Complex.$(H): Complex.st $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -257,7 +257,6 @@
$(OUTDIR)Array.$(O) Array.$(H): Array.st $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)BreakPointInterrupt.$(O) BreakPointInterrupt.$(H): BreakPointInterrupt.st $(INCLUDE_TOP)/stx/libbasic/HaltInterrupt.$(H) $(INCLUDE_TOP)/stx/libbasic/ControlInterrupt.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)CheapBlock.$(O) CheapBlock.$(H): CheapBlock.st $(INCLUDE_TOP)/stx/libbasic/Block.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Class.$(O) Class.$(H): Class.st $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Association.$(H) $(INCLUDE_TOP)/stx/libbasic/LookupKey.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(STCHDR)
$(OUTDIR)ClassBuildError.$(O) ClassBuildError.$(H): ClassBuildError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)DoubleArray.$(O) DoubleArray.$(H): DoubleArray.st $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)ElementBoundsError.$(O) ElementBoundsError.$(H): ElementBoundsError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -306,6 +305,7 @@
$(OUTDIR)AutoloadMetaclass.$(O) AutoloadMetaclass.$(H): AutoloadMetaclass.st $(INCLUDE_TOP)/stx/libbasic/Metaclass.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)ByteArray.$(O) ByteArray.$(H): ByteArray.st $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)CharacterWriteStream.$(O) CharacterWriteStream.$(H): CharacterWriteStream.st $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Class.$(O) Class.$(H): Class.st $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Association.$(H) $(INCLUDE_TOP)/stx/libbasic/LookupKey.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(STCHDR)
$(OUTDIR)ContextError.$(O) ContextError.$(H): ContextError.st $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)ConversionError.$(O) ConversionError.$(H): ConversionError.st $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)DeepCopyError.$(O) DeepCopyError.$(H): DeepCopyError.st $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -410,3 +410,4 @@
# ENDMAKEDEPEND --- do not remove this line
+
--- a/Make.spec Thu Jan 19 11:46:00 2012 +0000
+++ b/Make.spec Sun Jan 22 23:07:15 2012 +0000
@@ -1,7 +1,7 @@
-# $Header: /cvs/stx/stx/libbasic/Make.spec,v 1.123 2011/11/25 15:42:53 cg Exp $
+# $Header: /cvs/stx/stx/libbasic/Make.spec,v 1.124 2012/01/20 15:29:25 cg Exp $
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libbasic at 2011-11-25 16:41:53.010.
+# automagically generated from the projectDefinition: stx_libbasic at 2012-01-20 16:23:56.340.
#
# 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
@@ -159,7 +159,6 @@
CharacterEncoderImplementations::ISO8859_2 \
CharacterEncoderImplementations::ISO8859_5 \
CharacterEncoderImplementations::ISO8859_7 \
- CharacterEncoderImplementations::JIS0208_to_SJIS \
CharacterEncoderImplementations::MS_Ansi \
ClassDescription \
ControlRequest \
@@ -473,7 +472,6 @@
$(OUTDIR)CharacterEncoderImplementations__ISO8859_2.$(O) \
$(OUTDIR)CharacterEncoderImplementations__ISO8859_5.$(O) \
$(OUTDIR)CharacterEncoderImplementations__ISO8859_7.$(O) \
- $(OUTDIR)CharacterEncoderImplementations__JIS0208_to_SJIS.$(O) \
$(OUTDIR)CharacterEncoderImplementations__MS_Ansi.$(O) \
$(OUTDIR)ClassDescription.$(O) \
$(OUTDIR)ControlRequest.$(O) \
@@ -677,3 +675,4 @@
+
--- a/ProjectDefinition.st Thu Jan 19 11:46:00 2012 +0000
+++ b/ProjectDefinition.st Sun Jan 22 23:07:15 2012 +0000
@@ -2766,6 +2766,7 @@
!ProjectDefinition class methodsFor:'file generation'!
apspecFilename
+ "/ for linux
^ 'autopackage/default.apspec'
"Created: / 21-12-2010 / 09:43:13 / cg"
@@ -2783,18 +2784,19 @@
'Makefile' #'generate_makefile'
'bc.mak' #'generate_bc_dot_mak'
'abbrev.stc' #'generate_abbrev_dot_stc'
- 'bmake.bat' #'generate_bmake_dot_mak'
- 'vcmake.bat' #'generate_vcmake_dot_mak'
- 'lcmake.bat' #'generate_lcmake_dot_mak'
+ 'bmake.bat' #'generate_bmake_dot_mak' "/ for bcc32
+ 'vcmake.bat' #'generate_vcmake_dot_mak' "/ for msvc
+ 'lcmake.bat' #'generate_lcmake_dot_mak' "/ for lcc
).
dict
- at:self rcFilename put:#'generate_packageName_dot_rc';
- at:self apspecFilename put:#'generate_autopackage_default_dot_apspec'.
+ at:self rcFilename put:#'generate_packageName_dot_rc'; "/ for windows
+ at:self apspecFilename put:#'generate_autopackage_default_dot_apspec'. "/ for linux
^ dict.
"Modified: / 21-12-2010 / 11:02:02 / cg"
+ "Modified (comment): / 21-01-2012 / 12:32:45 / cg"
!
fileNamesToGenerate
@@ -2843,11 +2845,13 @@
^ self generate_loadAll
].
(filename = 'autopackage/default.apspec' or:[filename = self apspecFilename]) ifTrue:[
+ "/ for linux
^ self generate_autopackage_default_dot_apspec
].
self error:('File "%1" not appropriate (not generated) for this type of project.' bindWith:filename)
"Modified: / 21-12-2010 / 11:01:10 / cg"
+ "Modified (format): / 21-01-2012 / 12:31:40 / cg"
!
generateFile:filename in: directory
@@ -2912,6 +2916,7 @@
!
generate_abbrev_dot_stc
+ "/ for stc: provides abbreviations and namespace information
self checkIfClassesArePresent.
^ String
@@ -2970,6 +2975,10 @@
s cr.
].
+ s nextPutLine:'# automagically generated by the project definition'.
+ s nextPutLine:'# this file is needed for stc to be able to compile modules independently.'.
+ s nextPutLine:'# it provides information about a classes filename, category and especially namespace.'.
+
self allClassNames do:addEntry.
self namesAndAttributesIn:(self additionalClassNamesAndAttributes) do: [:nm :attr |
(attr isEmptyOrNil or:[(attr includes:#autoload) not]) ifTrue:[
@@ -2979,13 +2988,14 @@
]
"
+ stx_libbasic generate_abbrev_dot_stc
DapasXProject generate_abbrev_dot_stc
DapasX_Datenbasis generate_abbrev_dot_stc
bosch_dapasx_interactiver_editor generate_abbrev_dot_stc
"
"Created: / 09-08-2006 / 11:24:39 / fm"
- "Modified: / 20-10-2006 / 16:31:08 / cg"
+ "Modified: / 21-01-2012 / 12:42:57 / cg"
!
generate_autopackage_default_dot_apspec
@@ -4754,7 +4764,7 @@
|abbrevs|
AccessLock critical:[
- |mustRead file|
+ |mustRead file myPackageDirectory|
AbbrevDictionary isNil ifTrue:[
AbbrevDictionary := WeakIdentityDictionary new.
@@ -4764,23 +4774,27 @@
abbrevs := AbbrevDictionary at:self ifAbsent:[ mustRead := true. Dictionary new ].
mustRead ifTrue:[
- file := self packageDirectory / 'abbrev.stc'.
- file exists ifTrue: [
- file readingFileDo:[:stream |
- Smalltalk
- withAbbreviationsFromStream:stream
- do:[:nm :fn :pkg :cat :sz|
- abbrevs at: nm put: (AbbrevEntry new className:nm fileName:fn category:cat numClassInstVars:sz)
- ]
- ]
- ].
- ].
+ myPackageDirectory := self packageDirectory.
+ myPackageDirectory isNil ifTrue:[
+ ] ifFalse:[
+ file := myPackageDirectory / 'abbrev.stc'.
+ file exists ifTrue: [
+ file readingFileDo:[:stream |
+ Smalltalk
+ withAbbreviationsFromStream:stream
+ do:[:nm :fn :pkg :cat :sz|
+ abbrevs at: nm put: (AbbrevEntry new className:nm fileName:fn category:cat numClassInstVars:sz)
+ ]
+ ]
+ ].
+ ].
+ ].
].
^abbrevs
"Created: / 06-03-2011 / 18:25:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 18-08-2011 / 14:24:15 / cg"
+ "Modified: / 20-01-2012 / 15:42:47 / cg"
!
additionalClassAttributesFor: aClass
@@ -6146,7 +6160,17 @@
!
allClasses
- ^ self allClassNames collect:[:nm | Smalltalk classNamed:nm]
+ ^ self allClassNames
+ collect:[:nm |
+ |cls|
+
+ cls := Smalltalk classNamed:nm.
+ cls isNil ifTrue:[
+ Transcript showCR:('%1: failed to autoload class %2' bindWith:self name with:nm)
+ ].
+ cls
+ ]
+ thenSelect:[:cls | cls notNil ].
"Created: / 06-08-2011 / 15:47:36 / cg"
!
@@ -6742,15 +6766,15 @@
!ProjectDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.377 2012/01/09 10:09:44 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.380 2012/01/22 10:08:54 cg Exp $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.377 2012/01/09 10:09:44 cg Exp '
+ ^ 'Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.380 2012/01/22 10:08:54 cg Exp '
!
version_SVN
- ^ '$Id: ProjectDefinition.st 10761 2012-01-19 11:46:00Z vranyj1 $'
+ ^ '$Id: ProjectDefinition.st 10763 2012-01-22 23:07:15Z vranyj1 $'
! !
ProjectDefinition initialize!
@@ -6758,3 +6782,4 @@
+
--- a/Smalltalk.st Thu Jan 19 11:46:00 2012 +0000
+++ b/Smalltalk.st Sun Jan 22 23:07:15 2012 +0000
@@ -3437,9 +3437,12 @@
'Smalltalk [info]: execute startBlocks...' infoPrintCR.
startBlocks do:[:aBlock|
Error handle:[:ex |
- 'Smalltalk [warning]: error cought in startBlock: ' infoPrint.
- ex description infoPrintCR.
- ex infoPrintCR.
+ InfoPrinting == true ifTrue:[
+ 'Smalltalk [warning]: error cought in startBlock: ' infoPrint.
+ ex description infoPrintCR.
+ ex infoPrintCR.
+ thisContext fullPrintAll.
+ ].
] do: aBlock
].
startBlocks removeAll.
@@ -7744,18 +7747,19 @@
!Smalltalk class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.986 2012/01/19 09:18:11 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.987 2012/01/20 14:38:38 cg Exp $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.986 2012/01/19 09:18:11 cg Exp '
+ ^ 'Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.987 2012/01/20 14:38:38 cg Exp '
!
version_SVN
- ^ '$Id: Smalltalk.st 10761 2012-01-19 11:46:00Z vranyj1 $'
+ ^ '$Id: Smalltalk.st 10763 2012-01-22 23:07:15Z vranyj1 $'
! !
+
--- a/UserPreferences.st Thu Jan 19 11:46:00 2012 +0000
+++ b/UserPreferences.st Sun Jan 22 23:07:15 2012 +0000
@@ -811,18 +811,6 @@
"
!
-flyByHelpActive
-
- ^ self at:#flyByHelpActive ifAbsent:true "(FlyByHelp notNil and:[FlyByHelp isActive])"
-!
-
-flyByHelpActive:aBoolean
- aBoolean ~~ self flyByHelpActive ifTrue:[
- self at:#flyByHelpActive put:aBoolean.
- self flyByHelpSettingChanged.
- ].
-!
-
inspectorClassSetting
self useNewInspector ifTrue:[
^ (NewInspector::NewInspectorView ? InspectorView)
@@ -833,67 +821,6 @@
"Created: / 12.11.2001 / 15:49:00 / cg"
!
-nativeDialogs
- ^ self at:#nativeDialogs ifAbsent:false
-
- "Created: / 24-08-2010 / 17:01:47 / sr"
-!
-
-nativeDialogs:aBoolean
- |currentScreen|
-
- self at:#nativeDialogs put:aBoolean.
- currentScreen := Screen current.
- currentScreen notNil ifTrue:[
- currentScreen supportsNativeDialogs ifTrue:[
- currentScreen nativeDialogs:aBoolean
- ].
- ].
-
- "Modified: / 24-08-2010 / 18:06:43 / sr"
-!
-
-nativeFileDialogs
- ^ self at:#nativeFileDialogs ifAbsent:false
-
- "Created: / 24-08-2010 / 17:01:59 / sr"
-!
-
-nativeFileDialogs:aBoolean
- |currentScreen|
-
- self at:#nativeFileDialogs put:aBoolean.
- currentScreen := Screen current.
- currentScreen notNil ifTrue:[
- currentScreen supportsNativeFileDialogs ifTrue:[
- currentScreen nativeFileDialogs:aBoolean
- ].
- ].
-
- "Modified: / 24-08-2010 / 18:06:27 / sr"
-!
-
-nativeWidgets
- ^ self at:#nativeWidgets ifAbsent:false
-
- "Created: / 24-08-2010 / 16:58:44 / sr"
-!
-
-nativeWidgets:aBoolean
- |currentScreen|
-
- self at:#nativeWidgets put:aBoolean.
- currentScreen := Screen current.
- currentScreen notNil ifTrue:[
- currentScreen supportsNativeWidgets ifTrue:[
- currentScreen nativeWidgets:aBoolean
- ].
- ].
-
- "Created: / 24-08-2010 / 16:58:14 / sr"
- "Modified: / 24-08-2010 / 18:05:56 / sr"
-!
-
showTipOfTheDayAtStartup
^ self at:#showTipOfTheDayAtStartup ifAbsent:false
!
@@ -1359,6 +1286,18 @@
"
!
+flyByHelpActive
+
+ ^ self at:#flyByHelpActive ifAbsent:true "(FlyByHelp notNil and:[FlyByHelp isActive])"
+!
+
+flyByHelpActive:aBoolean
+ aBoolean ~~ self flyByHelpActive ifTrue:[
+ self at:#flyByHelpActive put:aBoolean.
+ self flyByHelpSettingChanged.
+ ].
+!
+
focusFollowsMouse
"return the flag which controls if the keyboard focus should
follow the mouse (as in X) - as opposed to click mode (as in MS-win).
@@ -1433,6 +1372,67 @@
"
!
+nativeDialogs
+ ^ self at:#nativeDialogs ifAbsent:false
+
+ "Created: / 24-08-2010 / 17:01:47 / sr"
+!
+
+nativeDialogs:aBoolean
+ |currentScreen|
+
+ self at:#nativeDialogs put:aBoolean.
+ currentScreen := Screen current.
+ currentScreen notNil ifTrue:[
+ currentScreen supportsNativeDialogs ifTrue:[
+ currentScreen nativeDialogs:aBoolean
+ ].
+ ].
+
+ "Modified: / 24-08-2010 / 18:06:43 / sr"
+!
+
+nativeFileDialogs
+ ^ self at:#nativeFileDialogs ifAbsent:false
+
+ "Created: / 24-08-2010 / 17:01:59 / sr"
+!
+
+nativeFileDialogs:aBoolean
+ |currentScreen|
+
+ self at:#nativeFileDialogs put:aBoolean.
+ currentScreen := Screen current.
+ currentScreen notNil ifTrue:[
+ currentScreen supportsNativeFileDialogs ifTrue:[
+ currentScreen nativeFileDialogs:aBoolean
+ ].
+ ].
+
+ "Modified: / 24-08-2010 / 18:06:27 / sr"
+!
+
+nativeWidgets
+ ^ self at:#nativeWidgets ifAbsent:false
+
+ "Created: / 24-08-2010 / 16:58:44 / sr"
+!
+
+nativeWidgets:aBoolean
+ |currentScreen|
+
+ self at:#nativeWidgets put:aBoolean.
+ currentScreen := Screen current.
+ currentScreen notNil ifTrue:[
+ currentScreen supportsNativeWidgets ifTrue:[
+ currentScreen nativeWidgets:aBoolean
+ ].
+ ].
+
+ "Created: / 24-08-2010 / 16:58:14 / sr"
+ "Modified: / 24-08-2010 / 18:05:56 / sr"
+!
+
opaqueTableColumnResizing
"return the flag which controls if table column resizing should be done
animated (opaque)"
@@ -3344,22 +3344,6 @@
"Created: / 15-05-2007 / 13:29:31 / cg"
!
-buildDirectory
- ^ self at:#buildDirectory ifAbsent:nil
-
- "
- UserPreferences current buildDirectory
- "
-!
-
-buildDirectory:aFilenameStringOrNil
- ^ self at:#buildDirectory put:aFilenameStringOrNil
-
- "
- UserPreferences current buildDirectory
- "
-!
-
editToolbarVisibleInWorkspace
"return the flag which defaults the edit-toolbar-visibility in a workspace application"
@@ -3401,22 +3385,6 @@
"Created: / 14-07-2007 / 16:43:44 / cg"
!
-localBuild
- ^ self at:#localBuild ifAbsent:true
-
- "Created: / 20-09-2006 / 23:55:01 / cg"
-!
-
-localBuild:aBoolean
- ^ self at:#localBuild put:aBoolean
-
- "
- UserPreferences current localBuild
- "
-
- "Created: / 20-09-2006 / 23:55:26 / cg"
-!
-
showClockInLauncher
"return the flag which controls if a clock is shown in the launcher"
@@ -3506,6 +3474,65 @@
^ self at:#verboseBacktraceInDebugger put:aBoolean
! !
+!UserPreferences methodsFor:'accessing-prefs-tools-building'!
+
+buildDirectory
+ ^ self at:#buildDirectory ifAbsent:nil
+
+ "
+ UserPreferences current buildDirectory
+ "
+!
+
+buildDirectory:aFilenameStringOrNil
+ ^ self at:#buildDirectory put:aFilenameStringOrNil
+
+ "
+ UserPreferences current buildDirectory
+ "
+!
+
+localBuild
+ "deployment-build in a local directory (as opposed to making via the repository)"
+
+ ^ self at:#localBuild ifAbsent:true
+
+ "Created: / 20-09-2006 / 23:55:01 / cg"
+!
+
+localBuild:aBoolean
+ "deployment-build in a local directory (as opposed to making via the repository)"
+
+ ^ self at:#localBuild put:aBoolean
+
+ "
+ UserPreferences current localBuild
+ "
+
+ "Created: / 20-09-2006 / 23:55:26 / cg"
+!
+
+usedCompilerForBuild
+ ^ self at:#usedCompilerForBuild ifAbsent:nil
+
+ "
+ UserPreferences current usedCompilerForBuild
+ "
+
+ "Created: / 22-01-2012 / 10:52:47 / cg"
+!
+
+usedCompilerForBuild:aString
+ ^ self at:#usedCompilerForBuild put:aString
+
+ "
+ UserPreferences current usedCompilerForBuild
+ UserPreferences current usedCompilerForBuild:'bcc'
+ "
+
+ "Created: / 22-01-2012 / 10:52:59 / cg"
+! !
+
!UserPreferences methodsFor:'accessing-scm'!
showBadRevisionStringDialogs
@@ -3744,16 +3771,17 @@
!UserPreferences class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.295 2012/01/18 09:59:52 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.296 2012/01/22 10:07:42 cg Exp $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.295 2012/01/18 09:59:52 cg Exp '
+ ^ 'Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.296 2012/01/22 10:07:42 cg Exp '
!
version_SVN
- ^ '$Id: UserPreferences.st 10761 2012-01-19 11:46:00Z vranyj1 $'
+ ^ '$Id: UserPreferences.st 10763 2012-01-22 23:07:15Z vranyj1 $'
! !
+
--- a/Win32OperatingSystem.st Thu Jan 19 11:46:00 2012 +0000
+++ b/Win32OperatingSystem.st Sun Jan 22 23:07:15 2012 +0000
@@ -3517,55 +3517,59 @@
return its full pathName if there is such a command, otherwise
return nil."
- |path rentry rpath f fExt|
-
- aCommand asFilename isAbsolute ifTrue:[
- aCommand asFilename exists ifTrue:[
- ^ aCommand
- ].
- ^ nil
+ |cmdFile path rentry rpath f fExt|
+
+ cmdFile := aCommand asFilename.
+ cmdFile isAbsolute ifTrue:[
+ cmdFile exists ifTrue:[
+ ^ aCommand
+ ].
+ ^ nil
].
(aCommand includes:Filename separator) ifTrue:[
- path := Filename currentDirectory construct:aCommand.
- (path exists
- or:[(path withSuffix:'exe') exists]) ifTrue:[
- ^ path pathName
- ].
- ].
-
- path := self getEnvironment:'PATH'.
+ path := Filename currentDirectory construct:aCommand.
+ (path exists
+ or:[ (path := path withSuffix:'com') exists
+ or:[ (path := path withSuffix:'exe') exists ]]) ifTrue:[
+ path isExecutable ifTrue:[
+ ^ path pathName
+ ].
+ ].
+ ^ nil
+ ].
+
+ path := (self getEnvironment:'PATH') ? ''.
(rentry := self registryEntry key: 'HKEY_CURRENT_USER\Environment') notNil ifTrue:[
- rpath := rentry valueNamed: 'PATH'.
- rpath notNil ifTrue:[
- path := path , ';' , rpath
- ].
- ].
-
- path notNil ifTrue:[
- (path asCollectionOfSubstringsSeparatedBy:(self pathSeparator)) do:[:path |
- path isEmpty ifTrue:[
- f := aCommand asFilename
- ] ifFalse:[
- f := path asFilename construct:aCommand.
- ].
- f suffix isEmpty ifTrue:[
- self executableFileExtensions do:[:ext |
- ext notEmpty ifTrue:[
- fExt := (f pathName , '.' , ext) asFilename.
- ] ifFalse:[
- fExt := f.
- ].
- fExt isExecutable ifTrue:[
- ^ fExt pathName
- ].
- ].
- ] ifFalse:[
- f isExecutable ifTrue:[
- ^ f pathName
- ].
- ].
- ].
+ rpath := rentry valueNamed: 'PATH'.
+ rpath notNil ifTrue:[
+ path := path , self pathSeparator , rpath
+ ].
+ ].
+ path := '.;',path.
+
+ (path asCollectionOfSubstringsSeparatedBy:(self pathSeparator)) do:[:eachDirectory |
+ eachDirectory isEmpty ifTrue:[
+ f := cmdFile
+ ] ifFalse:[
+ f := eachDirectory asFilename construct:aCommand.
+ ].
+ f suffix isEmpty ifTrue:[
+ self executableFileExtensions do:[:ext |
+ ext notEmpty ifTrue:[
+ fExt := (f pathName , '.' , ext) asFilename.
+ ] ifFalse:[
+ fExt := f.
+ ].
+ fExt isExecutable ifTrue:[
+ ^ fExt pathName
+ ].
+ ].
+ ] ifFalse:[
+ f isExecutable ifTrue:[
+ ^ f pathName
+ ].
+ ].
].
^ nil
@@ -3575,10 +3579,12 @@
OperatingSystem pathOfCommand:'diff'
OperatingSystem pathOfCommand:'cvs'
OperatingSystem pathOfCommand:'cvs.exe'
- "
-
- "Modified: / 10-09-1998 / 17:51:49 / cg"
+ OperatingSystem pathOfCommand:'stx.exe'
+ OperatingSystem pathOfCommand:'stx'
+ "
+
"Modified: / 23-08-2011 / 21:11:47 / jv"
+ "Modified: / 20-01-2012 / 13:32:55 / cg"
!
primExec:commandPath commandLine:commandLine fileDescriptors:fdArray fork:doFork newPgrp:newPgrp inPath:dirName createFlags:flagsOrNil
@@ -16418,16 +16424,16 @@
!Win32OperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.431 2011/10/08 09:01:59 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.433 2012/01/20 12:33:35 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.431 2011/10/08 09:01:59 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.433 2012/01/20 12:33:35 cg Exp §'
!
version_SVN
- ^ '$Id: Win32OperatingSystem.st 10761 2012-01-19 11:46:00Z vranyj1 $'
+ ^ '$Id: Win32OperatingSystem.st 10763 2012-01-22 23:07:15Z vranyj1 $'
! !
@@ -16440,3 +16446,4 @@
+
--- a/abbrev.stc Thu Jan 19 11:46:00 2012 +0000
+++ b/abbrev.stc Sun Jan 22 23:07:15 2012 +0000
@@ -388,3 +388,4 @@
PolymorphicInlineCache PolymorphicInlineCache stx:libbasic 'Kernel-Classes' 0
+
--- a/bc.mak Thu Jan 19 11:46:00 2012 +0000
+++ b/bc.mak Sun Jan 22 23:07:15 2012 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic/bc.mak,v 1.180 2011/10/31 16:22:25 vrany Exp $
+# $Header: /cvs/stx/stx/libbasic/bc.mak,v 1.182 2012/01/20 15:29:35 cg Exp $
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libbasic at 2011-10-02 18:41:45.114.
@@ -6,9 +6,10 @@
# 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
@@ -39,7 +40,7 @@
LOCALINCLUDES=-I$(TOP)\librun
LOCALDEFINES=
-STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
+STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
LOCALLIBS=
OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
@@ -165,7 +166,6 @@
$(OUTDIR)CharacterEncoderImplementations__ISO8859_2.$(O) CharacterEncoderImplementations__ISO8859_2.$(H): CharacterEncoderImplementations__ISO8859_2.st $(INCLUDE_TOP)\stx\libbasic\CharacterEncoderImplementations__SingleByteEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)CharacterEncoderImplementations__ISO8859_5.$(O) CharacterEncoderImplementations__ISO8859_5.$(H): CharacterEncoderImplementations__ISO8859_5.st $(INCLUDE_TOP)\stx\libbasic\CharacterEncoderImplementations__SingleByteEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)CharacterEncoderImplementations__ISO8859_7.$(O) CharacterEncoderImplementations__ISO8859_7.$(H): CharacterEncoderImplementations__ISO8859_7.st $(INCLUDE_TOP)\stx\libbasic\CharacterEncoderImplementations__SingleByteEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)CharacterEncoderImplementations__JIS0208_to_SJIS.$(O) CharacterEncoderImplementations__JIS0208_to_SJIS.$(H): CharacterEncoderImplementations__JIS0208_to_SJIS.st $(INCLUDE_TOP)\stx\libbasic\CharacterEncoderImplementations__TwoByteEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)CharacterEncoderImplementations__MS_Ansi.$(O) CharacterEncoderImplementations__MS_Ansi.$(H): CharacterEncoderImplementations__MS_Ansi.st $(INCLUDE_TOP)\stx\libbasic\CharacterEncoderImplementations__SingleByteEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterEncoder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)ClassDescription.$(O) ClassDescription.$(H): ClassDescription.st $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(STCHDR)
$(OUTDIR)Complex.$(O) Complex.$(H): Complex.st $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -206,7 +206,6 @@
$(OUTDIR)Array.$(O) Array.$(H): Array.st $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)BreakPointInterrupt.$(O) BreakPointInterrupt.$(H): BreakPointInterrupt.st $(INCLUDE_TOP)\stx\libbasic\HaltInterrupt.$(H) $(INCLUDE_TOP)\stx\libbasic\ControlInterrupt.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)CheapBlock.$(O) CheapBlock.$(H): CheapBlock.st $(INCLUDE_TOP)\stx\libbasic\Block.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Class.$(O) Class.$(H): Class.st $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Association.$(H) $(INCLUDE_TOP)\stx\libbasic\LookupKey.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(STCHDR)
$(OUTDIR)ClassBuildError.$(O) ClassBuildError.$(H): ClassBuildError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)DoubleArray.$(O) DoubleArray.$(H): DoubleArray.st $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)ElementBoundsError.$(O) ElementBoundsError.$(H): ElementBoundsError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -255,6 +254,7 @@
$(OUTDIR)AutoloadMetaclass.$(O) AutoloadMetaclass.$(H): AutoloadMetaclass.st $(INCLUDE_TOP)\stx\libbasic\Metaclass.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)ByteArray.$(O) ByteArray.$(H): ByteArray.st $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)CharacterWriteStream.$(O) CharacterWriteStream.$(H): CharacterWriteStream.st $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Class.$(O) Class.$(H): Class.st $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Association.$(H) $(INCLUDE_TOP)\stx\libbasic\LookupKey.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(STCHDR)
$(OUTDIR)ContextError.$(O) ContextError.$(H): ContextError.st $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)ConversionError.$(O) ConversionError.$(H): ConversionError.st $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)DeepCopyError.$(O) DeepCopyError.$(H): DeepCopyError.st $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -359,8 +359,9 @@
$(OUTDIR)Win32Handle.$(O) Win32Handle.$(H): Win32Handle.st $(STCHDR)
$(OUTDIR)Win32FILEHandle.$(O) Win32FILEHandle.$(H): Win32FILEHandle.st $(STCHDR)
$(OUTDIR)Win32Constants.$(O) Win32Constants.$(H): Win32Constants.st $(STCHDR)
-$(OUTDIR)Win32OperatingSystem.$(O) Win32OperatingSystem.$(H): Win32OperatingSystem.st $(STCHDR)
+$(OUTDIR)Win32OperatingSystem.$(O) Win32OperatingSystem.$(H): Win32OperatingSystem.st $(INCLUDE_TOP)\stx\libbasic\Win32Constants.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractOperatingSystem.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\OSHandle.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalAddress.$(H) $(INCLUDE_TOP)\stx\libbasic\Win32Handle.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
+
--- a/libInit.cc Thu Jan 19 11:46:00 2012 +0000
+++ b/libInit.cc Sun Jan 22 23:07:15 2012 +0000
@@ -1,5 +1,5 @@
/*
- * $Header: /cvs/stx/stx/libbasic/libInit.cc,v 1.173 2011/10/31 16:22:25 vrany Exp $
+ * $Header: /cvs/stx/stx/libbasic/libInit.cc,v 1.175 2012/01/20 15:29:59 cg Exp $
*
* DO NOT EDIT
* automagically generated from the projectDefinition: stx_libbasic.
@@ -133,7 +133,6 @@
_CharacterEncoderImplementations__ISO8859_1372_Init(pass,__pRT__,snd);
_CharacterEncoderImplementations__ISO8859_1375_Init(pass,__pRT__,snd);
_CharacterEncoderImplementations__ISO8859_1377_Init(pass,__pRT__,snd);
-_CharacterEncoderImplementations__JIS0208_137to_137SJIS_Init(pass,__pRT__,snd);
_CharacterEncoderImplementations__MS_137Ansi_Init(pass,__pRT__,snd);
_ClassDescription_Init(pass,__pRT__,snd);
_Complex_Init(pass,__pRT__,snd);
@@ -175,7 +174,6 @@
_Array_Init(pass,__pRT__,snd);
_BreakPointInterrupt_Init(pass,__pRT__,snd);
_CheapBlock_Init(pass,__pRT__,snd);
-_Class_Init(pass,__pRT__,snd);
_ClassBuildError_Init(pass,__pRT__,snd);
_DoubleArray_Init(pass,__pRT__,snd);
_ElementBoundsError_Init(pass,__pRT__,snd);
@@ -224,6 +222,7 @@
_AutoloadMetaclass_Init(pass,__pRT__,snd);
_ByteArray_Init(pass,__pRT__,snd);
_CharacterWriteStream_Init(pass,__pRT__,snd);
+_Class_Init(pass,__pRT__,snd);
_ContextError_Init(pass,__pRT__,snd);
_ConversionError_Init(pass,__pRT__,snd);
_DeepCopyError_Init(pass,__pRT__,snd);
@@ -343,3 +342,4 @@
}
+
--- a/libbasic.rc Thu Jan 19 11:46:00 2012 +0000
+++ b/libbasic.rc Sun Jan 22 23:07:15 2012 +0000
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: stx_libbasic.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,1,94
+ FILEVERSION 6,2,1,95
PRODUCTVERSION 6,2,1,1
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Basic Classes (LIB)\0"
- VALUE "FileVersion", "6.2.1.94\0"
+ VALUE "FileVersion", "6.2.1.95\0"
VALUE "InternalName", "stx:libbasic\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", "Fri, 25 Nov 2011 15:42:49 GMT\0"
+ VALUE "ProductDate", "Fri, 20 Jan 2012 15:29:18 GMT\0"
END
END
@@ -37,3 +37,4 @@
END
+
--- a/stx_libbasic.st Thu Jan 19 11:46:00 2012 +0000
+++ b/stx_libbasic.st Sun Jan 22 23:07:15 2012 +0000
@@ -306,7 +306,7 @@
#'CharacterEncoderImplementations::ISO8859_2'
#'CharacterEncoderImplementations::ISO8859_5'
#'CharacterEncoderImplementations::ISO8859_7'
- #'CharacterEncoderImplementations::JIS0208_to_SJIS'
+ (#'CharacterEncoderImplementations::JIS0208_to_SJIS' autoload)
#'CharacterEncoderImplementations::MS_Ansi'
(#'CharacterEncoderImplementations::MS_Baltic' win32)
(#'CharacterEncoderImplementations::MS_Cyrillic' win32)
@@ -507,7 +507,7 @@
PolymorphicInlineCache
)
- "Modified: / 25-11-2011 / 16:38:56 / cg"
+ "Modified: / 20-01-2012 / 16:23:49 / cg"
!
extensionMethodNames
@@ -554,7 +554,7 @@
"Return a SVN revision number of myself.
This number is updated after a commit"
- ^ "$SVN-Revision:" '10760M'"$"
+ ^ "$SVN-Revision:" '10761MP'"$"
! !
!stx_libbasic class methodsFor:'private-prerequisites'!
@@ -572,17 +572,18 @@
!stx_libbasic class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/stx_libbasic.st,v 1.95 2011/11/25 15:43:13 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/stx_libbasic.st,v 1.96 2012/01/20 15:30:01 cg Exp $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libbasic/stx_libbasic.st,v 1.95 2011/11/25 15:43:13 cg Exp '
+ ^ 'Header: /cvs/stx/stx/libbasic/stx_libbasic.st,v 1.96 2012/01/20 15:30:01 cg Exp '
!
version_SVN
- ^ '$Id: stx_libbasic.st 10761 2012-01-19 11:46:00Z vranyj1 $'
+ ^ '$Id: stx_libbasic.st 10763 2012-01-22 23:07:15Z vranyj1 $'
! !
+