Cleanup in debugger and inferior console applications to catch up changes in `jv:libgdbs`
Recent `jv:libgdbs` spawns GDB on a PTY and opening MI channel on another,
debugger console has no need to emulate history, command completion
and all that stuff. This is now handled by GDB itself.
--- a/Make.proto Sun Mar 08 15:50:52 2015 +0000
+++ b/Make.proto Thu Jun 01 12:23:04 2017 +0100
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/jv/libgdbs -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libtool2 -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/libwidg2
+LOCALINCLUDES= -I$(INCLUDE_TOP)/jv/libgdbs -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libtool2 -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libwidg2
# if you need any additional defines for embedded C code,
@@ -101,17 +101,12 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
- cd $(TOP)/libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd $(TOP)/goodies/announcements && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd $(TOP)/libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd $(TOP)/libbasic3 && $(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 $(TOP)/libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd $(TOP)/goodies/magritte && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd $(TOP)/libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../libgdbs && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ 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)/libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ cd $(TOP)/libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -131,26 +126,26 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)VDBAbstractApplication.$(O) VDBAbstractApplication.$(H): VDBAbstractApplication.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)VDBDebuggerConsoleView.$(O) VDBDebuggerConsoleView.$(H): VDBDebuggerConsoleView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libwidg/EditTextView.$(H) $(INCLUDE_TOP)/stx/libwidg/ListView.$(H) $(INCLUDE_TOP)/stx/libwidg/TextCollector.$(H) $(INCLUDE_TOP)/stx/libwidg/TextView.$(H) $(INCLUDE_TOP)/stx/libwidg2/TerminalView.$(H) $(STCHDR)
-$(OUTDIR)VDBIconLibrary.$(O) VDBIconLibrary.$(H): VDBIconLibrary.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)VDBModelPresenter.$(O) VDBModelPresenter.$(H): VDBModelPresenter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)jv_vdb.$(O) jv_vdb.$(H): jv_vdb.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
-$(OUTDIR)VDBAbstractContainer.$(O) VDBAbstractContainer.$(H): VDBAbstractContainer.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)VDBAbstractListApplication.$(O) VDBAbstractListApplication.$(H): VDBAbstractListApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)VDBDebuggerApplication.$(O) VDBDebuggerApplication.$(H): VDBDebuggerApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)VDBDebuggerConsoleApplication.$(O) VDBDebuggerConsoleApplication.$(H): VDBDebuggerConsoleApplication.st $(INCLUDE_TOP)/jv/libgdbs/GDBCommandStatus.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)VDBEventLogApplication.$(O) VDBEventLogApplication.$(H): VDBEventLogApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)VDBFramePresenter.$(O) VDBFramePresenter.$(H): VDBFramePresenter.st $(INCLUDE_TOP)/jv/vdb/VDBModelPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBInferiorConsoleApplication.$(O) VDBInferiorConsoleApplication.$(H): VDBInferiorConsoleApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)VDBSourceApplication.$(O) VDBSourceApplication.$(H): VDBSourceApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)VDBThreadGroupPresenter.$(O) VDBThreadGroupPresenter.$(H): VDBThreadGroupPresenter.st $(INCLUDE_TOP)/jv/vdb/VDBModelPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBThreadPresenter.$(O) VDBThreadPresenter.$(H): VDBThreadPresenter.st $(INCLUDE_TOP)/jv/vdb/VDBModelPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBVariablePresenter.$(O) VDBVariablePresenter.$(H): VDBVariablePresenter.st $(INCLUDE_TOP)/jv/vdb/VDBModelPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBAbstractTreeApplication.$(O) VDBAbstractTreeApplication.$(H): VDBAbstractTreeApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractListApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)VDBTabbingContainer.$(O) VDBTabbingContainer.$(H): VDBTabbingContainer.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractContainer.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)VDBFrameApplication.$(O) VDBFrameApplication.$(H): VDBFrameApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractListApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractTreeApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)VDBStackApplication.$(O) VDBStackApplication.$(H): VDBStackApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractListApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractTreeApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VDBAbstractApplication.$(O) VDBAbstractApplication.$(C) VDBAbstractApplication.$(H): VDBAbstractApplication.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VDBIconLibrary.$(O) VDBIconLibrary.$(C) VDBIconLibrary.$(H): VDBIconLibrary.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)VDBModelPresenter.$(O) VDBModelPresenter.$(C) VDBModelPresenter.$(H): VDBModelPresenter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)jv_vdb.$(O) jv_vdb.$(C) jv_vdb.$(H): jv_vdb.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)VDBAbstractConsoleApplication.$(O) VDBAbstractConsoleApplication.$(C) VDBAbstractConsoleApplication.$(H): VDBAbstractConsoleApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VDBAbstractContainer.$(O) VDBAbstractContainer.$(C) VDBAbstractContainer.$(H): VDBAbstractContainer.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VDBAbstractListApplication.$(O) VDBAbstractListApplication.$(C) VDBAbstractListApplication.$(H): VDBAbstractListApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VDBDebuggerApplication.$(O) VDBDebuggerApplication.$(C) VDBDebuggerApplication.$(H): VDBDebuggerApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VDBEventLogApplication.$(O) VDBEventLogApplication.$(C) VDBEventLogApplication.$(H): VDBEventLogApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VDBFramePresenter.$(O) VDBFramePresenter.$(C) VDBFramePresenter.$(H): VDBFramePresenter.st $(INCLUDE_TOP)/jv/vdb/VDBModelPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBSourceApplication.$(O) VDBSourceApplication.$(C) VDBSourceApplication.$(H): VDBSourceApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VDBThreadGroupPresenter.$(O) VDBThreadGroupPresenter.$(C) VDBThreadGroupPresenter.$(H): VDBThreadGroupPresenter.st $(INCLUDE_TOP)/jv/vdb/VDBModelPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBThreadPresenter.$(O) VDBThreadPresenter.$(C) VDBThreadPresenter.$(H): VDBThreadPresenter.st $(INCLUDE_TOP)/jv/vdb/VDBModelPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBVariablePresenter.$(O) VDBVariablePresenter.$(C) VDBVariablePresenter.$(H): VDBVariablePresenter.st $(INCLUDE_TOP)/jv/vdb/VDBModelPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBAbstractTreeApplication.$(O) VDBAbstractTreeApplication.$(C) VDBAbstractTreeApplication.$(H): VDBAbstractTreeApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractListApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VDBDebuggerConsoleApplication.$(O) VDBDebuggerConsoleApplication.$(C) VDBDebuggerConsoleApplication.$(H): VDBDebuggerConsoleApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractConsoleApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VDBInferiorConsoleApplication.$(O) VDBInferiorConsoleApplication.$(C) VDBInferiorConsoleApplication.$(H): VDBInferiorConsoleApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractConsoleApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VDBTabbingContainer.$(O) VDBTabbingContainer.$(C) VDBTabbingContainer.$(H): VDBTabbingContainer.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractContainer.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VDBFrameApplication.$(O) VDBFrameApplication.$(C) VDBFrameApplication.$(H): VDBFrameApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractListApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractTreeApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VDBStackApplication.$(O) VDBStackApplication.$(C) VDBStackApplication.$(H): VDBStackApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractListApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractTreeApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/Make.spec Sun Mar 08 15:50:52 2015 +0000
+++ b/Make.spec Thu Jun 01 12:23:04 2017 +0100
@@ -22,7 +22,7 @@
# (if removed, they will be created as common
# -Pxxx : defines the package
# -Zxxx : a prefix for variables within the classLib
-# -Dxxx : defines passed to to CC for inline C-code
+# -Dxxx : defines passed to CC for inline C-code
# -Ixxx : include path passed to CC for inline C-code
# +optspace : optimized for space
# +optspace2 : optimized more for space
@@ -52,22 +52,22 @@
COMMON_CLASSES= \
VDBAbstractApplication \
- VDBDebuggerConsoleView \
VDBIconLibrary \
VDBModelPresenter \
jv_vdb \
+ VDBAbstractConsoleApplication \
VDBAbstractContainer \
VDBAbstractListApplication \
VDBDebuggerApplication \
- VDBDebuggerConsoleApplication \
VDBEventLogApplication \
VDBFramePresenter \
- VDBInferiorConsoleApplication \
VDBSourceApplication \
VDBThreadGroupPresenter \
VDBThreadPresenter \
VDBVariablePresenter \
VDBAbstractTreeApplication \
+ VDBDebuggerConsoleApplication \
+ VDBInferiorConsoleApplication \
VDBTabbingContainer \
VDBFrameApplication \
VDBStackApplication \
@@ -76,26 +76,26 @@
COMMON_OBJS= \
- $(OUTDIR_SLASH)VDBAbstractApplication.$(O) \
- $(OUTDIR_SLASH)VDBDebuggerConsoleView.$(O) \
- $(OUTDIR_SLASH)VDBIconLibrary.$(O) \
- $(OUTDIR_SLASH)VDBModelPresenter.$(O) \
- $(OUTDIR_SLASH)jv_vdb.$(O) \
- $(OUTDIR_SLASH)VDBAbstractContainer.$(O) \
- $(OUTDIR_SLASH)VDBAbstractListApplication.$(O) \
- $(OUTDIR_SLASH)VDBDebuggerApplication.$(O) \
- $(OUTDIR_SLASH)VDBDebuggerConsoleApplication.$(O) \
- $(OUTDIR_SLASH)VDBEventLogApplication.$(O) \
- $(OUTDIR_SLASH)VDBFramePresenter.$(O) \
- $(OUTDIR_SLASH)VDBInferiorConsoleApplication.$(O) \
- $(OUTDIR_SLASH)VDBSourceApplication.$(O) \
- $(OUTDIR_SLASH)VDBThreadGroupPresenter.$(O) \
- $(OUTDIR_SLASH)VDBThreadPresenter.$(O) \
- $(OUTDIR_SLASH)VDBVariablePresenter.$(O) \
- $(OUTDIR_SLASH)VDBAbstractTreeApplication.$(O) \
- $(OUTDIR_SLASH)VDBTabbingContainer.$(O) \
- $(OUTDIR_SLASH)VDBFrameApplication.$(O) \
- $(OUTDIR_SLASH)VDBStackApplication.$(O) \
+ $(OUTDIR)VDBAbstractApplication.$(O) \
+ $(OUTDIR)VDBIconLibrary.$(O) \
+ $(OUTDIR)VDBModelPresenter.$(O) \
+ $(OUTDIR)jv_vdb.$(O) \
+ $(OUTDIR)VDBAbstractConsoleApplication.$(O) \
+ $(OUTDIR)VDBAbstractContainer.$(O) \
+ $(OUTDIR)VDBAbstractListApplication.$(O) \
+ $(OUTDIR)VDBDebuggerApplication.$(O) \
+ $(OUTDIR)VDBEventLogApplication.$(O) \
+ $(OUTDIR)VDBFramePresenter.$(O) \
+ $(OUTDIR)VDBSourceApplication.$(O) \
+ $(OUTDIR)VDBThreadGroupPresenter.$(O) \
+ $(OUTDIR)VDBThreadPresenter.$(O) \
+ $(OUTDIR)VDBVariablePresenter.$(O) \
+ $(OUTDIR)VDBAbstractTreeApplication.$(O) \
+ $(OUTDIR)VDBDebuggerConsoleApplication.$(O) \
+ $(OUTDIR)VDBInferiorConsoleApplication.$(O) \
+ $(OUTDIR)VDBTabbingContainer.$(O) \
+ $(OUTDIR)VDBFrameApplication.$(O) \
+ $(OUTDIR)VDBStackApplication.$(O) \
--- a/VDBAbstractApplication.st Sun Mar 08 15:50:52 2015 +0000
+++ b/VDBAbstractApplication.st Thu Jun 01 12:23:04 2017 +0100
@@ -1,5 +1,7 @@
"{ Package: 'jv:vdb' }"
+"{ NameSpace: Smalltalk }"
+
ApplicationModel subclass:#VDBAbstractApplication
instanceVariableNames:'debuggerHolder debugger titleHolder'
classVariableNames:''
@@ -8,6 +10,14 @@
!
+!VDBAbstractApplication class methodsFor:'accessing'!
+
+windowTitle
+ ^ ((self windowSpec at: 5) at: 3)
+
+ "Created: / 01-06-2017 / 12:13:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!VDBAbstractApplication class methodsFor:'interface opening'!
openFor: debugger
@@ -18,6 +28,14 @@
"Created: / 06-06-2014 / 21:35:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!VDBAbstractApplication class methodsFor:'interface specs'!
+
+windowSpec
+ self subclassResponsibility
+
+ "Created: / 01-06-2017 / 12:14:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!VDBAbstractApplication class methodsFor:'plugin spec'!
aspectSelectors
@@ -104,11 +122,11 @@
"return/create the 'titleHolder' value holder (automatically generated)"
titleHolder isNil ifTrue:[
- titleHolder := ValueHolder with: ((self class windowSpec at: 5) at: 3)
+ titleHolder := ValueHolder with: self class windowTitle
].
^ titleHolder
- "Modified: / 10-06-2014 / 14:50:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 01-06-2017 / 12:13:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!VDBAbstractApplication methodsFor:'change & update'!
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/VDBAbstractConsoleApplication.st Thu Jun 01 12:23:04 2017 +0100
@@ -0,0 +1,139 @@
+"{ Package: 'jv:vdb' }"
+
+"{ NameSpace: Smalltalk }"
+
+VDBAbstractApplication subclass:#VDBAbstractConsoleApplication
+ instanceVariableNames:'consoleView'
+ classVariableNames:''
+ poolDictionaries:''
+ category:'VDB-UI-Console'
+!
+
+!VDBAbstractConsoleApplication class methodsFor:'interface specs'!
+
+windowSpec
+ "This resource specification was automatically generated
+ by the UIPainter of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the UIPainter may not be able to read the specification."
+
+ "
+ UIPainter new openOnClass:VDBAbstractConsoleApplication andSelector:#windowSpec
+ VDBAbstractConsoleApplication new openInterface:#windowSpec
+ VDBAbstractConsoleApplication open
+ "
+
+ <resource: #canvas>
+
+ ^
+ #(FullSpec
+ name: windowSpec
+ window:
+ (WindowSpec
+ label: 'Console'
+ name: 'Console'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 782 332)
+ )
+ component:
+ (SpecCollection
+ collection: (
+ (ArbitraryComponentSpec
+ name: 'Console'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ hasHorizontalScrollBar: true
+ hasVerticalScrollBar: true
+ miniScrollerHorizontal: true
+ autoHideScrollBars: false
+ hasBorder: false
+ component: consoleView
+ )
+ )
+
+ )
+ )
+! !
+
+!VDBAbstractConsoleApplication class methodsFor:'plugIn spec'!
+
+aspectSelectors
+ "This resource specification was automatically generated
+ by the UIPainter of ST/X."
+
+ "Do not manually edit this. If it is corrupted,
+ the UIPainter may not be able to read the specification."
+
+ "Return a description of exported aspects;
+ these can be connected to aspects of an embedding application
+ (if this app is embedded in a subCanvas)."
+
+ ^ #(
+ #debuggerHolder
+ ).
+
+! !
+
+!VDBAbstractConsoleApplication methodsFor:'accessing'!
+
+consoleInput
+ self subclassResponsibility
+
+ "Created: / 01-06-2017 / 09:43:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+consoleOutput
+ self subclassResponsibility
+
+ "Created: / 01-06-2017 / 09:44:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!VDBAbstractConsoleApplication methodsFor:'aspects'!
+
+consoleView
+ consoleView isNil ifTrue:[
+ consoleView :=VT100TerminalView new.
+ consoleView foregroundColor: Color white
+ backgroundColor: Color black.
+ debugger notNil ifTrue:[
+ consoleView inStream: self consoleInput.
+ consoleView outStream: self consoleOutput.
+ consoleView startReaderProcessWhenVisible.
+ ].
+ ].
+ ^ consoleView
+
+ "Created: / 06-06-2014 / 21:33:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 01-06-2017 / 09:44:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!VDBAbstractConsoleApplication methodsFor:'initialization & release'!
+
+subscribe
+ "Register for debugger events. To be overrided by subclasses"
+
+ super subscribe.
+ (debugger notNil and:[consoleView notNil]) ifTrue:[
+ consoleView stopReaderProcess.
+ consoleView inStream: self consoleInput.
+ consoleView outStream: self consoleOutput.
+ consoleView startReaderProcessWhenVisible.
+ ].
+
+ "Created: / 10-06-2014 / 21:02:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 01-06-2017 / 09:47:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+unsubscribe
+ "Unsubscribe myself fo debugger events"
+
+ super unsubscribe.
+ consoleView notNil ifTrue:[
+ consoleView stopReaderProcess.
+ consoleView inStream: nil.
+ consoleView outStream: nil.
+ ].
+
+ "Created: / 09-06-2014 / 10:09:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
--- a/VDBAbstractContainer.st Sun Mar 08 15:50:52 2015 +0000
+++ b/VDBAbstractContainer.st Thu Jun 01 12:23:04 2017 +0100
@@ -1,5 +1,7 @@
"{ Package: 'jv:vdb' }"
+"{ NameSpace: Smalltalk }"
+
VDBAbstractApplication subclass:#VDBAbstractContainer
instanceVariableNames:'components labels'
classVariableNames:''
--- a/VDBDebuggerApplication.st Sun Mar 08 15:50:52 2015 +0000
+++ b/VDBDebuggerApplication.st Thu Jun 01 12:23:04 2017 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"{ Package: 'jv:vdb' }"
"{ NameSpace: Smalltalk }"
--- a/VDBDebuggerConsoleApplication.st Sun Mar 08 15:50:52 2015 +0000
+++ b/VDBDebuggerConsoleApplication.st Thu Jun 01 12:23:04 2017 +0100
@@ -2,247 +2,42 @@
"{ NameSpace: Smalltalk }"
-VDBAbstractApplication subclass:#VDBDebuggerConsoleApplication
- instanceVariableNames:'consoleView consoleInput consoleOutput consoleOutputLock
- consoleProcess consolePromptPrinted outstandingCommand
- outstandingCommandToken outstandingCommandBlocker
- ignoreNextLogStreamEvent'
+VDBAbstractConsoleApplication subclass:#VDBDebuggerConsoleApplication
+ instanceVariableNames:''
classVariableNames:''
- poolDictionaries:'GDBCommandStatus'
+ poolDictionaries:''
category:'VDB-UI-Console'
!
-
-!VDBDebuggerConsoleApplication class methodsFor:'interface specs'!
-
-windowSpec
- "This resource specification was automatically generated
- by the UIPainter of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the UIPainter may not be able to read the specification."
-
- "
- UIPainter new openOnClass:VDBConsoleApplication andSelector:#windowSpec
- VDBConsoleApplication new openInterface:#windowSpec
- VDBConsoleApplication open
- "
-
- <resource: #canvas>
-
- ^
- #(FullSpec
- name: windowSpec
- window:
- (WindowSpec
- label: 'Debugger Console'
- name: 'Debugger Console'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 782 332)
- )
- component:
- (SpecCollection
- collection: (
- (ArbitraryComponentSpec
- name: 'Console'
- layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- hasBorder: false
- component: consoleView
- )
- )
-
- )
- )
-
- "Modified: / 09-06-2014 / 09:57:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBDebuggerConsoleApplication methodsFor:'aspects'!
+!VDBDebuggerConsoleApplication class methodsFor:'startup-web applications'!
-consoleView
- consoleView isNil ifTrue:[
- consoleView := VDBDebuggerConsoleView new.
- consoleView localEcho:true.
- consoleView inputTranslateCRToNL:true.
- consoleView lineEditMode: true.
- consoleView inStream: consoleInput.
- consoleView outStream: consoleOutput.
- consoleView startReaderProcessWhenVisible.
- ].
- ^ consoleView
-
- "Created: / 09-06-2014 / 10:11:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (format): / 10-06-2014 / 17:40:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBDebuggerConsoleApplication methodsFor:'event handling'!
-
-onCommandEvent: event
- event command == outstandingCommand ifTrue:[
- outstandingCommandToken := event token.
- ignoreNextLogStreamEvent := true.
- ].
-
- "Created: / 06-06-2014 / 22:43:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 11-06-2014 / 12:35:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
+initialPageSpec
+ "this is only required for web-applications"
-onCommandResultEvent: event
- outstandingCommandToken notNil ifTrue:[
- event token == outstandingCommandToken ifTrue:[
- "/ Check if command ended up with an error. If so,
- "/ print the error message.
- event result status == CommandStatusError ifTrue:[
- self showCR: ('Error: %1 ' bindWith: (event result propertyAt: #msg)).
- ] ifFalse:[
- "/ Check if the command issues is actually a MI command,
- "/ if so, print "Done" to the console since MI command don't
- "/ provide user feedback.
- outstandingCommand isMICommand ifTrue:[
- self showCR: ('Done ( %1 , see even log for result value)' bindWith: outstandingCommand value)
- ].
- ].
- outstandingCommand := outstandingCommandToken := nil.
- outstandingCommandBlocker signalForAll.
- ].
- ].
-
- "Created: / 06-06-2014 / 22:44:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 27-02-2015 / 13:01:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-onEventSetProcessingFinished: event
- self showPrompt.
-
- "Created: / 18-09-2014 / 23:11:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-onLogOutputEvent: event
- ignoreNextLogStreamEvent ifTrue:[
- ignoreNextLogStreamEvent := false.
- ] ifFalse:[
- self onStreamOutputEvent: event
- ]
-
- "Created: / 11-06-2014 / 12:37:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ ^ self shouldImplement
!
-onStreamOutputEvent: event
- consolePromptPrinted ifTrue:[ self showCR:'' ].
- consolePromptPrinted := false.
- event value asStringCollection do:[:line |
- line notEmptyOrNil ifTrue:[
- self showCR: line.
- ].
- ].
+pageSpecs
+ "this is only required for web-applications"
- "Created: / 11-06-2014 / 12:00:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 18-09-2014 / 23:18:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ ^ self shouldImplement
! !
-!VDBDebuggerConsoleApplication methodsFor:'hooks'!
+!VDBDebuggerConsoleApplication methodsFor:'accessing'!
-commonPostOpen
- consoleProcess isNil ifTrue:[
- consoleProcess :=
- [
- [
- | cmdLine cmd |
- self showPrompt.
- cmdLine := consoleInput nextLine asString.
- consolePromptPrinted := false.
- self showCR: cmdLine.
- cmd := (GDBMIParser on:cmdLine) parseCommand.
- cmd isCLICommand ifTrue:[
- cmd runOnBackground: true.
- ].
- outstandingCommand := cmd.
- debugger send:cmd andWait:false.
- outstandingCommandBlocker wait.
- ] loop.
- ] newProcess.
- consoleProcess name: 'VDB Debugger Console REPL loop'.
- consoleProcess resume.
- ].
+consoleInput
+ "superclass VDBAbstractConsoleApplication says that I am responsible to implement this method"
- "Created: / 10-06-2014 / 01:25:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 30-09-2014 / 09:38:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBDebuggerConsoleApplication methodsFor:'initialization & release'!
-
-initialize
- super initialize.
+ ^ debugger consoleInput
- consoleInput := GDBInternalPipeStream new.
- consoleOutput := GDBInternalPipeStream new.
- consoleOutputLock := RecursionLock new.
- consolePromptPrinted := false.
- outstandingCommandBlocker := Semaphore new.
-
- "Created: / 10-06-2014 / 01:23:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 18-09-2014 / 23:14:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 01-06-2017 / 09:45:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-release
- super release.
- consoleProcess terminate.
-
- "Created: / 10-06-2014 / 01:34:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-subscribe
- "Register for debugger events. To be overrided by subclasses"
+consoleOutput
+ "superclass VDBAbstractConsoleApplication says that I am responsible to implement this method"
- debugger announcer
- when: GDBCommandEvent send: #onCommandEvent: to: self;
- when: GDBCommandResultEvent send: #onCommandResultEvent: to: self;
+ ^ debugger consoleOutput
- when: GDBConsoleOutputEvent send: #onStreamOutputEvent: to: self;
- when: GDBTargetOutputEvent send: #onStreamOutputEvent: to: self;
- when: GDBLogOutputEvent send: #onLogOutputEvent: to: self;
-
- when: GDBEventSetProcessingFinished send: #onEventSetProcessingFinished: to: self.
-
- "Created: / 06-06-2014 / 21:26:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 18-09-2014 / 23:11:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 01-06-2017 / 09:46:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-!VDBDebuggerConsoleApplication methodsFor:'private - writing'!
-
-show: aString
- consoleOutputLock critical:[
- consoleOutput nextPutAll: aString.
- ].
-
- "Created: / 11-06-2014 / 08:02:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 11-06-2014 / 11:53:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-showCR: aString
- consoleOutputLock critical:[
- consoleOutput nextPutAll: aString.
- consoleOutput nextPut: Character nl.
- consoleOutput nextPut: Character return.
- ].
-
- "Created: / 11-06-2014 / 08:02:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 11-06-2014 / 11:56:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-showPrompt
- consolePromptPrinted ifFalse:[
- self show: '(gdb) '.
- consolePromptPrinted := true.
- ].
-
- "Created: / 18-09-2014 / 23:18:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBDebuggerConsoleApplication class methodsFor:'documentation'!
-
-version_HG
-
- ^ '$Changeset: <not expanded> $'
-! !
-
--- a/VDBDebuggerConsoleView.st Sun Mar 08 15:50:52 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-"{ Package: 'jv:vdb' }"
-
-TerminalView subclass:#VDBDebuggerConsoleView
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'VDB-UI-Console'
-!
-
-
-!VDBDebuggerConsoleView class methodsFor:'documentation'!
-
-version_HG
-
- ^ '$Changeset: <not expanded> $'
-! !
-
--- a/VDBEventLogApplication.st Sun Mar 08 15:50:52 2015 +0000
+++ b/VDBEventLogApplication.st Thu Jun 01 12:23:04 2017 +0100
@@ -1,5 +1,7 @@
"{ Package: 'jv:vdb' }"
+"{ NameSpace: Smalltalk }"
+
VDBAbstractApplication subclass:#VDBEventLogApplication
instanceVariableNames:'eventList eventSelectionHolder'
classVariableNames:''
--- a/VDBFramePresenter.st Sun Mar 08 15:50:52 2015 +0000
+++ b/VDBFramePresenter.st Thu Jun 01 12:23:04 2017 +0100
@@ -1,5 +1,7 @@
"{ Package: 'jv:vdb' }"
+"{ NameSpace: Smalltalk }"
+
VDBModelPresenter subclass:#VDBFramePresenter
instanceVariableNames:'frame'
classVariableNames:''
--- a/VDBIconLibrary.st Sun Mar 08 15:50:52 2015 +0000
+++ b/VDBIconLibrary.st Thu Jun 01 12:23:04 2017 +0100
@@ -1,5 +1,7 @@
"{ Package: 'jv:vdb' }"
+"{ NameSpace: Smalltalk }"
+
Object subclass:#VDBIconLibrary
instanceVariableNames:''
classVariableNames:''
--- a/VDBInferiorConsoleApplication.st Sun Mar 08 15:50:52 2015 +0000
+++ b/VDBInferiorConsoleApplication.st Thu Jun 01 12:23:04 2017 +0100
@@ -1,7 +1,9 @@
"{ Package: 'jv:vdb' }"
-VDBAbstractApplication subclass:#VDBInferiorConsoleApplication
- instanceVariableNames:'consoleView'
+"{ NameSpace: Smalltalk }"
+
+VDBAbstractConsoleApplication subclass:#VDBInferiorConsoleApplication
+ instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
category:'VDB-UI-Console'
@@ -52,50 +54,36 @@
"Modified: / 09-06-2014 / 09:57:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-!VDBInferiorConsoleApplication methodsFor:'aspects'!
+!VDBInferiorConsoleApplication class methodsFor:'startup-web applications'!
+
+initialPageSpec
+ "this is only required for web-applications"
-consoleView
- consoleView isNil ifTrue:[
- consoleView :=VT100TerminalView new.
- debugger notNil ifTrue:[
- consoleView inStream: debugger inferiorStdin.
- consoleView outStream: debugger inferiorStdout.
- consoleView startReaderProcessWhenVisible.
- ].
- ].
- ^ consoleView
+ ^ self shouldImplement
+!
- "Created: / 06-06-2014 / 21:33:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 09-06-2014 / 10:02:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+pageSpecs
+ "this is only required for web-applications"
+
+ ^ self shouldImplement
! !
-!VDBInferiorConsoleApplication methodsFor:'initialization & release'!
-
-subscribe
- "Register for debugger events. To be overrided by subclasses"
+!VDBInferiorConsoleApplication methodsFor:'accessing'!
- super subscribe.
- (debugger notNil and:[consoleView notNil]) ifTrue:[
- consoleView stopReaderProcess.
- consoleView inStream: debugger inferiorStdin.
- consoleView outStream: debugger inferiorStdout.
- consoleView startReaderProcessWhenVisible.
- ].
+consoleInput
+ "superclass VDBAbstractConsoleApplication says that I am responsible to implement this method"
- "Created: / 10-06-2014 / 21:02:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ ^ debugger inferiorStdout
+
+ "Modified: / 01-06-2017 / 09:46:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-unsubscribe
- "Unsubscribe myself fo debugger events"
+consoleOutput
+ "superclass VDBAbstractConsoleApplication says that I am responsible to implement this method"
- super unsubscribe.
- consoleView notNil ifTrue:[
- consoleView stopReaderProcess.
- consoleView inStream: nil.
- consoleView outStream: nil.
- ].
+ ^ debugger inferiorStdout
- "Created: / 09-06-2014 / 10:09:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 01-06-2017 / 09:45:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!VDBInferiorConsoleApplication class methodsFor:'documentation'!
--- a/VDBModelPresenter.st Sun Mar 08 15:50:52 2015 +0000
+++ b/VDBModelPresenter.st Thu Jun 01 12:23:04 2017 +0100
@@ -1,5 +1,7 @@
"{ Package: 'jv:vdb' }"
+"{ NameSpace: Smalltalk }"
+
HierarchicalItem subclass:#VDBModelPresenter
instanceVariableNames:''
classVariableNames:''
--- a/VDBSourceApplication.st Sun Mar 08 15:50:52 2015 +0000
+++ b/VDBSourceApplication.st Thu Jun 01 12:23:04 2017 +0100
@@ -1,5 +1,7 @@
"{ Package: 'jv:vdb' }"
+"{ NameSpace: Smalltalk }"
+
VDBAbstractApplication subclass:#VDBSourceApplication
instanceVariableNames:'frameHolder sourceFileHolder sourceStringHolder sourceView'
classVariableNames:''
--- a/VDBStackApplication.st Sun Mar 08 15:50:52 2015 +0000
+++ b/VDBStackApplication.st Thu Jun 01 12:23:04 2017 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"{ Package: 'jv:vdb' }"
"{ NameSpace: Smalltalk }"
--- a/VDBTabbingContainer.st Sun Mar 08 15:50:52 2015 +0000
+++ b/VDBTabbingContainer.st Thu Jun 01 12:23:04 2017 +0100
@@ -1,5 +1,7 @@
"{ Package: 'jv:vdb' }"
+"{ NameSpace: Smalltalk }"
+
VDBAbstractContainer subclass:#VDBTabbingContainer
instanceVariableNames:'tabSelectionIndexHolder tabSelectionViewHolder'
classVariableNames:''
--- a/VDBThreadGroupPresenter.st Sun Mar 08 15:50:52 2015 +0000
+++ b/VDBThreadGroupPresenter.st Thu Jun 01 12:23:04 2017 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"{ Package: 'jv:vdb' }"
"{ NameSpace: Smalltalk }"
--- a/abbrev.stc Sun Mar 08 15:50:52 2015 +0000
+++ b/abbrev.stc Thu Jun 01 12:23:04 2017 +0100
@@ -1,23 +1,23 @@
# automagically generated by the project definition
# this file is needed for stc to be able to compile modules independently.
# it provides information about a classes filename, category and especially namespace.
-VDBAbstractApplication VDBAbstractApplication jv:vdb 'VDB-UI-Abstract' 1
-VDBDebuggerConsoleView VDBDebuggerConsoleView jv:vdb 'VDB-UI-Console' 2
+VDBAbstractApplication VDBAbstractApplication jv:vdb 'VDB-UI-Abstract' 2
VDBIconLibrary VDBIconLibrary jv:vdb 'VDB-UI-Support' 0
VDBModelPresenter VDBModelPresenter jv:vdb 'VDB-Presentation' 0
jv_vdb jv_vdb jv:vdb '* Projects & Packages *' 3
-VDBAbstractContainer VDBAbstractContainer jv:vdb 'VDB-UI-Abstract' 1
-VDBAbstractListApplication VDBAbstractListApplication jv:vdb 'VDB-UI-Abstract' 1
-VDBDebuggerApplication VDBDebuggerApplication jv:vdb 'VDB-UI' 1
-VDBDebuggerConsoleApplication VDBDebuggerConsoleApplication jv:vdb 'VDB-UI-Console' 1
-VDBEventLogApplication VDBEventLogApplication jv:vdb 'VDB-UI-Events' 1
+VDBAbstractConsoleApplication VDBAbstractConsoleApplication jv:vdb 'VDB-UI-Console' 2
+VDBAbstractContainer VDBAbstractContainer jv:vdb 'VDB-UI-Abstract' 2
+VDBAbstractListApplication VDBAbstractListApplication jv:vdb 'VDB-UI-Abstract' 2
+VDBDebuggerApplication VDBDebuggerApplication jv:vdb 'VDB-UI' 2
+VDBEventLogApplication VDBEventLogApplication jv:vdb 'VDB-UI-Events' 2
VDBFramePresenter VDBFramePresenter jv:vdb 'VDB-Presentation' 0
-VDBInferiorConsoleApplication VDBInferiorConsoleApplication jv:vdb 'VDB-UI-Console' 1
-VDBSourceApplication VDBSourceApplication jv:vdb 'VDB-UI-Source' 1
+VDBSourceApplication VDBSourceApplication jv:vdb 'VDB-UI-Source' 2
VDBThreadGroupPresenter VDBThreadGroupPresenter jv:vdb 'VDB-Presentation' 0
VDBThreadPresenter VDBThreadPresenter jv:vdb 'VDB-Presentation' 0
VDBVariablePresenter VDBVariablePresenter jv:vdb 'VDB-Presentation' 0
-VDBAbstractTreeApplication VDBAbstractTreeApplication jv:vdb 'VDB-UI-Abstract' 1
-VDBTabbingContainer VDBTabbingContainer jv:vdb 'VDB-UI-Containers' 1
-VDBFrameApplication VDBFrameApplication jv:vdb 'VDB-UI-Others' 1
-VDBStackApplication VDBStackApplication jv:vdb 'VDB-UI-Others' 1
+VDBAbstractTreeApplication VDBAbstractTreeApplication jv:vdb 'VDB-UI-Abstract' 2
+VDBDebuggerConsoleApplication VDBDebuggerConsoleApplication jv:vdb 'VDB-UI-Console' 2
+VDBInferiorConsoleApplication VDBInferiorConsoleApplication jv:vdb 'VDB-UI-Console' 2
+VDBTabbingContainer VDBTabbingContainer jv:vdb 'VDB-UI-Containers' 2
+VDBFrameApplication VDBFrameApplication jv:vdb 'VDB-UI-Others' 2
+VDBStackApplication VDBStackApplication jv:vdb 'VDB-UI-Others' 2
--- a/application/Make.proto Sun Mar 08 15:50:52 2015 +0000
+++ b/application/Make.proto Thu Jun 01 12:23:04 2017 +0100
@@ -61,11 +61,11 @@
REQUIRED_LIBS= libstx_libbasic \
libstx_goodies_announcements \
- libstx_goodies_refactoryBrowser_parser \
libstx_libbasic2 \
libstx_libcomp \
+ libstx_goodies_refactoryBrowser_parser \
+ libstx_libbasic3 \
libstx_libview \
- libstx_libbasic3 \
libstx_libui \
libstx_libview2 \
libstx_goodies_sunit \
@@ -74,7 +74,6 @@
libstx_libhtml \
libstx_libwidg2 \
libjv_libgdbs \
- libstx_libwidg3 \
libstx_libtool \
libstx_libtool2 \
libjv_vdb \
@@ -82,11 +81,11 @@
REQUIRED_LIBOBJS= $(TOP)/libbasic/libstx_libbasic$(O_EXT) \
$(TOP)/goodies/announcements/libstx_goodies_announcements$(O_EXT) \
- $(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser$(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)/libview/libstx_libview$(O_EXT) \
- $(TOP)/libbasic3/libstx_libbasic3$(O_EXT) \
$(TOP)/libui/libstx_libui$(O_EXT) \
$(TOP)/libview2/libstx_libview2$(O_EXT) \
$(TOP)/goodies/sunit/libstx_goodies_sunit$(O_EXT) \
@@ -95,7 +94,6 @@
$(TOP)/libhtml/libstx_libhtml$(O_EXT) \
$(TOP)/libwidg2/libstx_libwidg2$(O_EXT) \
../../libgdbs/libjv_libgdbs$(O_EXT) \
- $(TOP)/libwidg3/libstx_libwidg3$(O_EXT) \
$(TOP)/libtool/libstx_libtool$(O_EXT) \
$(TOP)/libtool2/libstx_libtool2$(O_EXT) \
..//libjv_vdb$(O_EXT) \
@@ -103,11 +101,11 @@
REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \
libstx_goodies_announcements$(O_EXT) \
- libstx_goodies_refactoryBrowser_parser$(O_EXT) \
libstx_libbasic2$(O_EXT) \
libstx_libcomp$(O_EXT) \
+ libstx_goodies_refactoryBrowser_parser$(O_EXT) \
+ libstx_libbasic3$(O_EXT) \
libstx_libview$(O_EXT) \
- libstx_libbasic3$(O_EXT) \
libstx_libui$(O_EXT) \
libstx_libview2$(O_EXT) \
libstx_goodies_sunit$(O_EXT) \
@@ -116,7 +114,6 @@
libstx_libhtml$(O_EXT) \
libstx_libwidg2$(O_EXT) \
libjv_libgdbs$(O_EXT) \
- libstx_libwidg3$(O_EXT) \
libstx_libtool$(O_EXT) \
libstx_libtool2$(O_EXT) \
libjv_vdb$(O_EXT) \
@@ -132,7 +129,7 @@
all:: prereq ALL_NP
# like ALL, but not prereqs
-ALL_NP:: exe $(SUBPROJECT_LIBS) $(REQUIRED_SUPPORT_DIRS) $(SETUP_RULE)
+ALL_NP:: exe subProjects $(REQUIRED_SUPPORT_DIRS) $(SETUP_RULE)
exe: vdb registerApplication
@@ -154,53 +151,75 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
- $(MAKE) FORCE=@@@FORCE-BUILD@@@ $(REQUIRED_LIBOBJS)
+ $(MAKE) FORCE=@@@FORCE-BUILD@@@ makePrereq
+
+makePrereq: $(REQUIRED_LIBOBJS)
+
+subProjects:
+ $(MAKE) FORCE=@@@FORCE-BUILD@@@ makeSubProjects
+
+makeSubProjects: $(SUBPROJECT_LIBS)
+ @echo "sub-projects made"
#
# a self installable delivery
#
+
+#
+# for linux, this uses autopackage
+# (SETUP_RULE is set to setup_linux)
+setup_linux:
+ @if test -d autopackage; then \
+ if which autopackage; then \
+ makepackage; \
+ else \
+ echo "Warning: autopackage not found, installer NOT created"; \
+ fi \
+ else \
+ echo "Error: missing autopackage directory"; \
+ exit 1; \
+ fi
+
# backward compatible fallback
setup::
@if test -d autopackage; then \
- makepackage; \
+ if which autopackage; then \
+ makepackage; \
+ else \
+ echo "Warning: autopackage not found, installer NOT created"; \
+ fi \
else \
echo "Error: make setup not yet available in this unix"; \
exit 1; \
fi
-#
-# for linux, this uses autopackage
-#
-setup_linux:
- @if test -d autopackage; then \
- makepackage; \
- else \
- echo "Error: missing autopackage directory"; \
- exit 1; \
- fi
#
# for mac, a dmg is generated
+# (SETUP_RULE is set to setup_macosx)
#
-setup_macosx: "Visual Debugger_dmg"
- -rm "Visual Debugger.dmg"
- hdiutil create -fs HFSX -layout SPUD "Visual Debugger.dmg" -srcfolder "Visual Debugger_dmg" -format UDZO -volname "Visual Debugger" -quiet
+setup_macosx: "Visual_Debugger_dmg"
+ -rm "Visual_Debugger.dmg"
+ hdiutil create -fs HFSX -layout SPUD "Visual_Debugger.dmg" -srcfolder "Visual_Debugger_dmg" -format UDZO -volname "Visual Debugger" -quiet
-app: "Visual Debugger_dmg"
+app: "Visual_Debugger_dmg"
-"Visual Debugger_dmg": $(SUBPROJECT_LIBS) $(REQUIRED_SUPPORT_DIRS)
- @-rm -rf "Visual Debugger_dmg"
- @-mkdir "Visual Debugger_dmg"
- @-mkdir "Visual Debugger_dmg/Visual Debugger.app"
- @-mkdir "Visual Debugger_dmg/Visual Debugger.app/Contents"
- @-mkdir "Visual Debugger_dmg/Visual Debugger.app/Contents/MacOS"
- cp "vdb" "Visual Debugger_dmg/Visual Debugger.app/Contents/MacOS/Visual Debugger"
- @-mkdir "Visual Debugger_dmg/Visual Debugger.app/Contents/MacOS/."
- -cp -r *.so "Visual Debugger_dmg/Visual Debugger.app/Contents/MacOS/."
- -cp -r symbols.stc "Visual Debugger_dmg/Visual Debugger.app/Contents/MacOS/."
- -cp -r *.stx "Visual Debugger_dmg/Visual Debugger.app/Contents/MacOS/."
- -cp -r *.rc "Visual Debugger_dmg/Visual Debugger.app/Contents/MacOS/."
- -cp -r resources "Visual Debugger_dmg/Visual Debugger.app/Contents/MacOS/."
+"Visual_Debugger_dmg": $(SUBPROJECT_LIBS) $(REQUIRED_SUPPORT_DIRS)
+ @-rm -rf "Visual_Debugger_dmg"
+ @-mkdir "Visual_Debugger_dmg"
+ @-mkdir "Visual_Debugger_dmg/Visual_Debugger.app"
+ @-mkdir "Visual_Debugger_dmg/Visual_Debugger.app/Contents"
+ @-mkdir "Visual_Debugger_dmg/Visual_Debugger.app/Contents/MacOS"
+ cp "vdb" "Visual_Debugger_dmg/Visual_Debugger.app/Contents/MacOS/"
+ @-cp osx/Info.plist "Visual_Debugger_dmg/Visual_Debugger.app/Contents/"
+ @-mkdir "Visual_Debugger_dmg/Visual_Debugger.app/Contents/MacOS/."
+ -cp -r *.so "Visual_Debugger_dmg/Visual_Debugger.app/Contents/MacOS/."
+ -cp -r symbols.stc "Visual_Debugger_dmg/Visual_Debugger.app/Contents/MacOS/."
+ -cp -r *.stx "Visual_Debugger_dmg/Visual_Debugger.app/Contents/MacOS/."
+ -cp -r *.rc "Visual_Debugger_dmg/Visual_Debugger.app/Contents/MacOS/."
+ -cp -r resources "Visual_Debugger_dmg/Visual_Debugger.app/Contents/MacOS/."
+ @-rm "Visual_Debugger_dmg/Visual_Debugger.app/Contents/MacOS/"*WINrc.rc
+
SOURCEFILES: vdb_SOURCES \
@@ -308,19 +327,6 @@
$(TOP)/goodies/announcements/makefile: $(TOP)/goodies/announcements/Make.proto
$(TOP)/rules/stmkmf --cd $(TOP)/goodies/announcements
-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_libbasic2.so: $(TOP)/libbasic2/libstx_libbasic2.so
ln -sf $(TOP)/libbasic2/libstx_libbasic2.so .
@@ -347,18 +353,18 @@
$(TOP)/libcomp/makefile: $(TOP)/libcomp/Make.proto
$(TOP)/rules/stmkmf --cd $(TOP)/libcomp
-libstx_libview.so: $(TOP)/libview/libstx_libview.so
- ln -sf $(TOP)/libview/libstx_libview.so .
+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)/libview/libstx_libview.so: $(TOP)/libview/makefile $(FORCE)
- @if [ -f "$(TOP)/libview/.NOSOURCE" ]; then \
- echo "skip make in $(TOP)/libview (no source)"; \
+$(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)/libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+ cd $(TOP)/goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
fi
-$(TOP)/libview/makefile: $(TOP)/libview/Make.proto
- $(TOP)/rules/stmkmf --cd $(TOP)/libview
+$(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 .
@@ -373,6 +379,19 @@
$(TOP)/libbasic3/makefile: $(TOP)/libbasic3/Make.proto
$(TOP)/rules/stmkmf --cd $(TOP)/libbasic3
+libstx_libview.so: $(TOP)/libview/libstx_libview.so
+ ln -sf $(TOP)/libview/libstx_libview.so .
+
+$(TOP)/libview/libstx_libview.so: $(TOP)/libview/makefile $(FORCE)
+ @if [ -f "$(TOP)/libview/.NOSOURCE" ]; then \
+ echo "skip make in $(TOP)/libview (no source)"; \
+ else \
+ cd $(TOP)/libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+ fi
+
+$(TOP)/libview/makefile: $(TOP)/libview/Make.proto
+ $(TOP)/rules/stmkmf --cd $(TOP)/libview
+
libstx_libui.so: $(TOP)/libui/libstx_libui.so
ln -sf $(TOP)/libui/libstx_libui.so .
@@ -477,19 +496,6 @@
../../libgdbs/makefile: ../../libgdbs/Make.proto
$(TOP)/rules/stmkmf --cd ../../libgdbs
-libstx_libwidg3.so: $(TOP)/libwidg3/libstx_libwidg3.so
- ln -sf $(TOP)/libwidg3/libstx_libwidg3.so .
-
-$(TOP)/libwidg3/libstx_libwidg3.so: $(TOP)/libwidg3/makefile $(FORCE)
- @if [ -f "$(TOP)/libwidg3/.NOSOURCE" ]; then \
- echo "skip make in $(TOP)/libwidg3 (no source)"; \
- else \
- cd $(TOP)/libwidg3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
- fi
-
-$(TOP)/libwidg3/makefile: $(TOP)/libwidg3/Make.proto
- $(TOP)/rules/stmkmf --cd $(TOP)/libwidg3
-
libstx_libtool.so: $(TOP)/libtool/libstx_libtool.so
ln -sf $(TOP)/libtool/libstx_libtool.so .
@@ -555,7 +561,7 @@
-rm -f vdb *.img *.sav
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)VDBStartup.$(O) VDBStartup.$(H): VDBStartup.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/StandaloneStartup.$(H) $(STCHDR)
-$(OUTDIR)jv_vdb_application.$(O) jv_vdb_application.$(H): jv_vdb_application.st $(INCLUDE_TOP)/stx/libbasic/ApplicationDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)VDBStartup.$(O) VDBStartup.$(C) VDBStartup.$(H): VDBStartup.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/StandaloneStartup.$(H) $(STCHDR)
+$(OUTDIR)jv_vdb_application.$(O) jv_vdb_application.$(C) jv_vdb_application.$(H): jv_vdb_application.st $(INCLUDE_TOP)/stx/libbasic/ApplicationDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/application/Make.spec Sun Mar 08 15:50:52 2015 +0000
+++ b/application/Make.spec Thu Jun 01 12:23:04 2017 +0100
@@ -22,7 +22,7 @@
# (if removed, they will be created as common
# -Pxxx : defines the package
# -Zxxx : a prefix for variables within the classLib
-# -Dxxx : defines passed to to CC for inline C-code
+# -Dxxx : defines passed to CC for inline C-code
# -Ixxx : include path passed to CC for inline C-code
# +optspace : optimized for space
# +optspace2 : optimized more for space
@@ -58,8 +58,8 @@
COMMON_OBJS= \
- $(OUTDIR_SLASH)VDBStartup.$(O) \
- $(OUTDIR_SLASH)jv_vdb_application.$(O) \
+ $(OUTDIR)VDBStartup.$(O) \
+ $(OUTDIR)jv_vdb_application.$(O) \
--- a/application/application.nsi Sun Mar 08 15:50:52 2015 +0000
+++ b/application/application.nsi Thu Jun 01 12:23:04 2017 +0100
@@ -2,13 +2,20 @@
; Script generated by ProjectDefinition.
!define PRODUCT_NAME "Visual Debugger"
-!define PRODUCT_FILENAME "Visual Debugger"
-!define PRODUCT_VERSION "6.2.5.0"
+!define PRODUCT_FILENAME "Visual_Debugger"
+!define PRODUCT_VERSION "6.2.6.0"
!define PRODUCT_PUBLISHER "Jan Vrany"
!define PRODUCT_WEB_SITE "http://www.yoursite.com"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_FILENAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+;
+; SETUP_NAME can come from makefile as either setup or setup64
+;
+!if "${SETUP_NAME}" == ""
+SETUP_NAME="Visual DebuggerSetup"
+!endif
+
!define STX_ROOT "..\..\..\stx\.."
SetCompressor /solid lzma
@@ -59,13 +66,13 @@
VIProductVersion "${PRODUCT_VERSION}.0"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${PRODUCT_NAME}"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "${PRODUCT_PUBLISHER}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "6.2.32767.32767"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "6.2.2.2"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${PRODUCT_NAME} Installer"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${PRODUCT_VERSION}"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyring (C) 2014 Jan Vrany"
-OutFile "Visual DebuggerSetup.exe"
+OutFile "${SETUP_NAME}.exe"
InstallDir "$PROGRAMFILES\vdb"
ShowInstDetails show
ShowUnInstDetails show
@@ -92,10 +99,10 @@
- WriteRegStr HKCR "Jv.Visual Debugger.1" "" "Visual Debugger File"
- WriteRegStr HKCR "Jv.Visual Debugger.1\DefaultIcon" "" '$INSTDIR\bin\vdb.exe,0'
- WriteRegStr HKCR "Jv.Visual Debugger.1\Shell\open" "" $(appOpen)
- WriteRegStr HKCR "Jv.Visual Debugger.1\Shell\open\command" "" '"$INSTDIR\bin\vdb.exe" -- "%1"'
+ WriteRegStr HKCR "Jv.Visual_Debugger.1" "" "Visual_Debugger File"
+ WriteRegStr HKCR "Jv.Visual_Debugger.1\DefaultIcon" "" '$INSTDIR\bin\vdb.exe,0'
+ WriteRegStr HKCR "Jv.Visual_Debugger.1\Shell\open" "" $(appOpen)
+ WriteRegStr HKCR "Jv.Visual_Debugger.1\Shell\open\command" "" '"$INSTDIR\bin\vdb.exe" -- "%1"'
SectionEnd
;; Section "Online-Documentation for Visual Debugger" Section2
@@ -198,7 +205,7 @@
RMDir "$SMPROGRAMS\${PRODUCT_FILENAME}"
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
- DeleteRegKey HKCR "Jv.Visual Debugger.1"
+ DeleteRegKey HKCR "Jv.Visual_Debugger.1"
--- a/application/autopackage/default.apspec Sun Mar 08 15:50:52 2015 +0000
+++ b/application/autopackage/default.apspec Thu Jun 01 12:23:04 2017 +0100
@@ -1,9 +1,9 @@
# -*- shell-script -*-
[Meta]
ShortName: vdb
-SoftwareVersion: 6.2.5.0
+SoftwareVersion: 6.2.6.0
DisplayName: Visual Debugger
-RootName: @exept.de/expecco:$SOFTWAREVERSION
+RootName: Visual Debugger
Summary: Visual Debugger
Maintainer: Jan Vrany
Packager: Jan Vrany
@@ -39,18 +39,7 @@
[Imports]
import <<EOF
$source_dir/vdb
-$source_dir/resources
-$source_dir/keyboard.rc
-$source_dir/keyboardMacros.rc
-$source_dir/display.rc
-$source_dir/host.rc
-$source_dir/../doc
-$source_dir/../testsuites/webedition
-$source_dir/../projects/libraries
-$source_dir/../reportGenerator/tools
-$source_dir/../../pdf/afm
-$source_dir/../plugin/selenium/libexept_expecco_plugin_selenium.so
-$source_dir/../externalTools
+
EOF
for i in $source_dir/*.so
@@ -66,22 +55,12 @@
find . -type d \( -name CVS -or -name 'not_*' \) -print | xargs rm -rf
mkdir -p $MYPREFIX
-copyFiles expecco *.rc resources $MYPREFIX/bin
-copyFiles *.so $MYPREFIX/lib
-copyFiles doc externalTools $MYPREFIX/packages/exept/expecco
-copyFiles webedition/projects libraries $MYPREFIX/testsuites
-copyFiles tools $MYPREFIX/packages/exept/expecco/reportGenerator
-copyFiles afm $MYPREFIX/packages/exept/pdf
-copyFiles libexept_expecco_plugin_selenium.so $MYPREFIX/plugin
+copyFiles Visual Debugger *.rc resources $MYPREFIX/bin
+
-#installExe expecco
+#installExe Visual Debugger
#installLib *.so
-#installData resources
-#installData keyboard.rc
-#installData keyboardMacros.rc
-#installData host.rc
-#installData display.rc
-#installData doc
+
[Uninstall]
# Leaving this at the default is safe unless you use custom commands in
--- a/application/bc.mak Sun Mar 08 15:50:52 2015 +0000
+++ b/application/bc.mak Thu Jun 01 12:23:04 2017 +0100
@@ -12,6 +12,19 @@
# this has changed; it is now also possible to build using microsoft visual c
# (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
#
+# Rules found here:
+# bmake
+# - build everything, incl. a self installing exe for deployment
+# bmake exe
+# - only build the executable; to be executed and tested here
+# bmake setup
+# - make the self installing exe (assuming that the exe is already present)
+# bmake clean
+# - remove everything that is not needed to execute
+# bmake clobber
+# - remove everything that cannot be reconstructed by bmake
+#
+# For a 64bit build, replace bmake by mingwmake.
TOP=..\..\..\stx
INCLUDE_TOP=$(TOP)\..
@@ -42,7 +55,7 @@
#
APPNAME=libjv_vdb_application
-LIBNAME=dummy
+LIBNAME=libjv_vdb_application
MODULE_PATH=vdb\application
STCOPT="+optinline"
LOCALINCLUDES= -I$(INCLUDE_TOP)\jv\libgdbs -I$(INCLUDE_TOP)\jv\vdb -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2
@@ -59,7 +72,7 @@
!ifdef USETCC
RESFILES=
!else
-RESFILES= applicationWinRC.$(RES)
+RESFILES= jv_vdb_applicationWINrc.$(RES)
!endif
ALLOBJ= $(ALLOBJFILES) $(OBJS)
@@ -68,14 +81,18 @@
LIBFILES=$(LIBDIR_LIBRUN)\librun.lib
ALLLIB=$(LIBFILES) $(APP_IMPORTLIBS) $(APP_RT_LIB)
+!if defined(USEMINGW32)
+RT_DLL=libgcc_s_dw2-1.dll
+!endif
+
REQUIRED_LIBS=librun.dll \
libstx_libbasic.dll \
libstx_goodies_announcements.dll \
- libstx_goodies_refactoryBrowser_parser.dll \
libstx_libbasic2.dll \
libstx_libcomp.dll \
+ libstx_goodies_refactoryBrowser_parser.dll \
+ libstx_libbasic3.dll \
libstx_libview.dll \
- libstx_libbasic3.dll \
libstx_libui.dll \
libstx_libview2.dll \
libstx_goodies_sunit.dll \
@@ -84,7 +101,6 @@
libstx_libhtml.dll \
libstx_libwidg2.dll \
libjv_libgdbs.dll \
- libstx_libwidg3.dll \
libstx_libtool.dll \
libstx_libtool2.dll \
libjv_vdb.dll \
@@ -92,6 +108,9 @@
REQUIRED_FILES=$(RT_DLL) $(X11_DLL) $(XEXT_DLL) symbols.stc $(REQUIRED_LIBS)
+SUBPROJECT_LIBS=
+
+
REQUIRED_SUPPORT_DIRS=RESOURCEFILES
target: ALL postBuildCleanup
@@ -100,7 +119,7 @@
ALL:: prereq ALL_NP
# all, but no prereqs
-ALL_NP:: exe $(REQUIRED_SUPPORT_DIRS) postBuildCleanup setup
+ALL_NP:: exe $(REQUIRED_SUPPORT_DIRS) postBuildCleanup subProjects
exe: newBuildDate $(REQUIRED_LIBS) noConsoleApp consoleApp registerApplication
@@ -130,15 +149,35 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
- $(MAKE) -N -f bc.mak $(USE_ARG) FORCE=FORCE_BUILD $(REQUIRED_LIBS)
+ $(MAKE) -N -f bc.mak $(USE_ARG) FORCE=FORCE_BUILD makePrereq
+
+makePrereq: $(REQUIRED_LIBS)
+
+subProjects:
+ $(MAKE) -N -f bc.mak $(USE_ARG) FORCE=FORCE_BUILD makeSubProjects
+
+makeSubProjects: $(SUBPROJECT_LIBS)
+ @echo "sub-projects made"
FORCE_BUILD:
@rem Dummy target to force a build
# a nullsoft installable delivery
# This uses the Nullsoft Installer Package and works in Windows only
+
+!if defined(USEMINGW64)
+
+setup: $(PROJECT) postBuildCleanup application.nsi
+ $(MAKENSIS) /DOBJ_DIR=objmingw /DSETUP_NAME=Visual_DebuggerSetup64 application.nsi
+
+
+!else
+
setup: $(PROJECT) postBuildCleanup application.nsi
- $(MAKENSIS) application.nsi
+ $(MAKENSIS) /DOBJ_DIR=objbc /DSETUP_NAME=Visual_DebuggerSetup application.nsi
+
+
+!endif
newBuildDate:
del buildDate.h
@@ -184,6 +223,7 @@
libtool_RESOURCES \
libtool2_RESOURCES
+
keyboard.rc: $(TOP)\projects\smalltalk\keyboard.rc
copy $(TOP)\projects\smalltalk\keyboard.rc *.*
@@ -213,7 +253,7 @@
-copy $(TOP)\libwidg\bitmaps\*.xpm resources\stx\libwidg\bitmaps\*.*
libbasic_RESOURCES: resources\stx\libbasic\NUL
- copy $(TOP)\libbasic\resources\*.rs resources\stx\libbasic\*.*
+ -copy $(TOP)\libbasic\resources\*.rs resources\stx\libbasic\*.*
libtool_RESOURCES: resources\stx\libtool\NUL
-copy $(TOP)\libtool\resources\*.rs resources\stx\libtool\*.*
@@ -272,115 +312,109 @@
copy ..\..\..\stx\libbasic\$(OBJDIR)\libstx_libbasic.dll *.*
..\..\..\stx\libbasic\$(OBJDIR)\libstx_libbasic.dll: $(FORCE)
- pushd ..\..\..\stx\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\stx\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_goodies_announcements.dll: ..\..\..\stx\goodies\announcements\$(OBJDIR)\libstx_goodies_announcements.dll
copy ..\..\..\stx\goodies\announcements\$(OBJDIR)\libstx_goodies_announcements.dll *.*
..\..\..\stx\goodies\announcements\$(OBJDIR)\libstx_goodies_announcements.dll: $(FORCE)
- pushd ..\..\..\stx\goodies\announcements & $(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)"
+ pushd ..\..\..\stx\goodies\announcements & $(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)"
+ 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)"
+ pushd ..\..\..\stx\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-libstx_libview.dll: ..\..\..\stx\libview\$(OBJDIR)\libstx_libview.dll
- copy ..\..\..\stx\libview\$(OBJDIR)\libstx_libview.dll *.*
+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\libview\$(OBJDIR)\libstx_libview.dll: $(FORCE)
- pushd ..\..\..\stx\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\..\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)"
+ pushd ..\..\..\stx\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libview.dll: ..\..\..\stx\libview\$(OBJDIR)\libstx_libview.dll
+ copy ..\..\..\stx\libview\$(OBJDIR)\libstx_libview.dll *.*
+
+..\..\..\stx\libview\$(OBJDIR)\libstx_libview.dll: $(FORCE)
+ pushd ..\..\..\stx\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libui.dll: ..\..\..\stx\libui\$(OBJDIR)\libstx_libui.dll
copy ..\..\..\stx\libui\$(OBJDIR)\libstx_libui.dll *.*
..\..\..\stx\libui\$(OBJDIR)\libstx_libui.dll: $(FORCE)
- pushd ..\..\..\stx\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\stx\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libview2.dll: ..\..\..\stx\libview2\$(OBJDIR)\libstx_libview2.dll
copy ..\..\..\stx\libview2\$(OBJDIR)\libstx_libview2.dll *.*
..\..\..\stx\libview2\$(OBJDIR)\libstx_libview2.dll: $(FORCE)
- pushd ..\..\..\stx\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\stx\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_goodies_sunit.dll: ..\..\..\stx\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll
copy ..\..\..\stx\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll *.*
..\..\..\stx\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll: $(FORCE)
- pushd ..\..\..\stx\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\stx\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libwidg.dll: ..\..\..\stx\libwidg\$(OBJDIR)\libstx_libwidg.dll
copy ..\..\..\stx\libwidg\$(OBJDIR)\libstx_libwidg.dll *.*
..\..\..\stx\libwidg\$(OBJDIR)\libstx_libwidg.dll: $(FORCE)
- pushd ..\..\..\stx\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\stx\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_goodies_magritte.dll: ..\..\..\stx\goodies\magritte\$(OBJDIR)\libstx_goodies_magritte.dll
copy ..\..\..\stx\goodies\magritte\$(OBJDIR)\libstx_goodies_magritte.dll *.*
..\..\..\stx\goodies\magritte\$(OBJDIR)\libstx_goodies_magritte.dll: $(FORCE)
- pushd ..\..\..\stx\goodies\magritte & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\stx\goodies\magritte & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libhtml.dll: ..\..\..\stx\libhtml\$(OBJDIR)\libstx_libhtml.dll
copy ..\..\..\stx\libhtml\$(OBJDIR)\libstx_libhtml.dll *.*
..\..\..\stx\libhtml\$(OBJDIR)\libstx_libhtml.dll: $(FORCE)
- pushd ..\..\..\stx\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\stx\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libwidg2.dll: ..\..\..\stx\libwidg2\$(OBJDIR)\libstx_libwidg2.dll
copy ..\..\..\stx\libwidg2\$(OBJDIR)\libstx_libwidg2.dll *.*
..\..\..\stx\libwidg2\$(OBJDIR)\libstx_libwidg2.dll: $(FORCE)
- pushd ..\..\..\stx\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\stx\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libjv_libgdbs.dll: ..\..\libgdbs\$(OBJDIR)\libjv_libgdbs.dll
copy ..\..\libgdbs\$(OBJDIR)\libjv_libgdbs.dll *.*
..\..\libgdbs\$(OBJDIR)\libjv_libgdbs.dll: $(FORCE)
- pushd ..\..\libgdbs & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libwidg3.dll: ..\..\..\stx\libwidg3\$(OBJDIR)\libstx_libwidg3.dll
- copy ..\..\..\stx\libwidg3\$(OBJDIR)\libstx_libwidg3.dll *.*
-
-..\..\..\stx\libwidg3\$(OBJDIR)\libstx_libwidg3.dll: $(FORCE)
- pushd ..\..\..\stx\libwidg3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\libgdbs & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libtool.dll: ..\..\..\stx\libtool\$(OBJDIR)\libstx_libtool.dll
copy ..\..\..\stx\libtool\$(OBJDIR)\libstx_libtool.dll *.*
..\..\..\stx\libtool\$(OBJDIR)\libstx_libtool.dll: $(FORCE)
- pushd ..\..\..\stx\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\stx\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libtool2.dll: ..\..\..\stx\libtool2\$(OBJDIR)\libstx_libtool2.dll
copy ..\..\..\stx\libtool2\$(OBJDIR)\libstx_libtool2.dll *.*
..\..\..\stx\libtool2\$(OBJDIR)\libstx_libtool2.dll: $(FORCE)
- pushd ..\..\..\stx\libtool2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\stx\libtool2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libjv_vdb.dll: ..\$(OBJDIR)\libjv_vdb.dll
copy ..\$(OBJDIR)\libjv_vdb.dll *.*
..\$(OBJDIR)\libjv_vdb.dll: $(FORCE)
- pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -474,6 +508,7 @@
librun.dll: $(TOP)\librun\$(OBJDIR_LIBRUN)\librun.dll
copy $(TOP)\librun\$(OBJDIR_LIBRUN)\librun.dll librun.dll
+!ifdef USEBC
#cs3245.dll
$(RT_DLL): $(TOP)\support\win32\borland\$(RT_DLL)
copy $(TOP)\support\win32\borland\$(RT_DLL) $(RT_DLL)
@@ -483,6 +518,13 @@
Xext.dll: $(TOP)\support\win32\Xext.dll
copy $(TOP)\support\win32\Xext.dll Xext.dll
+!endif
+
+!if defined(USEMINGW32)
+$(RT_DLL): $(MINGW_DIR)\bin\$(RT_DLL)
+ -copy $(MINGW_DIR)\bin\$(RT_DLL) $(RT_DLL)
+ -copy $(MINGW_DIR)\bin\libwinpthread-1.dll libwinpthread-1.dll
+!endif
symbols.stc: $(TOP)\include\symbols.stc
copy $(TOP)\include\symbols.stc symbols.stc
@@ -515,8 +557,8 @@
@rem stupid win-make does not allow empty
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)VDBStartup.$(O) VDBStartup.$(H): VDBStartup.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\StandaloneStartup.$(H) $(STCHDR)
-$(OUTDIR)jv_vdb_application.$(O) jv_vdb_application.$(H): jv_vdb_application.st $(INCLUDE_TOP)\stx\libbasic\ApplicationDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)VDBStartup.$(O) VDBStartup.$(C) VDBStartup.$(H): VDBStartup.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\StandaloneStartup.$(H) $(STCHDR)
+$(OUTDIR)jv_vdb_application.$(O) jv_vdb_application.$(C) jv_vdb_application.$(H): jv_vdb_application.st $(INCLUDE_TOP)\stx\libbasic\ApplicationDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/application/bmake.bat Sun Mar 08 15:50:52 2015 +0000
+++ b/application/bmake.bat Thu Jun 01 12:23:04 2017 +0100
@@ -4,9 +4,11 @@
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
@SET DEFINES=
-@REM Kludge got Mercurial, cannot be implemented in Borland make
-@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
-@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
make.exe -N -f bc.mak %DEFINES% %*
+@IF "%1" EQU "exe" exit /b 0
+@IF "%1" EQU "setup" exit /b 0
+@IF "%1" EQU "pluginSetup" exit /b 0
+
--- a/application/builder/baseline.rbspec Sun Mar 08 15:50:52 2015 +0000
+++ b/application/builder/baseline.rbspec Thu Jun 01 12:23:04 2017 +0100
@@ -16,11 +16,11 @@
package "stx:libbasic"
package "stx:goodies/announcements"
- package "stx:goodies/refactoryBrowser/parser"
package "stx:libbasic2"
package "stx:libcomp"
+ package "stx:goodies/refactoryBrowser/parser"
+ package "stx:libbasic3"
package "stx:libview"
- package "stx:libbasic3"
package "stx:libui"
package "stx:libview2"
package "stx:goodies/sunit"
@@ -29,7 +29,6 @@
package "stx:libhtml"
package "stx:libwidg2"
package "jv:libgdbs"
- package "stx:libwidg3"
package "stx:libtool"
package "stx:libtool2"
package "jv:vdb"
--- a/application/builder/package.deps.rake Sun Mar 08 15:50:52 2015 +0000
+++ b/application/builder/package.deps.rake Thu Jun 01 12:23:04 2017 +0100
@@ -2,54 +2,34 @@
# Package dependencies.
# Automatically generated by project defintion.
-task "stx:libview" => "stx:libbasic"
+task "jv:libgdbs" => "stx:goodies/announcements"
+task "jv:libgdbs" => "stx:goodies/magritte"
+task "jv:libgdbs" => "stx:goodies/sunit"
+task "jv:libgdbs" => "stx:libbasic"
+
+task "jv:vdb" => "stx:libbasic"
+task "jv:vdb" => "stx:libview2"
+task "jv:vdb" => "stx:libwidg2"
+
+task "stx:goodies/announcements" => "stx:libbasic"
+task "stx:goodies/refactoryBrowser/parser" => "stx:libbasic"
+
+task "stx:goodies/sunit" => "stx:libbasic"
+task "stx:goodies/sunit" => "stx:libview2"
+
+
+task "stx:libbasic2" => "stx:libbasic"
+
+task "stx:libbasic3" => "stx:libbasic"
+
task "stx:libcomp" => "stx:libbasic"
-task "stx:goodies/sunit" => "stx:libbasic"
-task "stx:goodies/sunit" => "stx:libbasic3"
-task "stx:goodies/sunit" => "stx:libview2"
-task "stx:goodies/sunit" => "stx:libbasic2"
-task "stx:goodies/sunit" => "stx:libview"
-
task "stx:libhtml" => "stx:libbasic"
task "stx:libhtml" => "stx:libview"
task "stx:libhtml" => "stx:libwidg"
-task "stx:goodies/refactoryBrowser/parser" => "stx:libbasic"
-
-task "stx:goodies/magritte" => "stx:libwidg"
-task "stx:goodies/magritte" => "stx:libbasic2"
-task "stx:goodies/magritte" => "stx:libbasic"
-task "stx:goodies/magritte" => "stx:libview"
-
-task "jv:vdb" => "jv:libgdbs"
-task "jv:vdb" => "stx:libbasic"
-task "jv:vdb" => "stx:libview"
-task "jv:vdb" => "stx:libview2"
-task "jv:vdb" => "stx:libwidg"
-task "jv:vdb" => "stx:libwidg2"
-task "jv:vdb" => "stx:libbasic2"
-task "jv:vdb" => "stx:libtool"
-task "jv:vdb" => "stx:libtool2"
-
-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:libbasic2" => "stx:libbasic"
-
-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:libui"
-
task "stx:libtool" => "stx:goodies/refactoryBrowser/parser"
task "stx:libtool" => "stx:libbasic"
task "stx:libtool" => "stx:libbasic2"
@@ -60,57 +40,49 @@
task "stx:libtool" => "stx:libview2"
task "stx:libtool" => "stx:libwidg"
task "stx:libtool" => "stx:libwidg2"
-task "stx:libtool" => "stx:libwidg3"
-
-task "stx:libview2" => "stx:libbasic"
-task "stx:libview2" => "stx:libbasic2"
-task "stx:libview2" => "stx:libview"
-task "stx:libview2" => "stx:libui"
-
-task "stx:goodies/announcements" => "stx:libbasic"
-
-task "jv:libgdbs" => "stx:goodies/announcements"
-task "jv:libgdbs" => "stx:goodies/magritte"
-task "jv:libgdbs" => "stx:goodies/sunit"
-task "jv:libgdbs" => "stx:libbasic"
-task "jv:libgdbs" => "stx:libbasic2"
-task "jv:libgdbs" => "stx:libview2"
task "stx:libtool2" => "stx:libbasic"
task "stx:libtool2" => "stx:libview"
task "stx:libtool2" => "stx:libview2"
task "stx:libtool2" => "stx:libwidg"
task "stx:libtool2" => "stx:libwidg2"
-task "stx:libtool2" => "stx:libbasic2"
-task "stx:libtool2" => "stx:libbasic3"
-task "stx:libtool2" => "stx:libcomp"
-task "stx:libtool2" => "stx:libhtml"
-task "stx:libtool2" => "stx:libtool"
-task "stx:libtool2" => "stx:libui"
-
-task "stx:libbasic3" => "stx:libbasic"
-task "stx:libbasic3" => "stx:libbasic2"
-
-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:libui" => "stx:libbasic"
-task "stx:libui" => "stx:libview"
+
+task "stx:libview" => "stx:libbasic"
+
+task "stx:libview2" => "stx:libbasic"
+task "stx:libview2" => "stx:libbasic2"
+task "stx:libview2" => "stx:libview"
-task "jv:vdb/application" => "stx:libbasic"
+task "stx:libwidg" => "stx:libbasic"
+task "stx:libwidg" => "stx:libview"
+task "stx:libwidg" => "stx:libview2"
+
+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 "jv:vdb/application" => "jv:libgdbs"
task "jv:vdb/application" => "jv:vdb"
+task "jv:vdb/application" => "stx:goodies/announcements"
+task "jv:vdb/application" => "stx:goodies/magritte"
+task "jv:vdb/application" => "stx:goodies/refactoryBrowser/parser"
+task "jv:vdb/application" => "stx:goodies/sunit"
+task "jv:vdb/application" => "stx:libbasic"
task "jv:vdb/application" => "stx:libbasic2"
+task "jv:vdb/application" => "stx:libbasic3"
task "jv:vdb/application" => "stx:libcomp"
+task "jv:vdb/application" => "stx:libhtml"
+task "jv:vdb/application" => "stx:libtool"
+task "jv:vdb/application" => "stx:libtool2"
+task "jv:vdb/application" => "stx:libui"
task "jv:vdb/application" => "stx:libview"
task "jv:vdb/application" => "stx:libview2"
task "jv:vdb/application" => "stx:libwidg"
task "jv:vdb/application" => "stx:libwidg2"
-task "jv:vdb/application" => "stx:libui"
--- a/application/jv_vdb_application.st Sun Mar 08 15:50:52 2015 +0000
+++ b/application/jv_vdb_application.st Thu Jun 01 12:23:04 2017 +0100
@@ -63,7 +63,8 @@
are extended by myself.
They are mandatory, because we need these packages as a prerequisite for loading and compiling.
This method is generated automatically,
- by searching along the inheritance chain of all of my classes."
+ by searching along the inheritance chain of all of my classes.
+ Please take a look at the #referencedPreRequisites method as well."
^ #(
#'stx:libbasic' "ApplicationDefinition - superclass of jv_vdb_application"
@@ -73,12 +74,13 @@
referencedPreRequisites
"list packages which are a prerequisite, because they contain
classes which are referenced by my classes.
- We do not need these packages as a prerequisite for compiling or loading,
+ These packages are NOT needed as a prerequisite for compiling or loading,
however, a class from it may be referenced during execution and having it
unloaded then may lead to a runtime doesNotUnderstand error, unless the caller
includes explicit checks for the package being present.
This method is generated automatically,
- by searching all classes (and their packages) which are referenced by my classes."
+ by searching all classes (and their packages) which are referenced by my classes.
+ Please also take a look at the #mandatoryPreRequisites method"
^ #(
#'jv:libgdbs' "GDBDebugger - referenced by VDBStartup class>>main:"
@@ -112,8 +114,10 @@
!
extensionMethodNames
- "list class/selector pairs of extensions.
- A correponding method with real names must be present in my concrete subclasses"
+ "lists the extension methods which are to be included in the project.
+ Entries are 2-element array literals, consisting of class-name and selector.
+ A correponding method with real names must be present in my concrete subclasses
+ if it has extensions."
^ #(
)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/jv_vdb_applicationWINrc.rc Thu Jun 01 12:23:04 2017 +0100
@@ -0,0 +1,50 @@
+//
+// DO NOT EDIT
+// automagically generated from the projectDefinition: jv_vdb_application.
+//
+#define IDR_MAINFRAME 128
+#define IDR_SPLASH 129
+
+#if (__BORLANDC__)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#endif
+
+#pragma code_page(1252)
+
+IDR_MAINFRAME ICON DISCARDABLE "vdb.ico"
+
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 6,2,2,2
+ PRODUCTVERSION 6,2,6,0
+#if (__BORLANDC__)
+ FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
+ FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VS_USER_DEFINED
+#else
+ FILEFLAGSMASK 0x3fL
+#endif
+
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "Jan Vrany\0"
+ VALUE "FileDescription", "Visual Debugger\0"
+ VALUE "FileVersion", "6.2.2.2\0"
+ VALUE "InternalName", "jv:vdb/application\0"
+ VALUE "LegalCopyright", "Copyring (C) 2014 Jan Vrany\0"
+ VALUE "ProductName", "Visual Debugger\0"
+ VALUE "ProductVersion", "6.2.6.0\0"
+ VALUE "ProductDate", "Thu, 01 Jun 2017 11:16:30 GMT\0"
+ END
+ END
+
+ BLOCK "VarFileInfo"
+ BEGIN // Language | Translation
+ VALUE "Translation", 0x409, 0x4E4 // U.S. English, Windows Multilingual
+ END
+END
--- a/application/mingwmake.bat Sun Mar 08 15:50:52 2015 +0000
+++ b/application/mingwmake.bat Thu Jun 01 12:23:04 2017 +0100
@@ -14,3 +14,9 @@
make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
+@IF "%1" EQU "exe" exit /b 0
+@IF "%1" EQU "setup" exit /b 0
+@IF "%1" EQU "pluginSetup" exit /b 0
+
+
+
--- a/application/modules.stx Sun Mar 08 15:50:52 2015 +0000
+++ b/application/modules.stx Thu Jun 01 12:23:04 2017 +0100
@@ -17,11 +17,11 @@
#
libstx_libbasic
libstx_goodies_announcements
-libstx_goodies_refactoryBrowser_parser
libstx_libbasic2
libstx_libcomp
+libstx_goodies_refactoryBrowser_parser
+libstx_libbasic3
libstx_libview
-libstx_libbasic3
libstx_libui
libstx_libview2
libstx_goodies_sunit
@@ -30,7 +30,6 @@
libstx_libhtml
libstx_libwidg2
libjv_libgdbs
-libstx_libwidg3
libstx_libtool
libstx_libtool2
libjv_vdb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/osx/Info.plist Thu Jun 01 12:23:04 2017 +0100
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTP PLIST 1.0//EN" "http//www.apple.com/DTDs/ProperyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+<key>CFBundleName</key>
+<string>vdb</string>
+<key>CFBundleShortVersionString</key>
+<string>6.2.2.2</string>
+<key>CFBundlePackageType</key>
+<string>APPL</string>
+<key>CFBundleIdentifier</key>
+<string>jv.vdb</string>
+<key>CFBundleVersion</key>
+<string>6.2.2.2</string>
+<key>CFBundleInfoDictionaryVersion</key>
+<string>6.0</string>
+<key>LSMinimumSystemVersion</key>
+<string>10.6</string>
+<key>CFBundleExecutable</key>
+<string>vdb</string>
+</dict>
+</plist>
--- a/application/vcmake.bat Sun Mar 08 15:50:52 2015 +0000
+++ b/application/vcmake.bat Thu Jun 01 12:23:04 2017 +0100
@@ -13,8 +13,14 @@
@REM Kludge got Mercurial, cannot be implemented in Borland make
@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
+
make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
+@IF "%1" EQU "exe" exit /b 0
+@IF "%1" EQU "setup" exit /b 0
+@IF "%1" EQU "pluginSetup" exit /b 0
+
--- a/bc.mak Sun Mar 08 15:50:52 2015 +0000
+++ b/bc.mak Thu Jun 01 12:23:04 2017 +0100
@@ -31,11 +31,11 @@
LIBNAME=libjv_vdb
MODULE_PATH=vdb
-RESFILES=vdb.$(RES)
+RESFILES=jv_vdbWINrc.$(RES)
-LOCALINCLUDES= -I$(INCLUDE_TOP)\jv\libgdbs -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libtool2 -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libwidg2
+LOCALINCLUDES= -I$(INCLUDE_TOP)\jv\libgdbs -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libtool2 -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libwidg2
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
@@ -52,16 +52,11 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
pushd ..\..\stx\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\stx\goodies\announcements & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\stx\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\stx\libbasic3 & $(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 ..\..\stx\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\stx\goodies\magritte & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\stx\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\libgdbs & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -74,30 +69,30 @@
$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
clean::
- del *.$(CSUFFIX)
+ -del *.$(CSUFFIX)
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)VDBAbstractApplication.$(O) VDBAbstractApplication.$(H): VDBAbstractApplication.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)VDBDebuggerConsoleView.$(O) VDBDebuggerConsoleView.$(H): VDBDebuggerConsoleView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextCollector.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\TerminalView.$(H) $(STCHDR)
-$(OUTDIR)VDBIconLibrary.$(O) VDBIconLibrary.$(H): VDBIconLibrary.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)VDBModelPresenter.$(O) VDBModelPresenter.$(H): VDBModelPresenter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)jv_vdb.$(O) jv_vdb.$(H): jv_vdb.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
-$(OUTDIR)VDBAbstractContainer.$(O) VDBAbstractContainer.$(H): VDBAbstractContainer.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)VDBAbstractListApplication.$(O) VDBAbstractListApplication.$(H): VDBAbstractListApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)VDBDebuggerApplication.$(O) VDBDebuggerApplication.$(H): VDBDebuggerApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)VDBDebuggerConsoleApplication.$(O) VDBDebuggerConsoleApplication.$(H): VDBDebuggerConsoleApplication.st $(INCLUDE_TOP)\jv\libgdbs\GDBCommandStatus.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)VDBEventLogApplication.$(O) VDBEventLogApplication.$(H): VDBEventLogApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)VDBFramePresenter.$(O) VDBFramePresenter.$(H): VDBFramePresenter.st $(INCLUDE_TOP)\jv\vdb\VDBModelPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBInferiorConsoleApplication.$(O) VDBInferiorConsoleApplication.$(H): VDBInferiorConsoleApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)VDBSourceApplication.$(O) VDBSourceApplication.$(H): VDBSourceApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)VDBThreadGroupPresenter.$(O) VDBThreadGroupPresenter.$(H): VDBThreadGroupPresenter.st $(INCLUDE_TOP)\jv\vdb\VDBModelPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBThreadPresenter.$(O) VDBThreadPresenter.$(H): VDBThreadPresenter.st $(INCLUDE_TOP)\jv\vdb\VDBModelPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBVariablePresenter.$(O) VDBVariablePresenter.$(H): VDBVariablePresenter.st $(INCLUDE_TOP)\jv\vdb\VDBModelPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBAbstractTreeApplication.$(O) VDBAbstractTreeApplication.$(H): VDBAbstractTreeApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractListApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)VDBTabbingContainer.$(O) VDBTabbingContainer.$(H): VDBTabbingContainer.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractContainer.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)VDBFrameApplication.$(O) VDBFrameApplication.$(H): VDBFrameApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractListApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractTreeApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)VDBStackApplication.$(O) VDBStackApplication.$(H): VDBStackApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractListApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractTreeApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)VDBAbstractApplication.$(O) VDBAbstractApplication.$(C) VDBAbstractApplication.$(H): VDBAbstractApplication.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)VDBIconLibrary.$(O) VDBIconLibrary.$(C) VDBIconLibrary.$(H): VDBIconLibrary.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)VDBModelPresenter.$(O) VDBModelPresenter.$(C) VDBModelPresenter.$(H): VDBModelPresenter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)jv_vdb.$(O) jv_vdb.$(C) jv_vdb.$(H): jv_vdb.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)VDBAbstractConsoleApplication.$(O) VDBAbstractConsoleApplication.$(C) VDBAbstractConsoleApplication.$(H): VDBAbstractConsoleApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)VDBAbstractContainer.$(O) VDBAbstractContainer.$(C) VDBAbstractContainer.$(H): VDBAbstractContainer.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)VDBAbstractListApplication.$(O) VDBAbstractListApplication.$(C) VDBAbstractListApplication.$(H): VDBAbstractListApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)VDBDebuggerApplication.$(O) VDBDebuggerApplication.$(C) VDBDebuggerApplication.$(H): VDBDebuggerApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)VDBEventLogApplication.$(O) VDBEventLogApplication.$(C) VDBEventLogApplication.$(H): VDBEventLogApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)VDBFramePresenter.$(O) VDBFramePresenter.$(C) VDBFramePresenter.$(H): VDBFramePresenter.st $(INCLUDE_TOP)\jv\vdb\VDBModelPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBSourceApplication.$(O) VDBSourceApplication.$(C) VDBSourceApplication.$(H): VDBSourceApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)VDBThreadGroupPresenter.$(O) VDBThreadGroupPresenter.$(C) VDBThreadGroupPresenter.$(H): VDBThreadGroupPresenter.st $(INCLUDE_TOP)\jv\vdb\VDBModelPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBThreadPresenter.$(O) VDBThreadPresenter.$(C) VDBThreadPresenter.$(H): VDBThreadPresenter.st $(INCLUDE_TOP)\jv\vdb\VDBModelPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBVariablePresenter.$(O) VDBVariablePresenter.$(C) VDBVariablePresenter.$(H): VDBVariablePresenter.st $(INCLUDE_TOP)\jv\vdb\VDBModelPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBAbstractTreeApplication.$(O) VDBAbstractTreeApplication.$(C) VDBAbstractTreeApplication.$(H): VDBAbstractTreeApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractListApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)VDBDebuggerConsoleApplication.$(O) VDBDebuggerConsoleApplication.$(C) VDBDebuggerConsoleApplication.$(H): VDBDebuggerConsoleApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractConsoleApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)VDBInferiorConsoleApplication.$(O) VDBInferiorConsoleApplication.$(C) VDBInferiorConsoleApplication.$(H): VDBInferiorConsoleApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractConsoleApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)VDBTabbingContainer.$(O) VDBTabbingContainer.$(C) VDBTabbingContainer.$(H): VDBTabbingContainer.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractContainer.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)VDBFrameApplication.$(O) VDBFrameApplication.$(C) VDBFrameApplication.$(H): VDBFrameApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractListApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractTreeApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)VDBStackApplication.$(O) VDBStackApplication.$(C) VDBStackApplication.$(H): VDBStackApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractListApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractTreeApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/bmake.bat Sun Mar 08 15:50:52 2015 +0000
+++ b/bmake.bat Thu Jun 01 12:23:04 2017 +0100
@@ -7,6 +7,9 @@
@REM Kludge got Mercurial, cannot be implemented in Borland make
@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
make.exe -N -f bc.mak %DEFINES% %*
+
+
--- a/jv_vdb.st Sun Mar 08 15:50:52 2015 +0000
+++ b/jv_vdb.st Thu Jun 01 12:23:04 2017 +0100
@@ -27,32 +27,33 @@
are extended by myself.
They are mandatory, because we need these packages as a prerequisite for loading and compiling.
This method is generated automatically,
- by searching along the inheritance chain of all of my classes."
+ by searching along the inheritance chain of all of my classes.
+ Please take a look at the #referencedPreRequisites method as well."
^ #(
- #'jv:libgdbs' "GDBCommandStatus - shared pool used by VDBDebuggerConsoleApplication"
#'stx:libbasic' "LibraryDefinition - superclass of jv_vdb"
- #'stx:libview' "DisplaySurface - superclass of VDBDebuggerConsoleView"
#'stx:libview2' "ApplicationModel - superclass of VDBAbstractApplication"
- #'stx:libwidg' "EditTextView - superclass of VDBDebuggerConsoleView"
- #'stx:libwidg2' "HierarchicalItem - superclass of VDBFramePresenter"
+ #'stx:libwidg2' "AbstractHierarchicalItem - superclass of VDBFramePresenter"
)
!
referencedPreRequisites
"list packages which are a prerequisite, because they contain
classes which are referenced by my classes.
- We do not need these packages as a prerequisite for compiling or loading,
+ These packages are NOT needed as a prerequisite for compiling or loading,
however, a class from it may be referenced during execution and having it
unloaded then may lead to a runtime doesNotUnderstand error, unless the caller
includes explicit checks for the package being present.
This method is generated automatically,
- by searching all classes (and their packages) which are referenced by my classes."
+ by searching all classes (and their packages) which are referenced by my classes.
+ Please also take a look at the #mandatoryPreRequisites method"
^ #(
+ #'jv:libgdbs' "GDBDebugger - referenced by VDBDebuggerApplication class>>open"
#'stx:libbasic2' "List - referenced by VDBAbstractContainer>>initialize"
#'stx:libtool' "SmalltalkCodeGeneratorTool - referenced by VDBIconLibrary class>>loadAndCompileImagesFrom:categoryPrefix:"
#'stx:libtool2' "MenuEditor - referenced by VDBIconLibrary class>>initialize"
+ #'stx:libview' "Color - referenced by VDBAbstractConsoleApplication>>consoleView"
)
!
@@ -77,22 +78,22 @@
^ #(
"<className> or (<className> attributes...) in load order"
VDBAbstractApplication
- VDBDebuggerConsoleView
VDBIconLibrary
VDBModelPresenter
#'jv_vdb'
+ VDBAbstractConsoleApplication
VDBAbstractContainer
VDBAbstractListApplication
VDBDebuggerApplication
- VDBDebuggerConsoleApplication
VDBEventLogApplication
VDBFramePresenter
- VDBInferiorConsoleApplication
VDBSourceApplication
VDBThreadGroupPresenter
VDBThreadPresenter
VDBVariablePresenter
VDBAbstractTreeApplication
+ VDBDebuggerConsoleApplication
+ VDBInferiorConsoleApplication
VDBTabbingContainer
VDBFrameApplication
VDBStackApplication
@@ -100,8 +101,10 @@
!
extensionMethodNames
- "list class/selector pairs of extensions.
- A correponding method with real names must be present in my concrete subclasses"
+ "lists the extension methods which are to be included in the project.
+ Entries are 2-element array literals, consisting of class-name and selector.
+ A correponding method with real names must be present in my concrete subclasses
+ if it has extensions."
^ #(
)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jv_vdbWINrc.rc Thu Jun 01 12:23:04 2017 +0100
@@ -0,0 +1,37 @@
+//
+// DO NOT EDIT
+// automagically generated from the projectDefinition: jv_vdb.
+//
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 6,2,2,2
+ PRODUCTVERSION 6,2,6,0
+#if (__BORLANDC__)
+ FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
+ FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VS_USER_DEFINED
+#endif
+
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "My Company\0"
+ VALUE "FileDescription", "Class Library (LIB)\0"
+ VALUE "FileVersion", "6.2.2.2\0"
+ VALUE "InternalName", "jv:vdb\0"
+ VALUE "LegalCopyright", "My CopyRight or CopyLeft\0"
+ VALUE "ProductName", "LibraryName\0"
+ VALUE "ProductVersion", "6.2.6.0\0"
+ VALUE "ProductDate", "Thu, 01 Jun 2017 11:16:29 GMT\0"
+ END
+
+ END
+
+ BLOCK "VarFileInfo"
+ BEGIN // Language | Translation
+ VALUE "Translation", 0x409, 0x4E4 // U.S. English, Windows Multilingual
+ END
+END
--- a/libInit.cc Sun Mar 08 15:50:52 2015 +0000
+++ b/libInit.cc Thu Jun 01 12:23:04 2017 +0100
@@ -16,38 +16,61 @@
DLL_EXPORT void _libjv_vdb_InitDefinition() INIT_TEXT_SECTION;
#endif
-void _libjv_vdb_InitDefinition(pass, __pRT__, snd)
-OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libjv_vdb__DFN", _libjv_vdb_InitDefinition, "jv:vdb");
-_jv_137vdb_Init(pass,__pRT__,snd);
+extern void _VDBAbstractApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBIconLibrary_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBModelPresenter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _jv_137vdb_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBAbstractConsoleApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBAbstractContainer_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBAbstractListApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBDebuggerApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBEventLogApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBFramePresenter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBSourceApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBThreadGroupPresenter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBThreadPresenter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBVariablePresenter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBAbstractTreeApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBDebuggerConsoleApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBInferiorConsoleApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBTabbingContainer_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBFrameApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBStackApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-__END_PACKAGE__();
+
+
+void _libjv_vdb_InitDefinition(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+ __BEGIN_PACKAGE2__("libjv_vdb__DFN", _libjv_vdb_InitDefinition, "jv:vdb");
+ _jv_137vdb_Init(pass,__pRT__,snd);
+
+ __END_PACKAGE__();
}
-void _libjv_vdb_Init(pass, __pRT__, snd)
-OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libjv_vdb", _libjv_vdb_Init, "jv:vdb");
-_VDBAbstractApplication_Init(pass,__pRT__,snd);
-_VDBDebuggerConsoleView_Init(pass,__pRT__,snd);
-_VDBIconLibrary_Init(pass,__pRT__,snd);
-_VDBModelPresenter_Init(pass,__pRT__,snd);
-_jv_137vdb_Init(pass,__pRT__,snd);
-_VDBAbstractContainer_Init(pass,__pRT__,snd);
-_VDBAbstractListApplication_Init(pass,__pRT__,snd);
-_VDBDebuggerApplication_Init(pass,__pRT__,snd);
-_VDBDebuggerConsoleApplication_Init(pass,__pRT__,snd);
-_VDBEventLogApplication_Init(pass,__pRT__,snd);
-_VDBFramePresenter_Init(pass,__pRT__,snd);
-_VDBInferiorConsoleApplication_Init(pass,__pRT__,snd);
-_VDBSourceApplication_Init(pass,__pRT__,snd);
-_VDBThreadGroupPresenter_Init(pass,__pRT__,snd);
-_VDBThreadPresenter_Init(pass,__pRT__,snd);
-_VDBVariablePresenter_Init(pass,__pRT__,snd);
-_VDBAbstractTreeApplication_Init(pass,__pRT__,snd);
-_VDBTabbingContainer_Init(pass,__pRT__,snd);
-_VDBFrameApplication_Init(pass,__pRT__,snd);
-_VDBStackApplication_Init(pass,__pRT__,snd);
+void _libjv_vdb_Init(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+ __BEGIN_PACKAGE2__("libjv_vdb", _libjv_vdb_Init, "jv:vdb");
+ _VDBAbstractApplication_Init(pass,__pRT__,snd);
+ _VDBIconLibrary_Init(pass,__pRT__,snd);
+ _VDBModelPresenter_Init(pass,__pRT__,snd);
+ _jv_137vdb_Init(pass,__pRT__,snd);
+ _VDBAbstractConsoleApplication_Init(pass,__pRT__,snd);
+ _VDBAbstractContainer_Init(pass,__pRT__,snd);
+ _VDBAbstractListApplication_Init(pass,__pRT__,snd);
+ _VDBDebuggerApplication_Init(pass,__pRT__,snd);
+ _VDBEventLogApplication_Init(pass,__pRT__,snd);
+ _VDBFramePresenter_Init(pass,__pRT__,snd);
+ _VDBSourceApplication_Init(pass,__pRT__,snd);
+ _VDBThreadGroupPresenter_Init(pass,__pRT__,snd);
+ _VDBThreadPresenter_Init(pass,__pRT__,snd);
+ _VDBVariablePresenter_Init(pass,__pRT__,snd);
+ _VDBAbstractTreeApplication_Init(pass,__pRT__,snd);
+ _VDBDebuggerConsoleApplication_Init(pass,__pRT__,snd);
+ _VDBInferiorConsoleApplication_Init(pass,__pRT__,snd);
+ _VDBTabbingContainer_Init(pass,__pRT__,snd);
+ _VDBFrameApplication_Init(pass,__pRT__,snd);
+ _VDBStackApplication_Init(pass,__pRT__,snd);
-__END_PACKAGE__();
+ __END_PACKAGE__();
}
--- a/mingwmake.bat Sun Mar 08 15:50:52 2015 +0000
+++ b/mingwmake.bat Thu Jun 01 12:23:04 2017 +0100
@@ -14,3 +14,5 @@
make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
+
+
--- a/tests/Make.proto Sun Mar 08 15:50:52 2015 +0000
+++ b/tests/Make.proto Thu Jun 01 12:23:04 2017 +0100
@@ -101,7 +101,7 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
- cd $(TOP)/libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -121,7 +121,7 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)jv_vdb_tests.$(O) jv_vdb_tests.$(H): jv_vdb_tests.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)jv_vdb_tests.$(O) jv_vdb_tests.$(C) jv_vdb_tests.$(H): jv_vdb_tests.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/tests/Make.spec Sun Mar 08 15:50:52 2015 +0000
+++ b/tests/Make.spec Thu Jun 01 12:23:04 2017 +0100
@@ -22,7 +22,7 @@
# (if removed, they will be created as common
# -Pxxx : defines the package
# -Zxxx : a prefix for variables within the classLib
-# -Dxxx : defines passed to to CC for inline C-code
+# -Dxxx : defines passed to CC for inline C-code
# -Ixxx : include path passed to CC for inline C-code
# +optspace : optimized for space
# +optspace2 : optimized more for space
@@ -57,7 +57,7 @@
COMMON_OBJS= \
- $(OUTDIR_SLASH)jv_vdb_tests.$(O) \
+ $(OUTDIR)jv_vdb_tests.$(O) \
--- a/tests/bc.mak Sun Mar 08 15:50:52 2015 +0000
+++ b/tests/bc.mak Thu Jun 01 12:23:04 2017 +0100
@@ -31,7 +31,7 @@
LIBNAME=libjv_vdb_tests
MODULE_PATH=vdb\tests
-RESFILES=tests.$(RES)
+RESFILES=jv_vdb_testsWINrc.$(RES)
@@ -64,11 +64,11 @@
$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
clean::
- del *.$(CSUFFIX)
+ -del *.$(CSUFFIX)
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)jv_vdb_tests.$(O) jv_vdb_tests.$(H): jv_vdb_tests.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)jv_vdb_tests.$(O) jv_vdb_tests.$(C) jv_vdb_tests.$(H): jv_vdb_tests.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/tests/bmake.bat Sun Mar 08 15:50:52 2015 +0000
+++ b/tests/bmake.bat Thu Jun 01 12:23:04 2017 +0100
@@ -7,6 +7,9 @@
@REM Kludge got Mercurial, cannot be implemented in Borland make
@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
make.exe -N -f bc.mak %DEFINES% %*
+
+
--- a/tests/jv_vdb_tests.st Sun Mar 08 15:50:52 2015 +0000
+++ b/tests/jv_vdb_tests.st Thu Jun 01 12:23:04 2017 +0100
@@ -27,7 +27,8 @@
are extended by myself.
They are mandatory, because we need these packages as a prerequisite for loading and compiling.
This method is generated automatically,
- by searching along the inheritance chain of all of my classes."
+ by searching along the inheritance chain of all of my classes.
+ Please take a look at the #referencedPreRequisites method as well."
^ #(
#'stx:libbasic' "LibraryDefinition - superclass of jv_vdb_tests"
@@ -37,12 +38,13 @@
referencedPreRequisites
"list packages which are a prerequisite, because they contain
classes which are referenced by my classes.
- We do not need these packages as a prerequisite for compiling or loading,
+ These packages are NOT needed as a prerequisite for compiling or loading,
however, a class from it may be referenced during execution and having it
unloaded then may lead to a runtime doesNotUnderstand error, unless the caller
includes explicit checks for the package being present.
This method is generated automatically,
- by searching all classes (and their packages) which are referenced by my classes."
+ by searching all classes (and their packages) which are referenced by my classes.
+ Please also take a look at the #mandatoryPreRequisites method"
^ #(
)
@@ -73,8 +75,10 @@
!
extensionMethodNames
- "list class/selector pairs of extensions.
- A correponding method with real names must be present in my concrete subclasses"
+ "lists the extension methods which are to be included in the project.
+ Entries are 2-element array literals, consisting of class-name and selector.
+ A correponding method with real names must be present in my concrete subclasses
+ if it has extensions."
^ #(
)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jv_vdb_testsWINrc.rc Thu Jun 01 12:23:04 2017 +0100
@@ -0,0 +1,37 @@
+//
+// DO NOT EDIT
+// automagically generated from the projectDefinition: jv_vdb_tests.
+//
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 6,2,2,2
+ PRODUCTVERSION 6,2,6,0
+#if (__BORLANDC__)
+ FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
+ FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VS_USER_DEFINED
+#endif
+
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "My Company\0"
+ VALUE "FileDescription", "Class Library (LIB)\0"
+ VALUE "FileVersion", "6.2.2.2\0"
+ VALUE "InternalName", "jv:vdb/tests\0"
+ VALUE "LegalCopyright", "My CopyRight or CopyLeft\0"
+ VALUE "ProductName", "LibraryName\0"
+ VALUE "ProductVersion", "6.2.6.0\0"
+ VALUE "ProductDate", "Thu, 01 Jun 2017 11:16:30 GMT\0"
+ END
+
+ END
+
+ BLOCK "VarFileInfo"
+ BEGIN // Language | Translation
+ VALUE "Translation", 0x409, 0x4E4 // U.S. English, Windows Multilingual
+ END
+END
--- a/tests/libInit.cc Sun Mar 08 15:50:52 2015 +0000
+++ b/tests/libInit.cc Thu Jun 01 12:23:04 2017 +0100
@@ -16,19 +16,23 @@
DLL_EXPORT void _libjv_vdb_tests_InitDefinition() INIT_TEXT_SECTION;
#endif
-void _libjv_vdb_tests_InitDefinition(pass, __pRT__, snd)
-OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libjv_vdb_tests__DFN", _libjv_vdb_tests_InitDefinition, "jv:vdb/tests");
-_jv_137vdb_137tests_Init(pass,__pRT__,snd);
+extern void _jv_137vdb_137tests_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+
+
-__END_PACKAGE__();
+void _libjv_vdb_tests_InitDefinition(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+ __BEGIN_PACKAGE2__("libjv_vdb_tests__DFN", _libjv_vdb_tests_InitDefinition, "jv:vdb/tests");
+ _jv_137vdb_137tests_Init(pass,__pRT__,snd);
+
+ __END_PACKAGE__();
}
-void _libjv_vdb_tests_Init(pass, __pRT__, snd)
-OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libjv_vdb_tests", _libjv_vdb_tests_Init, "jv:vdb/tests");
-_jv_137vdb_137tests_Init(pass,__pRT__,snd);
+void _libjv_vdb_tests_Init(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+ __BEGIN_PACKAGE2__("libjv_vdb_tests", _libjv_vdb_tests_Init, "jv:vdb/tests");
+ _jv_137vdb_137tests_Init(pass,__pRT__,snd);
-__END_PACKAGE__();
+ __END_PACKAGE__();
}
--- a/tests/mingwmake.bat Sun Mar 08 15:50:52 2015 +0000
+++ b/tests/mingwmake.bat Thu Jun 01 12:23:04 2017 +0100
@@ -14,3 +14,5 @@
make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
+
+
--- a/tests/vcmake.bat Sun Mar 08 15:50:52 2015 +0000
+++ b/tests/vcmake.bat Thu Jun 01 12:23:04 2017 +0100
@@ -13,6 +13,8 @@
@REM Kludge got Mercurial, cannot be implemented in Borland make
@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
+
make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
--- a/vcmake.bat Sun Mar 08 15:50:52 2015 +0000
+++ b/vcmake.bat Thu Jun 01 12:23:04 2017 +0100
@@ -13,6 +13,8 @@
@REM Kludge got Mercurial, cannot be implemented in Borland make
@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
+
make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*