# HG changeset patch # User Jan Vrany # Date 1594204005 -3600 # Node ID 443911ff729afaf658ffda78cca21eed38137ef8 # Parent 6655e15a12d7e25dcb735baf11dc01c0fe5592f2 Move some extensions to stx:libcompat diff -r 6655e15a12d7 -r 443911ff729a Make.proto --- a/Make.proto Thu Aug 01 19:13:14 2019 +0100 +++ b/Make.proto Wed Jul 08 11:26:45 2020 +0100 @@ -85,7 +85,7 @@ sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"\'$$rev2\'\"\$$\"/g" $< > .stx_goodies_cypress.svn.st; \ fi $(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_goodies_cypress.svn $(C_RULE); - sed -i -e "s/\".stx_goodies_cypress.svn.st\");/\"\stx_goodies_cypress.st\");/g" .stx_goodies_cypress.svn.c + sed -i -e "s/\".stx_goodies_cypress.svn.st\");/\"stx_goodies_cypress.st\");/g" .stx_goodies_cypress.svn.c $(MAKE) .stx_goodies_cypress.svn.$(O) @mv .stx_goodies_cypress.svn.$(O) stx_goodies_cypress.$(O) endif @@ -123,7 +123,7 @@ # build all mandatory prerequisite packages (containing superclasses) for this package prereq: - cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" + cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) " @@ -143,20 +143,20 @@ # BEGINMAKEDEPEND --- do not remove this line; make depend needs it -$(OUTDIR)CypressAbstractReaderWriter.$(O) CypressAbstractReaderWriter.$(H): CypressAbstractReaderWriter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)CypressJSONReader.$(O) CypressJSONReader.$(H): CypressJSONReader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)CypressModel.$(O) CypressModel.$(H): CypressModel.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)stx_goodies_cypress.$(O) stx_goodies_cypress.$(H): stx_goodies_cypress.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR) -$(OUTDIR)CypressAbstractReader.$(O) CypressAbstractReader.$(H): CypressAbstractReader.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)CypressAbstractWriter.$(O) CypressAbstractWriter.$(H): CypressAbstractWriter.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)CypressClass.$(O) CypressClass.$(H): CypressClass.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressModel.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)CypressMethod.$(O) CypressMethod.$(H): CypressMethod.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressModel.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)CypressPackage.$(O) CypressPackage.$(H): CypressPackage.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressModel.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)CypressRepository.$(O) CypressRepository.$(H): CypressRepository.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressModel.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)CypressFileTreeReader.$(O) CypressFileTreeReader.$(H): CypressFileTreeReader.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractReader.$(H) $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)CypressReader.$(O) CypressReader.$(H): CypressReader.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractReader.$(H) $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)CypressWriter.$(O) CypressWriter.$(H): CypressWriter.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Boolean.$(H) $(INCLUDE_TOP)/stx/libbasic/Character.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ConfigurableFeatures.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Method.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/PackageId.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/Symbol.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(STCHDR) +$(OUTDIR)CypressAbstractReaderWriter.$(O) CypressAbstractReaderWriter.$(C) CypressAbstractReaderWriter.$(H): CypressAbstractReaderWriter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)CypressJSONReader.$(O) CypressJSONReader.$(C) CypressJSONReader.$(H): CypressJSONReader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)CypressModel.$(O) CypressModel.$(C) CypressModel.$(H): CypressModel.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)stx_goodies_cypress.$(O) stx_goodies_cypress.$(C) stx_goodies_cypress.$(H): stx_goodies_cypress.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR) +$(OUTDIR)CypressAbstractReader.$(O) CypressAbstractReader.$(C) CypressAbstractReader.$(H): CypressAbstractReader.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)CypressAbstractWriter.$(O) CypressAbstractWriter.$(C) CypressAbstractWriter.$(H): CypressAbstractWriter.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)CypressClass.$(O) CypressClass.$(C) CypressClass.$(H): CypressClass.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressModel.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)CypressMethod.$(O) CypressMethod.$(C) CypressMethod.$(H): CypressMethod.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressModel.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)CypressPackage.$(O) CypressPackage.$(C) CypressPackage.$(H): CypressPackage.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressModel.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)CypressRepository.$(O) CypressRepository.$(C) CypressRepository.$(H): CypressRepository.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressModel.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)CypressFileTreeReader.$(O) CypressFileTreeReader.$(C) CypressFileTreeReader.$(H): CypressFileTreeReader.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractReader.$(H) $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)CypressReader.$(O) CypressReader.$(C) CypressReader.$(H): CypressReader.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractReader.$(H) $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)CypressWriter.$(O) CypressWriter.$(C) CypressWriter.$(H): CypressWriter.st $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)/stx/goodies/cypress/CypressAbstractWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Boolean.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ConfigurableFeatures.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Method.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/PackageId.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/Symbol.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(STCHDR) # ENDMAKEDEPEND --- do not remove this line diff -r 6655e15a12d7 -r 443911ff729a Make.spec --- a/Make.spec Thu Aug 01 19:13:14 2019 +0100 +++ b/Make.spec Wed Jul 08 11:26:45 2020 +0100 @@ -22,7 +22,7 @@ # (if removed, they will be created as common # -Pxxx : defines the package # -Zxxx : a prefix for variables within the classLib -# -Dxxx : defines passed to to CC for inline C-code +# -Dxxx : defines passed to CC for inline C-code # -Ixxx : include path passed to CC for inline C-code # +optspace : optimized for space # +optspace2 : optimized more for space @@ -69,20 +69,20 @@ COMMON_OBJS= \ - $(OUTDIR_SLASH)CypressAbstractReaderWriter.$(O) \ - $(OUTDIR_SLASH)CypressJSONReader.$(O) \ - $(OUTDIR_SLASH)CypressModel.$(O) \ - $(OUTDIR_SLASH)stx_goodies_cypress.$(O) \ - $(OUTDIR_SLASH)CypressAbstractReader.$(O) \ - $(OUTDIR_SLASH)CypressAbstractWriter.$(O) \ - $(OUTDIR_SLASH)CypressClass.$(O) \ - $(OUTDIR_SLASH)CypressMethod.$(O) \ - $(OUTDIR_SLASH)CypressPackage.$(O) \ - $(OUTDIR_SLASH)CypressRepository.$(O) \ - $(OUTDIR_SLASH)CypressFileTreeReader.$(O) \ - $(OUTDIR_SLASH)CypressReader.$(O) \ - $(OUTDIR_SLASH)CypressWriter.$(O) \ - $(OUTDIR_SLASH)extensions.$(O) \ + $(OUTDIR)CypressAbstractReaderWriter.$(O) \ + $(OUTDIR)CypressJSONReader.$(O) \ + $(OUTDIR)CypressModel.$(O) \ + $(OUTDIR)stx_goodies_cypress.$(O) \ + $(OUTDIR)CypressAbstractReader.$(O) \ + $(OUTDIR)CypressAbstractWriter.$(O) \ + $(OUTDIR)CypressClass.$(O) \ + $(OUTDIR)CypressMethod.$(O) \ + $(OUTDIR)CypressPackage.$(O) \ + $(OUTDIR)CypressRepository.$(O) \ + $(OUTDIR)CypressFileTreeReader.$(O) \ + $(OUTDIR)CypressReader.$(O) \ + $(OUTDIR)CypressWriter.$(O) \ + $(OUTDIR)extensions.$(O) \ diff -r 6655e15a12d7 -r 443911ff729a bc.mak --- a/bc.mak Thu Aug 01 19:13:14 2019 +0100 +++ b/bc.mak Wed Jul 08 11:26:45 2020 +0100 @@ -31,7 +31,7 @@ LIBNAME=libstx_goodies_cypress MODULE_PATH=goodies\cypress -RESFILES=cypress.$(RES) +RESFILES=stx_goodies_cypressWINrc.$(RES) @@ -59,29 +59,29 @@ -test: $(TOP)\goodies\builder\reports\NUL +test: $(TOP)\goodies\builder\reports pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT) $(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE) clean:: - del *.$(CSUFFIX) + -del *.$(CSUFFIX) # BEGINMAKEDEPEND --- do not remove this line; make depend needs it -$(OUTDIR)CypressAbstractReaderWriter.$(O) CypressAbstractReaderWriter.$(H): CypressAbstractReaderWriter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)CypressJSONReader.$(O) CypressJSONReader.$(H): CypressJSONReader.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)CypressModel.$(O) CypressModel.$(H): CypressModel.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)stx_goodies_cypress.$(O) stx_goodies_cypress.$(H): stx_goodies_cypress.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR) -$(OUTDIR)CypressAbstractReader.$(O) CypressAbstractReader.$(H): CypressAbstractReader.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)CypressAbstractWriter.$(O) CypressAbstractWriter.$(H): CypressAbstractWriter.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)CypressClass.$(O) CypressClass.$(H): CypressClass.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressModel.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)CypressMethod.$(O) CypressMethod.$(H): CypressMethod.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressModel.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)CypressPackage.$(O) CypressPackage.$(H): CypressPackage.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressModel.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)CypressRepository.$(O) CypressRepository.$(H): CypressRepository.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressModel.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)CypressFileTreeReader.$(O) CypressFileTreeReader.$(H): CypressFileTreeReader.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractReader.$(H) $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)CypressReader.$(O) CypressReader.$(H): CypressReader.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractReader.$(H) $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)CypressWriter.$(O) CypressWriter.$(H): CypressWriter.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Boolean.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ConfigurableFeatures.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Method.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\PackageId.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\Symbol.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(STCHDR) +$(OUTDIR)CypressAbstractReaderWriter.$(O) CypressAbstractReaderWriter.$(C) CypressAbstractReaderWriter.$(H): CypressAbstractReaderWriter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)CypressJSONReader.$(O) CypressJSONReader.$(C) CypressJSONReader.$(H): CypressJSONReader.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)CypressModel.$(O) CypressModel.$(C) CypressModel.$(H): CypressModel.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)stx_goodies_cypress.$(O) stx_goodies_cypress.$(C) stx_goodies_cypress.$(H): stx_goodies_cypress.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR) +$(OUTDIR)CypressAbstractReader.$(O) CypressAbstractReader.$(C) CypressAbstractReader.$(H): CypressAbstractReader.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)CypressAbstractWriter.$(O) CypressAbstractWriter.$(C) CypressAbstractWriter.$(H): CypressAbstractWriter.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)CypressClass.$(O) CypressClass.$(C) CypressClass.$(H): CypressClass.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressModel.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)CypressMethod.$(O) CypressMethod.$(C) CypressMethod.$(H): CypressMethod.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressModel.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)CypressPackage.$(O) CypressPackage.$(C) CypressPackage.$(H): CypressPackage.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressModel.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)CypressRepository.$(O) CypressRepository.$(C) CypressRepository.$(H): CypressRepository.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressModel.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)CypressFileTreeReader.$(O) CypressFileTreeReader.$(C) CypressFileTreeReader.$(H): CypressFileTreeReader.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractReader.$(H) $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)CypressReader.$(O) CypressReader.$(C) CypressReader.$(H): CypressReader.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractReader.$(H) $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)CypressWriter.$(O) CypressWriter.$(C) CypressWriter.$(H): CypressWriter.st $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractReaderWriter.$(H) $(INCLUDE_TOP)\stx\goodies\cypress\CypressAbstractWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Boolean.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ConfigurableFeatures.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Method.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\PackageId.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\Symbol.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(STCHDR) # ENDMAKEDEPEND --- do not remove this line diff -r 6655e15a12d7 -r 443911ff729a bmake.bat --- a/bmake.bat Thu Aug 01 19:13:14 2019 +0100 +++ b/bmake.bat Wed Jul 08 11:26:45 2020 +0100 @@ -11,3 +11,5 @@ make.exe -N -f bc.mak %DEFINES% %* + + diff -r 6655e15a12d7 -r 443911ff729a extensions.st --- a/extensions.st Thu Aug 01 19:13:14 2019 +0100 +++ b/extensions.st Wed Jul 08 11:26:45 2020 +0100 @@ -35,36 +35,6 @@ nextPutAll: self printString ! ! -!Character methodsFor:'*Cypress-Structure'! - -isSafeForHTTP - "whether a character is 'safe', or needs to be escaped when used, eg, in a URL" - - ^ asciivalue < 128 - and: [ self isAlphaNumeric - or: [ '.-_' includes: self ]] - - "Modified: / 30-08-2012 / 13:57:44 / Jan Vrany " -! ! - -!CharacterArray methodsFor:'Compatibility-Cuis'! - -withLineEndings: lineEndString - | stringColl | - - self assert: lineEndString size == 1. - - stringColl := self asStringCollection. - - ^stringColl - asStringWith: lineEndString first - from:1 to:(stringColl size) - compressTabs:false - final:nil - - "Created: / 30-08-2012 / 11:27:17 / Jan Vrany " -! ! - !CharacterArray class methodsFor:'Compatibility-Cuis'! lfString diff -r 6655e15a12d7 -r 443911ff729a libInit.cc --- a/libInit.cc Thu Aug 01 19:13:14 2019 +0100 +++ b/libInit.cc Wed Jul 08 11:26:45 2020 +0100 @@ -16,31 +16,47 @@ DLL_EXPORT void _libstx_goodies_cypress_InitDefinition() INIT_TEXT_SECTION; #endif -void _libstx_goodies_cypress_InitDefinition(pass, __pRT__, snd) -OBJ snd; struct __vmData__ *__pRT__; { -__BEGIN_PACKAGE2__("libstx_goodies_cypress__DFN", _libstx_goodies_cypress_InitDefinition, "stx:goodies/cypress"); -_stx_137goodies_137cypress_Init(pass,__pRT__,snd); +extern void _CypressAbstractReaderWriter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd); +extern void _CypressJSONReader_Init(int pass, struct __vmData__ *__pRT__, OBJ snd); +extern void _CypressModel_Init(int pass, struct __vmData__ *__pRT__, OBJ snd); +extern void _stx_137goodies_137cypress_Init(int pass, struct __vmData__ *__pRT__, OBJ snd); +extern void _CypressAbstractReader_Init(int pass, struct __vmData__ *__pRT__, OBJ snd); +extern void _CypressAbstractWriter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd); +extern void _CypressClass_Init(int pass, struct __vmData__ *__pRT__, OBJ snd); +extern void _CypressMethod_Init(int pass, struct __vmData__ *__pRT__, OBJ snd); +extern void _CypressPackage_Init(int pass, struct __vmData__ *__pRT__, OBJ snd); +extern void _CypressRepository_Init(int pass, struct __vmData__ *__pRT__, OBJ snd); +extern void _CypressFileTreeReader_Init(int pass, struct __vmData__ *__pRT__, OBJ snd); +extern void _CypressReader_Init(int pass, struct __vmData__ *__pRT__, OBJ snd); +extern void _CypressWriter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd); -__END_PACKAGE__(); +extern void _stx_137goodies_137cypress_extensions_Init(int pass, struct __vmData__ *__pRT__, OBJ snd); + +void _libstx_goodies_cypress_InitDefinition(int pass, struct __vmData__ *__pRT__, OBJ snd) +{ + __BEGIN_PACKAGE2__("libstx_goodies_cypress__DFN", _libstx_goodies_cypress_InitDefinition, "stx:goodies/cypress"); + _stx_137goodies_137cypress_Init(pass,__pRT__,snd); + + __END_PACKAGE__(); } -void _libstx_goodies_cypress_Init(pass, __pRT__, snd) -OBJ snd; struct __vmData__ *__pRT__; { -__BEGIN_PACKAGE2__("libstx_goodies_cypress", _libstx_goodies_cypress_Init, "stx:goodies/cypress"); -_CypressAbstractReaderWriter_Init(pass,__pRT__,snd); -_CypressJSONReader_Init(pass,__pRT__,snd); -_CypressModel_Init(pass,__pRT__,snd); -_stx_137goodies_137cypress_Init(pass,__pRT__,snd); -_CypressAbstractReader_Init(pass,__pRT__,snd); -_CypressAbstractWriter_Init(pass,__pRT__,snd); -_CypressClass_Init(pass,__pRT__,snd); -_CypressMethod_Init(pass,__pRT__,snd); -_CypressPackage_Init(pass,__pRT__,snd); -_CypressRepository_Init(pass,__pRT__,snd); -_CypressFileTreeReader_Init(pass,__pRT__,snd); -_CypressReader_Init(pass,__pRT__,snd); -_CypressWriter_Init(pass,__pRT__,snd); +void _libstx_goodies_cypress_Init(int pass, struct __vmData__ *__pRT__, OBJ snd) +{ + __BEGIN_PACKAGE2__("libstx_goodies_cypress", _libstx_goodies_cypress_Init, "stx:goodies/cypress"); + _CypressAbstractReaderWriter_Init(pass,__pRT__,snd); + _CypressJSONReader_Init(pass,__pRT__,snd); + _CypressModel_Init(pass,__pRT__,snd); + _stx_137goodies_137cypress_Init(pass,__pRT__,snd); + _CypressAbstractReader_Init(pass,__pRT__,snd); + _CypressAbstractWriter_Init(pass,__pRT__,snd); + _CypressClass_Init(pass,__pRT__,snd); + _CypressMethod_Init(pass,__pRT__,snd); + _CypressPackage_Init(pass,__pRT__,snd); + _CypressRepository_Init(pass,__pRT__,snd); + _CypressFileTreeReader_Init(pass,__pRT__,snd); + _CypressReader_Init(pass,__pRT__,snd); + _CypressWriter_Init(pass,__pRT__,snd); -_stx_137goodies_137cypress_extensions_Init(pass,__pRT__,snd); -__END_PACKAGE__(); + _stx_137goodies_137cypress_extensions_Init(pass,__pRT__,snd); + __END_PACKAGE__(); } diff -r 6655e15a12d7 -r 443911ff729a mingwmake.bat --- a/mingwmake.bat Thu Aug 01 19:13:14 2019 +0100 +++ b/mingwmake.bat Wed Jul 08 11:26:45 2020 +0100 @@ -14,3 +14,5 @@ make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %* + + diff -r 6655e15a12d7 -r 443911ff729a stx_goodies_cypress.st --- a/stx_goodies_cypress.st Thu Aug 01 19:13:14 2019 +0100 +++ b/stx_goodies_cypress.st Wed Jul 08 11:26:45 2020 +0100 @@ -1,3 +1,6 @@ +" +COPYRIGHT (c) 2020 LabWare +" "{ Package: 'stx:goodies/cypress' }" "{ NameSpace: Smalltalk }" @@ -9,6 +12,14 @@ category:'* Projects & Packages *' ! +!stx_goodies_cypress class methodsFor:'documentation'! + +copyright +" +COPYRIGHT (c) 2020 LabWare + +" +! ! !stx_goodies_cypress class methodsFor:'description'! @@ -26,7 +37,8 @@ are extended by myself. They are mandatory, because we need these packages as a prerequisite for loading and compiling. This method is generated automatically, - by searching along the inheritance chain of all of my classes." + by searching along the inheritance chain of all of my classes. + Please take a look at the #referencedPreRequisites method as well." ^ #( #'stx:libbasic' "ArithmeticValue - extended" @@ -36,12 +48,13 @@ referencedPreRequisites "list packages which are a prerequisite, because they contain classes which are referenced by my classes. - We do not need these packages as a prerequisite for compiling or loading, + These packages are NOT needed as a prerequisite for compiling or loading, however, a class from it may be referenced during execution and having it unloaded then may lead to a runtime doesNotUnderstand error, unless the caller includes explicit checks for the package being present. This method is generated automatically, - by searching all classes (and their packages) which are referenced by my classes." + by searching all classes (and their packages) which are referenced by my classes. + Please also take a look at the #mandatoryPreRequisites method" ^ #( #'stx:libbasic3' "ChangeSet - referenced by CypressModel>>asChangeSet" @@ -86,16 +99,16 @@ ! extensionMethodNames - "list class/selector pairs of extensions. - A correponding method with real names must be present in my concrete subclasses" + "lists the extension methods which are to be included in the project. + Entries are 2-element array literals, consisting of class-name and selector. + A correponding method with real names must be present in my concrete subclasses + if it has extensions." ^ #( - CharacterArray withLineEndings: 'CharacterArray class' lfString Array asCypressPropertyObject Array writeCypressJsonOn:forHtml:indent: Boolean writeCypressJsonOn:forHtml:indent: - Character isSafeForHTTP Class asCypressClassDefinition Dictionary asCypressPropertyObject Dictionary writeCypressJsonOn:forHtml:indent: diff -r 6655e15a12d7 -r 443911ff729a stx_goodies_cypressWINrc.rc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/stx_goodies_cypressWINrc.rc Wed Jul 08 11:26:45 2020 +0100 @@ -0,0 +1,37 @@ +// +// DO NOT EDIT +// automagically generated from the projectDefinition: stx_goodies_cypress. +// +VS_VERSION_INFO VERSIONINFO + FILEVERSION 8,0,32767,32767 + PRODUCTVERSION 8,0,99,0 +#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" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", "Jan Vrany\0" + VALUE "FileDescription", "Cypress Package Format Reader/Writer (LIB)\0" + VALUE "FileVersion", "8.0.32767.32767\0" + VALUE "InternalName", "stx:goodies/cypress\0" + VALUE "LegalCopyright", "Copyright Jan Vrany & Dale Henrichs 2012\0" + VALUE "ProductName", "Cypress\0" + VALUE "ProductVersion", "8.0.99.0\0" + VALUE "ProductDate", "Wed, 08 Jul 2020 10:25:49 GMT\0" + END + + END + + BLOCK "VarFileInfo" + BEGIN // Language | Translation + VALUE "Translation", 0x409, 0x4E4 // U.S. English, Windows Multilingual + END +END diff -r 6655e15a12d7 -r 443911ff729a vcmake.bat --- a/vcmake.bat Thu Aug 01 19:13:14 2019 +0100 +++ b/vcmake.bat Wed Jul 08 11:26:45 2020 +0100 @@ -19,3 +19,4 @@ +