Mercurial Mercurial > hg > jv-llvm-s / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed dependency on SUnit
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 25 Sep 2015 21:57:05 +0100
changeset 46 ed599c4d3e94
parent 45 12a2f6470ef4
child 47 d1d3901866d4
Removed dependency on SUnit
LLVMTypeMetadata.st file | annotate | diff | comparison | revisions
Make.proto file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
extensions.st file | annotate | diff | comparison | revisions
jv_llvm_s.st file | annotate | diff | comparison | revisions 
--- a/LLVMTypeMetadata.st	Fri Sep 25 03:55:50 2015 +0100
+++ b/LLVMTypeMetadata.st	Fri Sep 25 21:57:05 2015 +0100
@@ -48,3 +48,10 @@
     "Created: / 13-08-2015 / 16:52:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!LLVMTypeMetadata class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
--- a/Make.proto	Fri Sep 25 03:55:50 2015 +0100
+++ b/Make.proto	Fri Sep 25 21:57:05 2015 +0100
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic
 
 
 # if you need any additional defines for embedded C code,
@@ -107,10 +107,6 @@
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
 	cd $(TOP)/libbasic && $(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)"
 
 
 
@@ -200,7 +196,7 @@
 $(OUTDIR)LLVMTypeVector.$(O) LLVMTypeVector.$(H): LLVMTypeVector.st $(INCLUDE_TOP)/jv/llvm_s/LLVMObject.$(H) $(INCLUDE_TOP)/jv/llvm_s/LLVMType.$(H) $(INCLUDE_TOP)/jv/llvm_s/LLVMTypeSequential.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalAddress.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)LLVMTypeX86_FP80.$(O) LLVMTypeX86_FP80.$(H): LLVMTypeX86_FP80.st $(INCLUDE_TOP)/jv/llvm_s/LLVMObject.$(H) $(INCLUDE_TOP)/jv/llvm_s/LLVMType.$(H) $(INCLUDE_TOP)/jv/llvm_s/LLVMTypeScalar.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalAddress.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)LLVMTypeX86_MMX.$(O) LLVMTypeX86_MMX.$(H): LLVMTypeX86_MMX.st $(INCLUDE_TOP)/jv/llvm_s/LLVMObject.$(H) $(INCLUDE_TOP)/jv/llvm_s/LLVMType.$(H) $(INCLUDE_TOP)/jv/llvm_s/LLVMTypeScalar.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalAddress.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/goodies/sunit/stx_goodies_sunit.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/stx_libbasic.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 
--- a/bc.mak	Fri Sep 25 03:55:50 2015 +0100
+++ b/bc.mak	Fri Sep 25 21:57:05 2015 +0100
@@ -35,7 +35,7 @@
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -52,10 +52,6 @@
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
 	pushd ..\..\stx\libbasic & $(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) "
 
 
 
@@ -142,7 +138,7 @@
 $(OUTDIR)LLVMTypeVector.$(O) LLVMTypeVector.$(H): LLVMTypeVector.st $(INCLUDE_TOP)\jv\llvm_s\LLVMObject.$(H) $(INCLUDE_TOP)\jv\llvm_s\LLVMType.$(H) $(INCLUDE_TOP)\jv\llvm_s\LLVMTypeSequential.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalAddress.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)LLVMTypeX86_FP80.$(O) LLVMTypeX86_FP80.$(H): LLVMTypeX86_FP80.st $(INCLUDE_TOP)\jv\llvm_s\LLVMObject.$(H) $(INCLUDE_TOP)\jv\llvm_s\LLVMType.$(H) $(INCLUDE_TOP)\jv\llvm_s\LLVMTypeScalar.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalAddress.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)LLVMTypeX86_MMX.$(O) LLVMTypeX86_MMX.$(H): LLVMTypeX86_MMX.st $(INCLUDE_TOP)\jv\llvm_s\LLVMObject.$(H) $(INCLUDE_TOP)\jv\llvm_s\LLVMType.$(H) $(INCLUDE_TOP)\jv\llvm_s\LLVMTypeScalar.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalAddress.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\goodies\sunit\stx_goodies_sunit.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\stx_libbasic.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 
--- a/extensions.st	Fri Sep 25 03:55:50 2015 +0100
+++ b/extensions.st	Fri Sep 25 21:57:05 2015 +0100
@@ -83,18 +83,6 @@
     "Modified: / 03-08-2015 / 17:04:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!stx_goodies_sunit class methodsFor:'documentation'!
-
-version_HG
-    ^ '$Changeset: <not expanded> $'
-! !
-
-!stx_libbasic class methodsFor:'documentation'!
-
-version_HG
-    ^ '$Changeset: <not expanded> $'
-! !
-
 !jv_llvm_s class methodsFor:'documentation'!
 
 extensionsVersion_HG
--- a/jv_llvm_s.st	Fri Sep 25 03:55:50 2015 +0100
+++ b/jv_llvm_s.st	Fri Sep 25 21:57:05 2015 +0100
@@ -76,7 +76,6 @@
      by searching along the inheritance chain of all of my classes."
 
     ^ #(
-        #'stx:goodies/sunit'    "stx_goodies_sunit - extended"
         #'stx:libbasic'    "ArrayedCollection - superclass of LLVMObjectArray"
     )
 !
@@ -219,8 +218,6 @@
 
     ^ #(
         SequenceableCollection asLLVMObjectArray
-        'stx_goodies_sunit class' #'version_HG'
-        'stx_libbasic class' #'version_HG'
         Object asLLVMValue
         Object asLLVMValueOfType:
         Object isLLVMType
hg/jv-llvm-s