Removed dependency on SUnit
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 25 Sep 2015 21:58:10 +0100
changeset 17 ee807ff2f897
parent 16 17a2d1d9f205
child 18 e2168260b75a
Removed dependency on SUnit
compiler/Make.proto
compiler/abbrev.stc
compiler/bc.mak
compiler/cli/Make.proto
compiler/cli/TCompilerCommand.st
compiler/cli/bc.mak
compiler/cli/builder/baseline.rbspec
compiler/cli/builder/package.deps.rake
compiler/cli/modules.stx
compiler/jv_tea_compiler.st
--- a/compiler/Make.proto	Fri Sep 25 03:51:15 2015 +0100
+++ b/compiler/Make.proto	Fri Sep 25 21:58:10 2015 +0100
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/jv/llvm_s -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/parser -I$(INCLUDE_TOP)/stx/goodies/ring -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3
+LOCALINCLUDES= -I$(INCLUDE_TOP)/jv/llvm_s -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/parser -I$(INCLUDE_TOP)/stx/goodies/ring -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3
 
 
 # if you need any additional defines for embedded C code,
@@ -102,13 +102,9 @@
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
 	cd $(TOP)/libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../llvm_s && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/goodies/ring && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd $(TOP)/libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd $(TOP)/libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd $(TOP)/libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd $(TOP)/goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../llvm_s && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 
 
--- a/compiler/abbrev.stc	Fri Sep 25 03:51:15 2015 +0100
+++ b/compiler/abbrev.stc	Fri Sep 25 21:58:10 2015 +0100
@@ -5,24 +5,18 @@
 TCompilationUnitDefinition TCompilationUnitDefinition jv:tea/compiler 'Languages-Tea-Compiler-Model' 0
 TCompiler TCompiler jv:tea/compiler 'Languages-Tea-Compiler' 0
 TCompilerError TCompilerError jv:tea/compiler 'Languages-Tea-Compiler-Exceptions' 1
-TCompilerExamples TCompilerExamples jv:tea/compiler 'Languages-Tea-Compiler-Examples' 1
 TEnvironmentProvider TEnvironmentProvider jv:tea/compiler 'Languages-Tea-Compiler-Model-Provider' 0
 TFormatter TFormatter jv:tea/compiler 'Languages-Tea-Compiler-AST' 0
 TMetaDefinition TMetaDefinition jv:tea/compiler 'Languages-Tea-Compiler-Model' 0
 TMethodDefinition TMethodDefinition jv:tea/compiler 'Languages-Tea-Compiler-Model' 0
-TMethodDefinitionTests TMethodDefinitionTests jv:tea/compiler 'Languages-Tea-Compiler-Model-Tests' 1
 TNamespaceDefinition TNamespaceDefinition jv:tea/compiler 'Languages-Tea-Compiler-Model' 0
 TObjectWithProperties TObjectWithProperties jv:tea/compiler 'Languages-Tea-Compiler-Internals' 0
 TParser TParser jv:tea/compiler 'Languages-Tea-Compiler-AST' 0
-TParserTests TParserTests jv:tea/compiler 'Languages-Tea-Compiler-AST-Tests' 1
 TProgramNodeVisitor TProgramNodeVisitor jv:tea/compiler 'Languages-Tea-Compiler-AST' 0
-TSemanticAnalyserTests TSemanticAnalyserTests jv:tea/compiler 'Languages-Tea-Compiler-Internals-Tests' 1
 TSourceReader TSourceReader jv:tea/compiler 'Languages-Tea-Compiler-Model' 0
-TSourceReaderTests TSourceReaderTests jv:tea/compiler 'Languages-Tea-Compiler-Model-Tests' 1
 TSpecialFormNode TSpecialFormNode jv:tea/compiler 'Languages-Tea-Compiler-AST' 0
 TTypeNode TTypeNode jv:tea/compiler 'Languages-Tea-Compiler-AST' 0
 TTypeSpecNode TTypeSpecNode jv:tea/compiler 'Languages-Tea-Compiler-AST' 0
-TTypecheckerTests TTypecheckerTests jv:tea/compiler 'Languages-Tea-Compiler-Internals-Tests' 1
 jv_tea_compiler jv_tea_compiler jv:tea/compiler '* Projects & Packages *' 3
 TBinding TBinding jv:tea/compiler 'Languages-Tea-Compiler-Bindings' 0
 TCompilerContext TCompilerContext jv:tea/compiler 'Languages-Tea-Compiler' 0
