# HG changeset patch # User claus # Date 795504614 -3600 # Node ID db5d473df9f0bbeca543b989eea1adaa7a5177eb # Parent 6cb30063ea41ffd896e07fd4b17c6fbeac64c864 *** empty log message *** diff -r 6cb30063ea41 -r db5d473df9f0 Make.proto --- a/Make.proto Wed Feb 22 03:49:28 1995 +0100 +++ b/Make.proto Sat Mar 18 06:30:14 1995 +0100 @@ -34,10 +34,10 @@ # to the bitmaps subdirectory # BITMAPDIRS= \ - $(LIBBASIC2DIR) $(LIBVIEWDIR) $(LIBWIDGDIR) \ - $(LIBWIDG2DIR) $(LIBWIDG3DIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]* \ - $(OTHERLIBDIRS) \ - $(TOP)/fileIn $(TOP)/fileIn/* $(TOP)/libtomcat $(TOP)/goodies \ + $(LIBBASIC2DIR) $(LIBVIEWDIR) $(LIBWIDGDIR) $(LIBWIDG2DIR) \ + $(LIBWIDG3DIR) $(LIBTABLEDIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]* \ + $(OTHERLIBDIRS) \ + $(TOP)/fileIn $(TOP)/fileIn/* $(TOP)/libtomcat $(TOP)/goodies \ $(TOP)/goodies/* $(TOP)/goodies/*/* # @@ -45,10 +45,10 @@ # to the binary subdirectory # BINARYDIRS= \ - $(LIBBASICDIR) $(LIBBASIC2DIR) $(LIBVIEWDIR) $(LIBWIDGDIR) \ - $(LIBWIDG2DIR) $(LIBWIDG3DIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]* \ - $(LIBCOMPDIR) $(OTHERLIBDIRS) \ - $(TOP)/fileIn $(TOP)/libtomcat $(TOP)/goodies $(TOP)/goodies/* \ + $(LIBBASICDIR) $(LIBBASIC2DIR) $(LIBVIEWDIR) $(LIBWIDGDIR) \ + $(LIBWIDG2DIR) $(LIBWIDG3DIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]* \ + $(LIBCOMPDIR) $(LIBTABLEDIR) $(OTHERLIBDIRS) \ + $(TOP)/fileIn $(TOP)/libtomcat $(TOP)/goodies $(TOP)/goodies/* \ $(TOP)/goodies/*/* # @@ -56,11 +56,11 @@ # to the source subdirectory # SOURCEDIRS= \ - $(LIBBASICDIR) $(LIBBASIC2DIR) $(LIBCOMPDIR) $(LIBVIEWDIR) $(LIBWIDGDIR) \ - $(LIBWIDG2DIR) $(LIBWIDG3DIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]* \ - $(OTHERLIBDIRS) \ - $(TOP)/fileIn $(TOP)/libtomcat $(TOP)/goodies $(TOP)/goodies/* \ - $(TOP)/goodies/*/* + $(LIBBASICDIR) $(LIBBASIC2DIR) $(LIBCOMPDIR) $(LIBVIEWDIR) $(LIBWIDGDIR) \ + $(LIBWIDG2DIR) $(LIBWIDG3DIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]* \ + $(LIBTABLEDIR) $(OTHERLIBDIRS) \ + $(TOP)/fileIn $(TOP)/libtomcat $(TOP)/goodies $(TOP)/goodies/* \ + $(TOP)/goodies/*/* # # including your own private lib in the make process and executable: @@ -149,7 +149,7 @@ @-rm classList.stc classList.c @$(MAKE) GENERICLIST CLASSLIST=classList.stc \ EXTRA_CLASSES="$(EXTRA_CLASSES)" \ - LIBLIST="$(LIBLIST)" \ + LIBLIST="$(LIBLIST)" \ CLASSLIBRARIES=" \ $(LIBLIST) \ $(OTHERLIBRARIES) \ @@ -162,6 +162,9 @@ # # dont want this abbrev.stc be included ... # +abbrev.stc:: + -rm ttt*.* + collectAbbrev:: -rm abbrev.stc @@ -185,10 +188,11 @@ $(MAKE) include include: + -rm ttt*.H -mkdir include -(cd include; $(LNS) ../$(INCLUDE)/abbrev.stc .) - -if [ -f $(INCLUDE)/symbols.stc ]; then \ - (cd include; $(LNS) ../$(INCLUDE)/symbols.stc .); \ + -if [ -f $(INCLUDE)/symbols.stc ]; then \ + (cd include; $(LNS) ../$(INCLUDE)/symbols.stc .); \ fi rm -f include/RCS @@ -231,6 +235,7 @@ -rm -f a.out changes SymbolTable ttt main.c -rm -f classList.c fclassList.c nxclassList.c basicclassList.c -rm -f betaclassList.c miniList.c tinyList.c + -rm -f pers* pers2 data data2 data.boss tetris.scores # # clean out all that is not needed to run smalltalk @@ -244,6 +249,8 @@ -rm -f betaclassList.stc betaclassList.c -rm -f miniList.stc miniList.c -rm -f tinyList.stc tinyList.c + -rm -f pers pers2 data data2 data.boss tetris.scores + -rm -f st.img st2.img # # clean out all that can be regenerated @@ -262,6 +269,8 @@ resources: -mkdir resources + $(MAKE) resourceLink +resourceLink: -if [ "`echo $(LIBBASICDIR)/resources/*`" != '$(LIBBASICDIR)/resources/*' ]; then \ (cd resources; $(LNS) ../$(LIBBASICDIR)/resources/* .); \ rm -f resources/RCS; \ @@ -286,6 +295,10 @@ (cd resources; $(LNS) ../$(LIBTOOLDIR)/resources/* .); \ rm -f resources/RCS; \ fi + -if [ "`echo $(LIBTABLEDIR)/resources/*`" != '$(LIBTABLEDIR)/resources/*' ]; then \ + (cd resources; $(LNS) ../$(LIBTABLEDIR)/resources/* .); \ + rm -f resources/RCS; \ + fi -if [ "`echo $(TOP)/fileIn/resources/*`" != '$(TOP)/fileIn/resources/*' ]; then \ (cd resources; $(LNS) ../$(TOP)/fileIn/resources/* .); \ rm -f resources/RCS; \ diff -r 6cb30063ea41 -r db5d473df9f0 patches --- a/patches Wed Feb 22 03:49:28 1995 +0100 +++ b/patches Sat Mar 18 06:30:14 1995 +0100 @@ -196,7 +196,7 @@ RDoItServer - HandlerCollection VariableArray Text + HandlerCollection VariableArray StringCollection ). optionalViews do:[:s | @@ -303,7 +303,6 @@ ClickMenuView CodeView DialogBox - DialogView EnterFieldGroup EditTextView EditField @@ -370,7 +369,17 @@ OrderedCollectionInspectorView ProjectView SystemBrowser + BrowserView + UIPainter + + TableView + TableSpecification + TableRowHandle + TableColumnView + TableColumnSpecification + SelTableColumnSpecification + TableDemoElement ). optionalClasses do:[:s | @@ -407,7 +416,6 @@ ActionMenu FillInTheBlank KeyedSet - DialogView FormView NoController MouseMenuController @@ -416,6 +424,7 @@ ComposedTextView StringHolder ClassOrganization + ApplicationModel ). compat do:[:s | @@ -451,7 +460,8 @@ Smalltalk at:#UnixSocketAccessor put:Socket ]. Smalltalk at:#BlockClosure put:Block. -Smalltalk at:#AbstractString put:CharacterArray. +Smalltalk at:#Dialog put:DialogBox. +Smalltalk at:#DialogView put:DialogBox. FileDirectory notNil ifTrue:[ Smalltalk at:#Disk put:(FileDirectory directoryNamed:'/') @@ -467,6 +477,11 @@ Smalltalk at:#Double put:Float. "/ +"/ compatibility leftOver: Text has been renamed to StringCollection +"/ +Smalltalk at:#Text put:StringCollection. + +"/ "/ the following patches where added by the changesBrowsers 'make change a patch' "/ function ... "/ diff -r 6cb30063ea41 -r db5d473df9f0 private.rc --- a/private.rc Wed Feb 22 03:49:28 1995 +0100 +++ b/private.rc Sat Mar 18 06:30:14 1995 +0100 @@ -10,6 +10,14 @@ Smalltalk systemPath addFirst:'../..'. " + add my private directory to the searchPath ... +" +OperatingSystem getLoginName = 'claus' ifTrue:[ + Smalltalk systemPath addFirst:'/phys/clam/claus/smalltalk/not_delivered'. + Smalltalk systemPath addFirst:'/phys/clam/claus/smalltalk/private_classes'. +]. + +" color allocation strategy: the default is to allocate from the colormap as required. @@ -43,12 +51,14 @@ OperatingSystem getLoginName = 'claus' ifTrue:[ Compiler warnSTXSpecials:false. Compiler allowUnderscoreInIdentifier:true. + Compiler warnUnderscoreInIdentifier:false. ]. " this is a temporary kludge: specify the flags to be used when compiling via stc. Primitive compilation (from within the browser) is still experimental. So you better not care (yet) + BTW: its only supported on UnixWare and SGI anyway. " OperatingSystem getOSType = 'irix' ifTrue:[ Compiler stcCompilationFlags:'-I../../include +optinline -DGLX'. @@ -58,6 +68,16 @@ ! " + experimental: try to always keep some bytes in the pocket +" +OperatingSystem getLoginName = 'claus' ifTrue:[ + ObjectMemory freeSpaceGCLimit:1000000. + ObjectMemory startBackgroundCollectorAt:5. + ObjectMemory startBackgroundFinalizationAt:5. +] +! + +" another experimental (and a secret) Playing around with GC parameters (aging params) " @@ -65,7 +85,9 @@ ObjectMemory newSpaceSize > (500*1024) ifTrue:[ a := #(nil nil nil nil -16 -4 -2 -2 0 0 16 nil) copy. ] ifFalse:[ - a := #(nil nil nil nil -16 -4 0 0 0 4 16 nil) copy. +"/ a := #(nil nil nil nil -16 -4 0 0 0 4 16 nil) copy. +"/ a := #(nil nil nil nil -20 -8 -3 -1 0 4 16 nil) copy. + a := #(nil nil nil nil -20 -8 -3 -1 -1 1 16 nil) copy. ]. ObjectMemory tenureParameters:a. ! diff -r 6cb30063ea41 -r db5d473df9f0 smalltalk.rc --- a/smalltalk.rc Wed Feb 22 03:49:28 1995 +0100 +++ b/smalltalk.rc Sat Mar 18 06:30:14 1995 +0100 @@ -64,8 +64,10 @@ '***** directory(s) named: ' errorPrint. missing errorPrint. 'incomplete/not existing' errorPrintNL. '***** your path is: ' errorPrint. Smalltalk systemPath asArray storeString errorPrintNL. + '*****' errorPrintNL. - '***** Try "make source bitmaps resources styles" to fix this.' errorPrintNL. + '***** Try: "make source bitmaps resources styles"' errorPrintNL. + '***** or: "make symlinks" to fix this.' errorPrintNL. '***********************************************************************' errorPrintNL. ] ! @@ -94,27 +96,36 @@ "/ Display unBuffered. "* - * this starts incremental GC earlier + * this starts the incremental GC earlier * (default is 500000) * the number given is the number of bytes which have to be allocated * since the last GC, to start the incremental GC running. + * (see ObjectMemory>>documentation) + * Claus: I moved this to the private.rc file *" "/ ObjectMemory incrementalGCLimit:100000. "* + * this starts the incremental GC when freeSpace drops below a limit + * (default is nil - i.e. dont look at freeSpace) + * (see ObjectMemory>>documentation) + * Claus: I moved this to the private.rc file + *" +"/ ObjectMemory freeSpaceGCLimit:300000. + +"* * lazy loading * (faster fileIn) - this is EXPERIMENTAL. * If there are any problems with lazy methods, disable the following * and let me (cg@ssw.de) know what happened. *" - Autoload compileLazy:true. "* * define the language (you can also set the LANG-shell variable) * (currently only #english and #german are supported) * setting it here will override the LANG variable setting, - * if neither set here nor in LANG, english is the default. + * if neither set here nor in LANG, #english is the default. * (currently, strings are not available for other than english * and german; french will follow next - see resource files) *" diff -r 6cb30063ea41 -r db5d473df9f0 smalltalk_r.rc --- a/smalltalk_r.rc Wed Feb 22 03:49:28 1995 +0100 +++ b/smalltalk_r.rc Sat Mar 18 06:30:14 1995 +0100 @@ -9,22 +9,19 @@ * notice, that all views and things have already been restored when this * script is run .... *" -" -MessageTracer trapMethod:(View class compiledMethodAt:#defaultStyle:). -" "* * this handles all variant display stuff * (i.e. things which might change, when DISPLAY is set different) *" -Smalltalk fileIn:'display.rc' -! +Smalltalk fileIn:'display.rc'. + "* * this defines stuff relating to the machine we are running on * (which may also be different after a snapIn) *" -Smalltalk fileIn:'host.rc' +Smalltalk fileIn:'host.rc'. ! "*