Remove (soft) dependency on regexps to break dependency cycle jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 27 May 2020 14:07:18 +0100
branchjv
changeset 6848 f3ac6f59a11e
parent 6787 51fbee1169fc
child 6849 ac1f1a9c0798
Remove (soft) dependency on regexps to break dependency cycle
Make.proto
bc.mak
stx_libwidg.st
--- a/Make.proto	Tue Dec 17 16:40:54 2019 +0100
+++ b/Make.proto	Wed May 27 14:07:18 2020 +0100
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/regex -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libui -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libview2
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libui -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libview2
 
 
 # if you need any additional defines for embedded C code,
--- a/bc.mak	Tue Dec 17 16:40:54 2019 +0100
+++ b/bc.mak	Wed May 27 14:07:18 2020 +0100
@@ -38,7 +38,7 @@
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\regex -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libui -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libview2
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libui -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libview2
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
@@ -65,7 +65,7 @@
 
 
 
-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)
         
--- a/stx_libwidg.st	Tue Dec 17 16:40:54 2019 +0100
+++ b/stx_libwidg.st	Wed May 27 14:07:18 2020 +0100
@@ -2,6 +2,7 @@
  COPYRIGHT (c) Claus Gittinger / 2006 by eXept Software AG
  COPYRIGHT (c) 2015 Jan Vrany
  COPYRIGHT (c) 2018 Jan Vrany
+ COPYRIGHT (c) 2020 LabWare
               All Rights Reserved
 
  This software is furnished under a license and may be used
@@ -29,6 +30,7 @@
  COPYRIGHT (c) Claus Gittinger / 2006 by eXept Software AG
  COPYRIGHT (c) 2015 Jan Vrany
  COPYRIGHT (c) 2018 Jan Vrany
+ COPYRIGHT (c) 2020 LabWare
               All Rights Reserved
 
  This software is furnished under a license and may be used
@@ -125,7 +127,10 @@
         #'stx:libhtml'    "HTMLDocumentView - referenced by DialogBox>>addHelpButtonFor: "
         #'stx:libtool'    "SystemBrowser - referenced by Workspace>>browseImplementorsOfIt "
         #'stx:libwidg2'    "FilenameEditField - referenced by DialogBox>>addFilenameInputFieldOn:in:tabable: "
+        #'stx:goodies/regex'    "Regex::RxMatcher - referenced by TextView>>openSearchBoxAndSearch"
     )
+
+    "Modified: / 27-05-2020 / 14:02:36 / Jan Vrany <jan.vrany@labware.com>"
 !
 
 mandatoryPreRequisites
@@ -156,13 +161,13 @@
      Please also take a look at the #mandatoryPreRequisites method"
 
     ^ #(
-        #'stx:goodies/regex'    "Regex::RxMatcher - referenced by TextView>>openSearchBoxAndSearch"
         #'stx:libbasic2'    "ActorStream - referenced by TextCollector>>initialize"
         #'stx:libbasic3'    "MessageTally - referenced by Workspace>>spyOnIt"
         #'stx:libui'    "ActionButtonSpec - referenced by Button>>specClass"
     )
 
     "Modified: / 26-06-2018 / 09:30:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 27-05-2020 / 14:02:24 / Jan Vrany <jan.vrany@labware.com>"
 !
 
 subProjects