- removed dependency on an obsolete libtool3
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 29 Oct 2012 10:41:23 +0000
changeset 40c99f058e2276
parent 39 d361eb9419e6
child 41 f3898a3b378d
- removed dependency on an obsolete libtool3
Make.proto
Make.spec
bc.mak
cvut_stx_goodies_newcompiler.st
lccmake.bat
libInit.cc
mingwmake.bat
newcompiler.rc
     1.1 --- a/Make.proto	Mon Sep 17 09:03:06 2012 +0000
     1.2 +++ b/Make.proto	Mon Oct 29 10:41:23 2012 +0000
     1.3 @@ -34,7 +34,7 @@
     1.4  # add the path(es) here:,
     1.5  # ********** OPTIONAL: MODIFY the next lines ***
     1.6  # LOCALINCLUDES=-Ifoo -Ibar
     1.7 -LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/parser -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libcompat -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp
     1.8 +LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/parser -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libcompat -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libtool
     1.9  
    1.10  
    1.11  # if you need any additional defines for embedded C code,
    1.12 @@ -140,14 +140,12 @@
    1.13  
    1.14  # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
    1.15  $(OUTDIR)IRBuilder.$(O) IRBuilder.$(H): IRBuilder.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
    1.16 -$(OUTDIR)IRBuilderTest.$(O) IRBuilderTest.$(H): IRBuilderTest.st $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
    1.17  $(OUTDIR)IRBytecodeGenerator.$(O) IRBytecodeGenerator.$(H): IRBytecodeGenerator.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
    1.18  $(OUTDIR)IRFunction.$(O) IRFunction.$(H): IRFunction.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
    1.19  $(OUTDIR)IRInstruction.$(O) IRInstruction.$(H): IRInstruction.st $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
    1.20  $(OUTDIR)IRInterpreter.$(O) IRInterpreter.$(H): IRInterpreter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
    1.21  $(OUTDIR)IRSequence.$(O) IRSequence.$(H): IRSequence.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
    1.22  $(OUTDIR)IRStackCount.$(O) IRStackCount.$(H): IRStackCount.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
    1.23 -$(OUTDIR)IRTransformTest.$(O) IRTransformTest.$(H): IRTransformTest.st $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
    1.24  $(OUTDIR)cvut_stx_goodies_newcompiler.$(O) cvut_stx_goodies_newcompiler.$(H): cvut_stx_goodies_newcompiler.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
    1.25  $(OUTDIR)IRAccess.$(O) IRAccess.$(H): IRAccess.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
    1.26  $(OUTDIR)IRClosure.$(O) IRClosure.$(H): IRClosure.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
     2.1 --- a/Make.spec	Mon Sep 17 09:03:06 2012 +0000
     2.2 +++ b/Make.spec	Mon Oct 29 10:41:23 2012 +0000
     2.3 @@ -51,14 +51,12 @@
     2.4  
     2.5  COMMON_CLASSES= \
     2.6  	IRBuilder \
     2.7 -	IRBuilderTest \
     2.8  	IRBytecodeGenerator \
     2.9  	IRFunction \
    2.10  	IRInstruction \
    2.11  	IRInterpreter \
    2.12  	IRSequence \
    2.13  	IRStackCount \
    2.14 -	IRTransformTest \
    2.15  	cvut_stx_goodies_newcompiler \
    2.16  	IRAccess \
    2.17  	IRClosure \
    2.18 @@ -91,14 +89,12 @@
    2.19  
    2.20  COMMON_OBJS= \
    2.21      $(OUTDIR)IRBuilder.$(O) \
    2.22 -    $(OUTDIR)IRBuilderTest.$(O) \
    2.23      $(OUTDIR)IRBytecodeGenerator.$(O) \
    2.24      $(OUTDIR)IRFunction.$(O) \
    2.25      $(OUTDIR)IRInstruction.$(O) \
    2.26      $(OUTDIR)IRInterpreter.$(O) \
    2.27      $(OUTDIR)IRSequence.$(O) \
    2.28      $(OUTDIR)IRStackCount.$(O) \
    2.29 -    $(OUTDIR)IRTransformTest.$(O) \
    2.30      $(OUTDIR)cvut_stx_goodies_newcompiler.$(O) \
    2.31      $(OUTDIR)IRAccess.$(O) \
    2.32      $(OUTDIR)IRClosure.$(O) \
     3.1 --- a/bc.mak	Mon Sep 17 09:03:06 2012 +0000
     3.2 +++ b/bc.mak	Mon Oct 29 10:41:23 2012 +0000
     3.3 @@ -34,7 +34,7 @@
     3.4  
     3.5  
     3.6  
     3.7 -LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\parser -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libcompat -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libcomp
     3.8 +LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\parser -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libcompat -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libtool
     3.9  LOCALDEFINES=
    3.10  
    3.11  STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
    3.12 @@ -76,14 +76,12 @@
    3.13  
    3.14  # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
    3.15  $(OUTDIR)IRBuilder.$(O) IRBuilder.$(H): IRBuilder.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
    3.16 -$(OUTDIR)IRBuilderTest.$(O) IRBuilderTest.$(H): IRBuilderTest.st $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
    3.17  $(OUTDIR)IRBytecodeGenerator.$(O) IRBytecodeGenerator.$(H): IRBytecodeGenerator.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
    3.18  $(OUTDIR)IRFunction.$(O) IRFunction.$(H): IRFunction.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
    3.19  $(OUTDIR)IRInstruction.$(O) IRInstruction.$(H): IRInstruction.st $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
    3.20  $(OUTDIR)IRInterpreter.$(O) IRInterpreter.$(H): IRInterpreter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
    3.21  $(OUTDIR)IRSequence.$(O) IRSequence.$(H): IRSequence.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
    3.22  $(OUTDIR)IRStackCount.$(O) IRStackCount.$(H): IRStackCount.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
    3.23 -$(OUTDIR)IRTransformTest.$(O) IRTransformTest.$(H): IRTransformTest.st $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
    3.24  $(OUTDIR)cvut_stx_goodies_newcompiler.$(O) cvut_stx_goodies_newcompiler.$(H): cvut_stx_goodies_newcompiler.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
    3.25  $(OUTDIR)IRAccess.$(O) IRAccess.$(H): IRAccess.st $(INCLUDE_TOP)\cvut\stx\goodies\newcompiler\IRInstruction.$(H) $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
    3.26  $(OUTDIR)IRClosure.$(O) IRClosure.$(H): IRClosure.st $(INCLUDE_TOP)\cvut\stx\goodies\newcompiler\IRFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
     4.1 --- a/cvut_stx_goodies_newcompiler.st	Mon Sep 17 09:03:06 2012 +0000
     4.2 +++ b/cvut_stx_goodies_newcompiler.st	Mon Oct 29 10:41:23 2012 +0000
     4.3 @@ -11,33 +11,44 @@
     4.4  !cvut_stx_goodies_newcompiler class methodsFor:'description'!
     4.5  
     4.6  preRequisites
     4.7 +    "list all required packages.
     4.8 +     This list can be maintained manually or (better) generated and
     4.9 +     updated by scanning the superclass hierarchies and looking for
    4.10 +     global variable accesses. (the browser has a menu function for that)
    4.11 +     Howevery, often too much is found, and you may want to explicitely
    4.12 +     exclude individual packages in the #excludedFromPrerequisites method."
    4.13 +
    4.14      ^ #(
    4.15 -        #'stx:goodies/refactoryBrowser/parser'    "RBIdentifierToken - referenced by IRDecompiler>>newVar: "
    4.16 -        #'stx:goodies/sunit'    "TestCase - superclass of IRTransformTest "
    4.17 -        #'stx:libbasic'    "Link - superclass of IRLine "
    4.18 +        #'stx:goodies/refactoryBrowser/parser'    "RBReturnNode - referenced by IRDecompiler>>addReturn:from: "
    4.19 +        #'stx:goodies/sunit'    "TestAsserter - superclass of IRTransformTest "
    4.20 +        #'stx:libbasic'    "Link - superclass of IRSend "
    4.21          #'stx:libbasic2'    "OrderedDictionary - referenced by IRBytecodeGenerator>>initialize "
    4.22 -        #'stx:libcomp'    "PrimitiveNode - referenced by IRFunction>>initialize "
    4.23 +        #'stx:libcomp'    "Parser - superclass of extended ByteCodeCompiler "
    4.24          #'stx:libcompat'    "Preferences - referenced by IRDecompiler>>removeClosureCreation: "
    4.25 -        #'stx:libwidg'    "ScrollableView - referenced by IRFunction>>inspector2TabIRCode "
    4.26 +        #'stx:libtool'    "Tools::Inspector2Tab - referenced by IRFunction>>inspector2TabIRCode "
    4.27 +        #'stx:libwidg'    "TextView - referenced by IRFunction>>inspector2TabIRCode "
    4.28      )
    4.29 -
    4.30 -    "Modified: / 17-09-2012 / 09:58:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
    4.31  ! !
    4.32  
    4.33  !cvut_stx_goodies_newcompiler class methodsFor:'description - contents'!
    4.34  
    4.35  classNamesAndAttributes
    4.36 +    "lists the classes which are to be included in the project.
    4.37 +     Each entry in the list may be: a single class-name (symbol),
    4.38 +     or an array-literal consisting of class name and attributes.
    4.39 +     Attributes are: #autoload or #<os> where os is one of win32, unix,..."
    4.40 +
    4.41      ^ #(
    4.42          "<className> or (<className> attributes...) in load order"
    4.43          IRBuilder
    4.44 -        IRBuilderTest
    4.45 +        (IRBuilderTest autoload)
    4.46          IRBytecodeGenerator
    4.47          IRFunction
    4.48          IRInstruction
    4.49          IRInterpreter
    4.50          IRSequence
    4.51          IRStackCount
    4.52 -        IRTransformTest
    4.53 +        (IRTransformTest autoload)
    4.54          #'cvut_stx_goodies_newcompiler'
    4.55          IRAccess
    4.56          IRClosure
    4.57 @@ -68,6 +79,9 @@
    4.58  !
    4.59  
    4.60  extensionMethodNames
    4.61 +    "lists the extension methods which are to be included in the project.
    4.62 +     Entries are 2-element array literals, consisting of class-name and selector."
    4.63 +
    4.64      ^ #(
    4.65          ByteCodeCompiler literalArray:
    4.66          Class binding
    4.67 @@ -124,9 +138,9 @@
    4.68      "Return a SVN revision number of myself.
    4.69       This number is updated after a commit"
    4.70  
    4.71 -    ^ "$SVN-Revision:"nil"$"
    4.72 +    ^ "$SVN-Revision:"'nil'"$"
    4.73  
    4.74 -    "Modified: / 17-09-2012 / 10:02:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
    4.75 +    "Modified: / 29-10-2012 / 10:42:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
    4.76  ! !
    4.77  
    4.78  !cvut_stx_goodies_newcompiler class methodsFor:'documentation'!
     5.1 --- a/lccmake.bat	Mon Sep 17 09:03:06 2012 +0000
     5.2 +++ b/lccmake.bat	Mon Oct 29 10:41:23 2012 +0000
     5.3 @@ -3,6 +3,6 @@
     5.4  @REM type lccmake, and wait...
     5.5  @REM do not edit - automatically generated from ProjectDefinition
     5.6  @REM -------
     5.7 -make.exe -N -f bc.mak USELCC=1 %*
     5.8 +make.exe -N -f bc.mak -DUSELCC=1 %*
     5.9  
    5.10  
     6.1 --- a/libInit.cc	Mon Sep 17 09:03:06 2012 +0000
     6.2 +++ b/libInit.cc	Mon Oct 29 10:41:23 2012 +0000
     6.3 @@ -28,14 +28,12 @@
     6.4  OBJ snd; struct __vmData__ *__pRT__; {
     6.5  __BEGIN_PACKAGE2__("libcvut_stx_goodies_newcompiler", _libcvut_stx_goodies_newcompiler_Init, "cvut:stx/goodies/newcompiler");
     6.6  _IRBuilder_Init(pass,__pRT__,snd);
     6.7 -_IRBuilderTest_Init(pass,__pRT__,snd);
     6.8  _IRBytecodeGenerator_Init(pass,__pRT__,snd);
     6.9  _IRFunction_Init(pass,__pRT__,snd);
    6.10  _IRInstruction_Init(pass,__pRT__,snd);
    6.11  _IRInterpreter_Init(pass,__pRT__,snd);
    6.12  _IRSequence_Init(pass,__pRT__,snd);
    6.13  _IRStackCount_Init(pass,__pRT__,snd);
    6.14 -_IRTransformTest_Init(pass,__pRT__,snd);
    6.15  _cvut_137stx_137goodies_137newcompiler_Init(pass,__pRT__,snd);
    6.16  _IRAccess_Init(pass,__pRT__,snd);
    6.17  _IRClosure_Init(pass,__pRT__,snd);
     7.1 --- a/mingwmake.bat	Mon Sep 17 09:03:06 2012 +0000
     7.2 +++ b/mingwmake.bat	Mon Oct 29 10:41:23 2012 +0000
     7.3 @@ -3,6 +3,6 @@
     7.4  @REM type mingwmake, and wait...
     7.5  @REM do not edit - automatically generated from ProjectDefinition
     7.6  @REM -------
     7.7 -make.exe -N -f bc.mak USEMINGW=1 %*
     7.8 +make.exe -N -f bc.mak -DUSEMINGW=1 %*
     7.9  
    7.10  
     8.1 --- a/newcompiler.rc	Mon Sep 17 09:03:06 2012 +0000
     8.2 +++ b/newcompiler.rc	Mon Oct 29 10:41:23 2012 +0000
     8.3 @@ -25,7 +25,7 @@
     8.4        VALUE "LegalCopyright", "Copyright Jan Vrany & Mathieu Suen 2008\0"
     8.5        VALUE "ProductName", "NewCompiler\0"
     8.6        VALUE "ProductVersion", "6.2.3.1\0"
     8.7 -      VALUE "ProductDate", "Mon, 17 Sep 2012 09:03:27 GMT\0"
     8.8 +      VALUE "ProductDate", "Mon, 29 Oct 2012 10:43:04 GMT\0"
     8.9      END
    8.10  
    8.11    END