@@ -49,3 +43,9 @@
 TVariableBinding TVariableBinding jv:tea/compiler 'Languages-Tea-Compiler-Bindings' 0
 TArgumentBinding TArgumentBinding jv:tea/compiler 'Languages-Tea-Compiler-Bindings' 0
 TLocalBinding TLocalBinding jv:tea/compiler 'Languages-Tea-Compiler-Bindings' 0
+TCompilerExamples TCompilerExamples jv:tea/compiler 'Languages-Tea-Compiler-Examples' 1
+TMethodDefinitionTests TMethodDefinitionTests jv:tea/compiler 'Languages-Tea-Compiler-Model-Tests' 1
+TParserTests TParserTests jv:tea/compiler 'Languages-Tea-Compiler-AST-Tests' 1
+TSemanticAnalyserTests TSemanticAnalyserTests jv:tea/compiler 'Languages-Tea-Compiler-Internals-Tests' 1
+TSourceReaderTests TSourceReaderTests jv:tea/compiler 'Languages-Tea-Compiler-Model-Tests' 1
+TTypecheckerTests TTypecheckerTests jv:tea/compiler 'Languages-Tea-Compiler-Internals-Tests' 1
--- a/compiler/bc.mak	Fri Sep 25 03:51:15 2015 +0100
+++ b/compiler/bc.mak	Fri Sep 25 21:58:10 2015 +0100
@@ -35,7 +35,7 @@
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\jv\llvm_s -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\parser -I$(INCLUDE_TOP)\stx\goodies\ring -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3
+LOCALINCLUDES= -I$(INCLUDE_TOP)\jv\llvm_s -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\parser -I$(INCLUDE_TOP)\stx\goodies\ring -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -52,13 +52,9 @@
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
 	pushd ..\..\..\stx\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\llvm_s & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\goodies\ring & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\stx\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\stx\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\stx\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\stx\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\llvm_s & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 
--- a/compiler/cli/Make.proto	Fri Sep 25 03:51:15 2015 +0100
+++ b/compiler/cli/Make.proto	Fri Sep 25 21:58:10 2015 +0100
@@ -60,12 +60,33 @@
 #
 
 REQUIRED_LIBS= libstx_libbasic \
+ libjv_llvm_s \
+ libstx_libbasic2 \
+ libstx_libcomp \
+ libstx_goodies_refactoryBrowser_parser \
+ libstx_libbasic3 \
+ libstx_goodies_ring \
+ libjv_tea_compiler \
 
 
 REQUIRED_LIBOBJS= $(TOP)/libbasic/libstx_libbasic$(O_EXT) \
+ ../../../llvm_s/libjv_llvm_s$(O_EXT) \
+ $(TOP)/libbasic2/libstx_libbasic2$(O_EXT) \
+ $(TOP)/libcomp/libstx_libcomp$(O_EXT) \
+ $(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser$(O_EXT) \
+ $(TOP)/libbasic3/libstx_libbasic3$(O_EXT) \
+ $(TOP)/goodies/ring/libstx_goodies_ring$(O_EXT) \
+ ..//libjv_tea_compiler$(O_EXT) \
 
 
 REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \
+ libjv_llvm_s$(O_EXT) \
+ libstx_libbasic2$(O_EXT) \
+ libstx_libcomp$(O_EXT) \
+ libstx_goodies_refactoryBrowser_parser$(O_EXT) \
+ libstx_libbasic3$(O_EXT) \
+ libstx_goodies_ring$(O_EXT) \
+ libjv_tea_compiler$(O_EXT) \
 
 
 REQUIRED_SUPPORT_DIRS=RESOURCEFILES
@@ -193,6 +214,97 @@
 $(TOP)/libbasic/makefile: $(TOP)/libbasic/Make.proto
 	$(TOP)/rules/stmkmf --cd $(TOP)/libbasic
 
+libjv_llvm_s.so: ../../../llvm_s/libjv_llvm_s.so
+	ln -sf ../../../llvm_s/libjv_llvm_s.so .
+
+../../../llvm_s/libjv_llvm_s.so: ../../../llvm_s/makefile $(FORCE)
+	@if [ -f "../../../llvm_s/.NOSOURCE" ]; then \
+	    echo "skip make in ../../../llvm_s (no source)"; \
+	else \
+	    cd ../../../llvm_s && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+../../../llvm_s/makefile: ../../../llvm_s/Make.proto
+	$(TOP)/rules/stmkmf --cd ../../../llvm_s
+
+libstx_libbasic2.so: $(TOP)/libbasic2/libstx_libbasic2.so
+	ln -sf $(TOP)/libbasic2/libstx_libbasic2.so .
+
+$(TOP)/libbasic2/libstx_libbasic2.so: $(TOP)/libbasic2/makefile $(FORCE)
+	@if [ -f "$(TOP)/libbasic2/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libbasic2 (no source)"; \
+	else \
+	    cd $(TOP)/libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libbasic2/makefile: $(TOP)/libbasic2/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libbasic2
+
+libstx_libcomp.so: $(TOP)/libcomp/libstx_libcomp.so
+	ln -sf $(TOP)/libcomp/libstx_libcomp.so .
+
+$(TOP)/libcomp/libstx_libcomp.so: $(TOP)/libcomp/makefile $(FORCE)
+	@if [ -f "$(TOP)/libcomp/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libcomp (no source)"; \
+	else \
+	    cd $(TOP)/libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libcomp/makefile: $(TOP)/libcomp/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libcomp
+
+libstx_goodies_refactoryBrowser_parser.so: $(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so
+	ln -sf $(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so .
+
+$(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so: $(TOP)/goodies/refactoryBrowser/parser/makefile $(FORCE)
+	@if [ -f "$(TOP)/goodies/refactoryBrowser/parser/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/goodies/refactoryBrowser/parser (no source)"; \
+	else \
+	    cd $(TOP)/goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/goodies/refactoryBrowser/parser/makefile: $(TOP)/goodies/refactoryBrowser/parser/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/goodies/refactoryBrowser/parser
+
+libstx_libbasic3.so: $(TOP)/libbasic3/libstx_libbasic3.so
+	ln -sf $(TOP)/libbasic3/libstx_libbasic3.so .
+
+$(TOP)/libbasic3/libstx_libbasic3.so: $(TOP)/libbasic3/makefile $(FORCE)
+	@if [ -f "$(TOP)/libbasic3/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libbasic3 (no source)"; \
+	else \
+	    cd $(TOP)/libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libbasic3/makefile: $(TOP)/libbasic3/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libbasic3
+
+libstx_goodies_ring.so: $(TOP)/goodies/ring/libstx_goodies_ring.so
+	ln -sf $(TOP)/goodies/ring/libstx_goodies_ring.so .
+
+$(TOP)/goodies/ring/libstx_goodies_ring.so: $(TOP)/goodies/ring/makefile $(FORCE)
+	@if [ -f "$(TOP)/goodies/ring/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/goodies/ring (no source)"; \
+	else \
+	    cd $(TOP)/goodies/ring && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/goodies/ring/makefile: $(TOP)/goodies/ring/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/goodies/ring
+
+libjv_tea_compiler.so: ..//libjv_tea_compiler.so
+	ln -sf ..//libjv_tea_compiler.so .
+
+..//libjv_tea_compiler.so: ..//makefile $(FORCE)
+	@if [ -f "..//.NOSOURCE" ]; then \
+	    echo "skip make in ../ (no source)"; \
+	else \
+	    cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+..//makefile: ..//Make.proto
+	$(TOP)/rules/stmkmf --cd ../
+
 
 
 
--- a/compiler/cli/TCompilerCommand.st	Fri Sep 25 03:51:15 2015 +0100
+++ b/compiler/cli/TCompilerCommand.st	Fri Sep 25 21:58:10 2015 +0100
@@ -482,5 +482,12 @@
     "Modified: / 24-09-2015 / 16:40:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!TCompilerCommand class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
 
 TCompilerCommand initialize!
--- a/compiler/cli/bc.mak	Fri Sep 25 03:51:15 2015 +0100
+++ b/compiler/cli/bc.mak	Fri Sep 25 21:58:10 2015 +0100
@@ -70,6 +70,13 @@
 
 REQUIRED_LIBS=librun.dll  \
  libstx_libbasic.dll \
+ libjv_llvm_s.dll \
+ libstx_libbasic2.dll \
+ libstx_libcomp.dll \
+ libstx_goodies_refactoryBrowser_parser.dll \
+ libstx_libbasic3.dll \
+ libstx_goodies_ring.dll \
+ libjv_tea_compiler.dll \
 
 
 REQUIRED_FILES=$(RT_DLL) $(X11_DLL) $(XEXT_DLL) symbols.stc $(REQUIRED_LIBS)
@@ -260,6 +267,48 @@
 ..\..\..\..\stx\libbasic\$(OBJDIR)\libstx_libbasic.dll: $(FORCE)
 	pushd ..\..\..\..\stx\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
+libjv_llvm_s.dll: ..\..\..\llvm_s\$(OBJDIR)\libjv_llvm_s.dll
+	copy ..\..\..\llvm_s\$(OBJDIR)\libjv_llvm_s.dll *.*
+
+..\..\..\llvm_s\$(OBJDIR)\libjv_llvm_s.dll: $(FORCE)
+	pushd ..\..\..\llvm_s & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
+libstx_libbasic2.dll: ..\..\..\..\stx\libbasic2\$(OBJDIR)\libstx_libbasic2.dll
+	copy ..\..\..\..\stx\libbasic2\$(OBJDIR)\libstx_libbasic2.dll *.*
+
+..\..\..\..\stx\libbasic2\$(OBJDIR)\libstx_libbasic2.dll: $(FORCE)
+	pushd ..\..\..\..\stx\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
+libstx_libcomp.dll: ..\..\..\..\stx\libcomp\$(OBJDIR)\libstx_libcomp.dll
+	copy ..\..\..\..\stx\libcomp\$(OBJDIR)\libstx_libcomp.dll *.*
+
+..\..\..\..\stx\libcomp\$(OBJDIR)\libstx_libcomp.dll: $(FORCE)
+	pushd ..\..\..\..\stx\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
+libstx_goodies_refactoryBrowser_parser.dll: ..\..\..\..\stx\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll
+	copy ..\..\..\..\stx\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll *.*
+
+..\..\..\..\stx\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll: $(FORCE)
+	pushd ..\..\..\..\stx\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
+libstx_libbasic3.dll: ..\..\..\..\stx\libbasic3\$(OBJDIR)\libstx_libbasic3.dll
+	copy ..\..\..\..\stx\libbasic3\$(OBJDIR)\libstx_libbasic3.dll *.*
+
+..\..\..\..\stx\libbasic3\$(OBJDIR)\libstx_libbasic3.dll: $(FORCE)
+	pushd ..\..\..\..\stx\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
+libstx_goodies_ring.dll: ..\..\..\..\stx\goodies\ring\$(OBJDIR)\libstx_goodies_ring.dll
+	copy ..\..\..\..\stx\goodies\ring\$(OBJDIR)\libstx_goodies_ring.dll *.*
+
+..\..\..\..\stx\goodies\ring\$(OBJDIR)\libstx_goodies_ring.dll: $(FORCE)
+	pushd ..\..\..\..\stx\goodies\ring & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
+libjv_tea_compiler.dll: ..\$(OBJDIR)\libjv_tea_compiler.dll
+	copy ..\$(OBJDIR)\libjv_tea_compiler.dll *.*
+
+..\$(OBJDIR)\libjv_tea_compiler.dll: $(FORCE)
+	pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
       
 
 
--- a/compiler/cli/builder/baseline.rbspec	Fri Sep 25 03:51:15 2015 +0100
+++ b/compiler/cli/builder/baseline.rbspec	Fri Sep 25 21:58:10 2015 +0100
@@ -15,6 +15,13 @@
   # --------
 
   package "stx:libbasic"
+  package "jv:llvm_s"
+  package "stx:libbasic2"
+  package "stx:libcomp"
+  package "stx:goodies/refactoryBrowser/parser"
+  package "stx:libbasic3"
+  package "stx:goodies/ring"
+  package "jv:tea/compiler"
 
 
   application "jv:tea/compiler/cli"
--- a/compiler/cli/builder/package.deps.rake	Fri Sep 25 03:51:15 2015 +0100
+++ b/compiler/cli/builder/package.deps.rake	Fri Sep 25 21:58:10 2015 +0100
@@ -2,131 +2,27 @@
 # Package dependencies.
 # Automatically generated by project defintion.
 
-task "stx:libview2" => "stx:libbasic"
-task "stx:libview2" => "stx:libbasic2"
-task "stx:libview2" => "stx:libview"
-task "stx:libview2" => "stx:libui"
-
-task "stx:goodies/refactoryBrowser/helpers" => "stx:libbasic"
-task "stx:goodies/refactoryBrowser/helpers" => "stx:libcomp"
-task "stx:goodies/refactoryBrowser/helpers" => "stx:libcompat"
+task "stx:goodies/refactoryBrowser/parser" => "stx:libbasic"
+task "stx:goodies/refactoryBrowser/parser" => "stx:libbasic2"
 
-task "stx:goodies/sunit" => "stx:libbasic"
-task "stx:goodies/sunit" => "stx:libview2"
-task "stx:goodies/sunit" => "stx:libbasic2"
-task "stx:goodies/sunit" => "stx:libview"
 
-task "stx:goodies/refactoryBrowser/browser" => "stx:goodies/refactoryBrowser/helpers"
-task "stx:goodies/refactoryBrowser/browser" => "stx:libbasic"
-task "stx:goodies/refactoryBrowser/browser" => "stx:libview2"
-task "stx:goodies/refactoryBrowser/browser" => "stx:goodies/refactoryBrowser/parser"
-task "stx:goodies/refactoryBrowser/browser" => "stx:libcompat"
-task "stx:goodies/refactoryBrowser/browser" => "stx:libview"
-task "stx:goodies/refactoryBrowser/browser" => "stx:libwidg"
+task "stx:libcomp" => "stx:libbasic"
 
 task "jv:tea/compiler" => "jv:llvm_s"
 task "jv:tea/compiler" => "stx:goodies/refactoryBrowser/parser"
 task "jv:tea/compiler" => "stx:goodies/ring"
-task "jv:tea/compiler" => "stx:goodies/sunit"
 task "jv:tea/compiler" => "stx:libbasic"
 task "jv:tea/compiler" => "stx:libbasic3"
 
-task "stx:libtool" => "stx:goodies/refactoryBrowser/parser"
-task "stx:libtool" => "stx:libbasic"
-task "stx:libtool" => "stx:libbasic2"
-task "stx:libtool" => "stx:libbasic3"
-task "stx:libtool" => "stx:libcomp"
-task "stx:libtool" => "stx:libui"
-task "stx:libtool" => "stx:libview"
-task "stx:libtool" => "stx:libview2"
-task "stx:libtool" => "stx:libwidg"
-task "stx:libtool" => "stx:libwidg2"
-task "stx:libtool" => "stx:libwidg3"
-
-task "stx:libboss" => "stx:libbasic"
-task "stx:libboss" => "stx:libbasic2"
-task "stx:libboss" => "stx:libview"
-
-task "stx:libcomp" => "stx:libbasic"
-
-task "stx:libcompat" => "stx:libbasic"
-task "stx:libcompat" => "stx:libbasic2"
-task "stx:libcompat" => "stx:libbasic3"
-task "stx:libcompat" => "stx:libview"
-task "stx:libcompat" => "stx:libview2"
-task "stx:libcompat" => "stx:libwidg"
-task "stx:libcompat" => "stx:libwidg2"
-
-task "stx:libui" => "stx:libbasic"
-task "stx:libui" => "stx:libview"
-
-
-task "stx:goodies/refactoryBrowser/parser" => "stx:libbasic"
-task "stx:goodies/refactoryBrowser/parser" => "stx:libbasic2"
-
 task "stx:libbasic3" => "stx:libbasic"
 task "stx:libbasic3" => "stx:libbasic2"
-task "stx:libbasic3" => "stx:libjavascript"
-
-task "stx:libhtml" => "stx:libbasic"
-task "stx:libhtml" => "stx:libview"
-task "stx:libhtml" => "stx:libwidg"
-
-task "stx:libwidg2" => "stx:libbasic"
-task "stx:libwidg2" => "stx:libbasic2"
-task "stx:libwidg2" => "stx:libview"
-task "stx:libwidg2" => "stx:libview2"
-task "stx:libwidg2" => "stx:libwidg"
-task "stx:libwidg2" => "stx:goodies/refactoryBrowser/browser"
-task "stx:libwidg2" => "stx:libboss"
-task "stx:libwidg2" => "stx:libjava"
-task "stx:libwidg2" => "stx:libjavascript"
-task "stx:libwidg2" => "stx:libui"
-
-task "stx:libbasic2" => "stx:libbasic"
-
-task "jv:llvm_s" => "stx:goodies/sunit"
-task "jv:llvm_s" => "stx:libbasic"
-
-task "stx:libwidg3" => "stx:libbasic"
-task "stx:libwidg3" => "stx:libui"
-task "stx:libwidg3" => "stx:libview"
-task "stx:libwidg3" => "stx:libview2"
-task "stx:libwidg3" => "stx:libwidg"
-task "stx:libwidg3" => "stx:libwidg2"
-task "stx:libwidg3" => "stx:libbasic2"
 
 task "stx:goodies/ring" => "stx:libbasic"
-task "stx:goodies/ring" => "stx:libcompat"
-
-task "stx:libwidg" => "stx:libbasic"
-task "stx:libwidg" => "stx:libview"
-task "stx:libwidg" => "stx:libview2"
-task "stx:libwidg" => "stx:libbasic2"
-task "stx:libwidg" => "stx:libbasic3"
-task "stx:libwidg" => "stx:libui"
-
+task "stx:goodies/ring" => "stx:goodies/refactoryBrowser/parser"
 
-task "stx:libjava" => "stx:libbasic"
-task "stx:libjava" => "stx:libbasic2"
-task "stx:libjava" => "stx:libbasic3"
-task "stx:libjava" => "stx:libview"
-task "stx:libjava" => "stx:libcomp"
-task "stx:libjava" => "stx:libhtml"
-task "stx:libjava" => "stx:libtool"
-task "stx:libjava" => "stx:libview2"
-task "stx:libjava" => "stx:libwidg"
-task "stx:libjava" => "stx:libwidg2"
+task "jv:llvm_s" => "stx:libbasic"
 
-task "stx:libjavascript" => "stx:libbasic"
-task "stx:libjavascript" => "stx:libbasic3"
-task "stx:libjavascript" => "stx:libcomp"
-task "stx:libjavascript" => "stx:libtool"
-task "stx:libjavascript" => "stx:goodies/refactoryBrowser/parser"
-task "stx:libjavascript" => "stx:goodies/webServer"
-task "stx:libjavascript" => "stx:libview2"
-
-task "stx:libview" => "stx:libbasic"
+task "stx:libbasic2" => "stx:libbasic"
 
 task "jv:tea/compiler/cli" => "stx:libbasic"
 task "jv:tea/compiler/cli" => "jv:tea/compiler"
--- a/compiler/cli/modules.stx	Fri Sep 25 03:51:15 2015 +0100
+++ b/compiler/cli/modules.stx	Fri Sep 25 21:58:10 2015 +0100
@@ -16,4 +16,11 @@
 # Others might be autoloaded or loaded explicit using "Smalltalk loadPackage:xxx".
 #
 libstx_libbasic
+libjv_llvm_s
+libstx_libbasic2
+libstx_libcomp
+libstx_goodies_refactoryBrowser_parser
+libstx_libbasic3
+libstx_goodies_ring
+libjv_tea_compiler
 
--- a/compiler/jv_tea_compiler.st	Fri Sep 25 03:51:15 2015 +0100
+++ b/compiler/jv_tea_compiler.st	Fri Sep 25 21:58:10 2015 +0100
@@ -63,7 +63,6 @@
         #'jv:llvm_s'    "LLVMAtomicOrdering - shared pool used by TLLVMCodeGenerator"
         #'stx:goodies/refactoryBrowser/parser'    "RBAssignmentNode - extended"
         #'stx:goodies/ring'    "RGAbstractContainer - superclass of TCompilationUnitDefinition"
-        #'stx:goodies/sunit'    "TestAsserter - superclass of TCompilerExamples"
         #'stx:libbasic'    "Error - superclass of TCompilerError"
     )
 !
@@ -107,24 +106,18 @@
         TCompilationUnitDefinition
         TCompiler
         TCompilerError
-        (TCompilerExamples autoload)
         TEnvironmentProvider
         TFormatter
         TMetaDefinition
         TMethodDefinition
-        (TMethodDefinitionTests autoload)
         TNamespaceDefinition
         TObjectWithProperties
         TParser
-        (TParserTests autoload)
         TProgramNodeVisitor
-        (TSemanticAnalyserTests autoload)
         TSourceReader
-        (TSourceReaderTests autoload)
         TSpecialFormNode
         TTypeNode
         TTypeSpecNode
-        (TTypecheckerTests autoload)
         #'jv_tea_compiler'
         TBinding
         TCompilerContext
@@ -151,6 +144,12 @@
         TVariableBinding
         TArgumentBinding
         TLocalBinding
+        (TCompilerExamples autoload)
+        (TMethodDefinitionTests autoload)
+        (TParserTests autoload)
+        (TSemanticAnalyserTests autoload)
+        (TSourceReaderTests autoload)
+        (TTypecheckerTests autoload)
     )
 !