UI: "disable" frames in frame list while inferior is running
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 09 Apr 2018 21:43:54 +0100
changeset 72 4e8268dabaf7
parent 71 7329192efb9d
child 73 82e202dec6cb
UI: "disable" frames in frame list while inferior is running ...as the list is not up to date and frame state cannot be queried. "Disabling" means to draw them grayed, unselect any possibly selected frame and make them non-selectable. Once inferior stops, "enable" them again.
Make.proto
Make.spec
Makefile.init
VDBAbstractListApplication.st
VDBAbstractTreeApplication.st
VDBFrameApplication.st
VDBFramePresenter.st
VDBStackApplication.st
abbrev.stc
application/Make.proto
application/Make.spec
application/Makefile.init
application/abbrev.stc
application/application.nsi
application/autopackage/default.apspec
application/bc.mak
application/bmake.bat
application/builder/baseline.rbspec
application/builder/package.deps.rake
application/mingwmake.bat
application/modules.c
application/modules.stx
application/osx/Info.plist
application/vcmake.bat
bc.mak
bmake.bat
libInit.cc
mingwmake.bat
tests/Make.proto
tests/Make.spec
tests/Makefile.init
tests/abbrev.stc
tests/bc.mak
tests/bmake.bat
tests/libInit.cc
tests/mingwmake.bat
tests/vcmake.bat
vcmake.bat
--- a/Make.proto	Wed Apr 04 23:16:30 2018 +0100
+++ b/Make.proto	Mon Apr 09 21:43:54 2018 +0100
@@ -1,165 +1,165 @@
-# $Header$
-#
-# DO NOT EDIT
-# automagically generated from the projectDefinition: jv_vdb.
-#
-# Warning: once you modify this file, do not rerun
-# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
-#
-# The Makefile as generated by this Make.proto supports the following targets:
-#    make         - compile all st-files to a classLib
-#    make clean   - clean all temp files
-#    make clobber - clean all
-#
-# This file contains definitions for Unix based platforms.
-# It shares common definitions with the win32-make in Make.spec.
-
-#
-# position (of this package) in directory hierarchy:
-# (must point to ST/X top directory, for tools and includes)
-TOP=../../stx
-INCLUDE_TOP=$(TOP)/..
-
-# subdirectories where targets are to be made:
-SUBDIRS=
-
-
-# subdirectories where Makefiles are to be made:
-# (only define if different from SUBDIRS)
-# ALLSUBDIRS=
-
-REQUIRED_SUPPORT_DIRS=
-
-# if your embedded C code requires any system includes,
-# add the path(es) here:,
-# ********** OPTIONAL: MODIFY the next lines ***
-# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/jv/libgdbs -I$(INCLUDE_TOP)/stx/goodies/xml/vw -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
-
-
-# if you need any additional defines for embedded C code,
-# add them here:,
-# ********** OPTIONAL: MODIFY the next lines ***
-# LOCALDEFINES=-Dfoo -Dbar -DDEBUG
-LOCALDEFINES=
-
-LIBNAME=libjv_vdb
-STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=.  -varPrefix=$(LIBNAME)
-
-
-# ********** OPTIONAL: MODIFY the next line ***
-# additional C-libraries that should be pre-linked with the class-objects
-LD_OBJ_LIBS=
-LOCAL_SHARED_LIBS=
-
-
-# ********** OPTIONAL: MODIFY the next line ***
-# additional C targets or libraries should be added below
-LOCAL_EXTRA_TARGETS=
-
-OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
-
-
-
-all:: preMake classLibRule postMake
-
-pre_objs::  
-
-
-
-
-
-
-# Enforce recompilation of package definition class if Mercurial working
-# copy state changes. Together with --guessVersion it ensures that package
-# definition class always contains correct binary revision string.
-ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
-jv_vdb.$(O): $(shell hg root)/.hg/dirstate
-endif
-
-
-
-
-# run default testsuite for this package
-test: $(TOP)/goodies/builder/reports
-	$(MAKE) -C $(TOP)/goodies/builder/reports -f Makefile.init
-	$(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE)
-
-
-
-# add more install actions here
-install::
-
-# add more install actions for aux-files (resources) here
-installAux::
-
-# add more preMake actions here
-preMake::
-
-# add more postMake actions here
-postMake:: cleanjunk
-
-# 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)/libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	cd $(TOP)/libview2 && $(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) "
-
-
-
-# build all packages containing referenced classes for this package
-# they are not needed to compile the package (but later, to load it)
-references:
-
-
-cleanjunk::
-	-rm -f *.s *.s2
-
-clean::
-	-rm -f *.o *.H
-
-clobber:: clean
-	-rm -f *.so *.dll
-
-
-# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(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)VDBAbstractPresenter.$(O) VDBAbstractPresenter.$(C) VDBAbstractPresenter.$(H): VDBAbstractPresenter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBEvaluator.$(O) VDBEvaluator.$(C) VDBEvaluator.$(H): VDBEvaluator.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)VDBIconLibrary.$(O) VDBIconLibrary.$(C) VDBIconLibrary.$(H): VDBIconLibrary.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)VDBVirtualMemoryMap.$(O) VDBVirtualMemoryMap.$(C) VDBVirtualMemoryMap.$(H): VDBVirtualMemoryMap.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)VDBVirtualMemoryRegion.$(O) VDBVirtualMemoryRegion.$(C) VDBVirtualMemoryRegion.$(H): VDBVirtualMemoryRegion.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)VDBWindowsDebuggerConsoleView.$(O) VDBWindowsDebuggerConsoleView.$(C) VDBWindowsDebuggerConsoleView.$(H): VDBWindowsDebuggerConsoleView.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)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)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)VDBAbstractUnixConsoleApplication.$(O) VDBAbstractUnixConsoleApplication.$(C) VDBAbstractUnixConsoleApplication.$(H): VDBAbstractUnixConsoleApplication.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)VDBBreakpointApplication.$(O) VDBBreakpointApplication.$(C) VDBBreakpointApplication.$(H): VDBBreakpointApplication.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)VDBBreakpointPresenter.$(O) VDBBreakpointPresenter.$(C) VDBBreakpointPresenter.$(H): VDBBreakpointPresenter.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(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)VDBFrameApplication.$(O) VDBFrameApplication.$(C) VDBFrameApplication.$(H): VDBFrameApplication.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/VDBAbstractPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBMemoryApplication.$(O) VDBMemoryApplication.$(C) VDBMemoryApplication.$(H): VDBMemoryApplication.st $(INCLUDE_TOP)/jv/libgdbs/GDBOutputFormats.$(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)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/VDBAbstractPresenter.$(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/VDBAbstractPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBVariableObjectPresenter.$(O) VDBVariableObjectPresenter.$(C) VDBVariableObjectPresenter.$(H): VDBVariableObjectPresenter.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBWindowsDebuggerConsoleApplication.$(O) VDBWindowsDebuggerConsoleApplication.$(C) VDBWindowsDebuggerConsoleApplication.$(H): VDBWindowsDebuggerConsoleApplication.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)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)VDBBreakpointListApplication.$(O) VDBBreakpointListApplication.$(C) VDBBreakpointListApplication.$(H): VDBBreakpointListApplication.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.$(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)VDBUnixDebuggerConsoleApplication.$(O) VDBUnixDebuggerConsoleApplication.$(C) VDBUnixDebuggerConsoleApplication.$(H): VDBUnixDebuggerConsoleApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractUnixConsoleApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)VDBUnixInferiorConsoleApplication.$(O) VDBUnixInferiorConsoleApplication.$(C) VDBUnixInferiorConsoleApplication.$(H): VDBUnixInferiorConsoleApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractUnixConsoleApplication.$(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)
-$(OUTDIR)VDBVariableObjectListApplication.$(O) VDBVariableObjectListApplication.$(C) VDBVariableObjectListApplication.$(H): VDBVariableObjectListApplication.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)extensions.$(O): extensions.st $(INCLUDE_TOP)/jv/libgdbs/GDBDebuggerObject.$(H) $(INCLUDE_TOP)/jv/libgdbs/GDBObject.$(H) $(INCLUDE_TOP)/jv/libgdbs/GDBVariableObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-
-# ENDMAKEDEPEND --- do not remove this line
-
+# $Header$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: jv_vdb.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# The Makefile as generated by this Make.proto supports the following targets:
+#    make         - compile all st-files to a classLib
+#    make clean   - clean all temp files
+#    make clobber - clean all
+#
+# This file contains definitions for Unix based platforms.
+# It shares common definitions with the win32-make in Make.spec.
+
+#
+# position (of this package) in directory hierarchy:
+# (must point to ST/X top directory, for tools and includes)
+TOP=../../stx
+INCLUDE_TOP=$(TOP)/..
+
+# subdirectories where targets are to be made:
+SUBDIRS=
+
+
+# subdirectories where Makefiles are to be made:
+# (only define if different from SUBDIRS)
+# ALLSUBDIRS=
+
+REQUIRED_SUPPORT_DIRS=
+
+# if your embedded C code requires any system includes,
+# add the path(es) here:,
+# ********** OPTIONAL: MODIFY the next lines ***
+# LOCALINCLUDES=-Ifoo -Ibar
+LOCALINCLUDES= -I$(INCLUDE_TOP)/jv/libgdbs -I$(INCLUDE_TOP)/stx/goodies/xml/vw -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
+
+
+# if you need any additional defines for embedded C code,
+# add them here:,
+# ********** OPTIONAL: MODIFY the next lines ***
+# LOCALDEFINES=-Dfoo -Dbar -DDEBUG
+LOCALDEFINES=
+
+LIBNAME=libjv_vdb
+STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=.  -varPrefix=$(LIBNAME)
+
+
+# ********** OPTIONAL: MODIFY the next line ***
+# additional C-libraries that should be pre-linked with the class-objects
+LD_OBJ_LIBS=
+LOCAL_SHARED_LIBS=
+
+
+# ********** OPTIONAL: MODIFY the next line ***
+# additional C targets or libraries should be added below
+LOCAL_EXTRA_TARGETS=
+
+OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
+
+
+
+all:: preMake classLibRule postMake
+
+pre_objs::  
+
+
+
+
+
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
+jv_vdb.$(O): $(shell hg root)/.hg/dirstate
+endif
+
+
+
+
+# run default testsuite for this package
+test: $(TOP)/goodies/builder/reports
+	$(MAKE) -C $(TOP)/goodies/builder/reports -f Makefile.init
+	$(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE)
+
+
+
+# add more install actions here
+install::
+
+# add more install actions for aux-files (resources) here
+installAux::
+
+# add more preMake actions here
+preMake::
+
+# add more postMake actions here
+postMake:: cleanjunk
+
+# 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)/libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd $(TOP)/libview2 && $(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) "
+
+
+
+# build all packages containing referenced classes for this package
+# they are not needed to compile the package (but later, to load it)
+references:
+
+
+cleanjunk::
+	-rm -f *.s *.s2
+
+clean::
+	-rm -f *.o *.H
+
+clobber:: clean
+	-rm -f *.so *.dll
+
+
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(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)VDBAbstractPresenter.$(O) VDBAbstractPresenter.$(C) VDBAbstractPresenter.$(H): VDBAbstractPresenter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBEvaluator.$(O) VDBEvaluator.$(C) VDBEvaluator.$(H): VDBEvaluator.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)VDBIconLibrary.$(O) VDBIconLibrary.$(C) VDBIconLibrary.$(H): VDBIconLibrary.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)VDBVirtualMemoryMap.$(O) VDBVirtualMemoryMap.$(C) VDBVirtualMemoryMap.$(H): VDBVirtualMemoryMap.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)VDBVirtualMemoryRegion.$(O) VDBVirtualMemoryRegion.$(C) VDBVirtualMemoryRegion.$(H): VDBVirtualMemoryRegion.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)VDBWindowsDebuggerConsoleView.$(O) VDBWindowsDebuggerConsoleView.$(C) VDBWindowsDebuggerConsoleView.$(H): VDBWindowsDebuggerConsoleView.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)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)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)VDBAbstractUnixConsoleApplication.$(O) VDBAbstractUnixConsoleApplication.$(C) VDBAbstractUnixConsoleApplication.$(H): VDBAbstractUnixConsoleApplication.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)VDBBreakpointApplication.$(O) VDBBreakpointApplication.$(C) VDBBreakpointApplication.$(H): VDBBreakpointApplication.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)VDBBreakpointPresenter.$(O) VDBBreakpointPresenter.$(C) VDBBreakpointPresenter.$(H): VDBBreakpointPresenter.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(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)VDBFrameApplication.$(O) VDBFrameApplication.$(C) VDBFrameApplication.$(H): VDBFrameApplication.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/VDBAbstractPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBMemoryApplication.$(O) VDBMemoryApplication.$(C) VDBMemoryApplication.$(H): VDBMemoryApplication.st $(INCLUDE_TOP)/jv/libgdbs/GDBOutputFormats.$(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)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/VDBAbstractPresenter.$(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/VDBAbstractPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBVariableObjectPresenter.$(O) VDBVariableObjectPresenter.$(C) VDBVariableObjectPresenter.$(H): VDBVariableObjectPresenter.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractPresenter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBWindowsDebuggerConsoleApplication.$(O) VDBWindowsDebuggerConsoleApplication.$(C) VDBWindowsDebuggerConsoleApplication.$(H): VDBWindowsDebuggerConsoleApplication.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)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)VDBBreakpointListApplication.$(O) VDBBreakpointListApplication.$(C) VDBBreakpointListApplication.$(H): VDBBreakpointListApplication.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.$(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)VDBUnixDebuggerConsoleApplication.$(O) VDBUnixDebuggerConsoleApplication.$(C) VDBUnixDebuggerConsoleApplication.$(H): VDBUnixDebuggerConsoleApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractUnixConsoleApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)VDBUnixInferiorConsoleApplication.$(O) VDBUnixInferiorConsoleApplication.$(C) VDBUnixInferiorConsoleApplication.$(H): VDBUnixInferiorConsoleApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/jv/vdb/VDBAbstractUnixConsoleApplication.$(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)
+$(OUTDIR)VDBVariableObjectListApplication.$(O) VDBVariableObjectListApplication.$(C) VDBVariableObjectListApplication.$(H): VDBVariableObjectListApplication.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)extensions.$(O): extensions.st $(INCLUDE_TOP)/jv/libgdbs/GDBDebuggerObject.$(H) $(INCLUDE_TOP)/jv/libgdbs/GDBObject.$(H) $(INCLUDE_TOP)/jv/libgdbs/GDBVariableObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+
+# ENDMAKEDEPEND --- do not remove this line
+
--- a/Make.spec	Wed Apr 04 23:16:30 2018 +0100
+++ b/Make.spec	Mon Apr 09 21:43:54 2018 +0100
@@ -1,122 +1,122 @@
-# $Header$
-#
-# DO NOT EDIT
-# automagically generated from the projectDefinition: jv_vdb.
-#
-# Warning: once you modify this file, do not rerun
-# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
-#
-# This file contains specifications which are common to all platforms.
-#
-
-# Do NOT CHANGE THESE DEFINITIONS
-# (otherwise, ST/X will have a hard time to find out the packages location from its packageID,
-#  to find the source code of a class and to find the library for a package)
-MODULE=jv
-MODULE_DIR=vdb
-PACKAGE=$(MODULE):$(MODULE_DIR)
-
-
-# Argument(s) to the stc compiler (stc --usage).
-#  -headerDir=. : create header files locally
-#                (if removed, they will be created as common
-#  -Pxxx       : defines the package
-#  -Zxxx       : a prefix for variables within the classLib
-#  -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
-#  +optspace3  : optimized even more for space
-#  +optinline  : generate inline code for some ST constructs
-#  +inlineNew  : additionally inline new
-#  +inlineMath : additionally inline some floatPnt math stuff
-#
-# ********** OPTIONAL: MODIFY the next line(s) ***
-# STCLOCALOPTIMIZATIONS=+optinline +inlineNew
-# STCLOCALOPTIMIZATIONS=+optspace3
-STCLOCALOPTIMIZATIONS=+optspace3
-
-
-# Argument(s) to the stc compiler (stc --usage).
-#  -warn            : no warnings
-#  -warnNonStandard : no warnings about ST/X extensions
-#  -warnEOLComments : no warnings about EOL comment extension
-#  -warnPrivacy     : no warnings about privateClass extension
-#  -warnUnused      : no warnings about unused variables
-#
-# ********** OPTIONAL: MODIFY the next line(s) ***
-# STCWARNINGS=-warn
-# STCWARNINGS=-warnNonStandard
-# STCWARNINGS=-warnEOLComments
-STCWARNINGS=-warnNonStandard
-
-COMMON_CLASSES= \
-	VDBAbstractApplication \
-	VDBAbstractPresenter \
-	VDBEvaluator \
-	VDBIconLibrary \
-	VDBVirtualMemoryMap \
-	VDBVirtualMemoryRegion \
-	VDBWindowsDebuggerConsoleView \
-	jv_vdb \
-	VDBAbstractContainer \
-	VDBAbstractListApplication \
-	VDBAbstractUnixConsoleApplication \
-	VDBBreakpointApplication \
-	VDBBreakpointPresenter \
-	VDBDebuggerApplication \
-	VDBEventLogApplication \
-	VDBFrameApplication \
-	VDBFramePresenter \
-	VDBMemoryApplication \
-	VDBSourceApplication \
-	VDBThreadGroupPresenter \
-	VDBThreadPresenter \
-	VDBVariableObjectPresenter \
-	VDBWindowsDebuggerConsoleApplication \
-	VDBAbstractTreeApplication \
-	VDBBreakpointListApplication \
-	VDBTabbingContainer \
-	VDBUnixDebuggerConsoleApplication \
-	VDBUnixInferiorConsoleApplication \
-	VDBStackApplication \
-	VDBVariableObjectListApplication \
-
-
-
-
-COMMON_OBJS= \
-    $(OUTDIR)VDBAbstractApplication.$(O) \
-    $(OUTDIR)VDBAbstractPresenter.$(O) \
-    $(OUTDIR)VDBEvaluator.$(O) \
-    $(OUTDIR)VDBIconLibrary.$(O) \
-    $(OUTDIR)VDBVirtualMemoryMap.$(O) \
-    $(OUTDIR)VDBVirtualMemoryRegion.$(O) \
-    $(OUTDIR)VDBWindowsDebuggerConsoleView.$(O) \
-    $(OUTDIR)jv_vdb.$(O) \
-    $(OUTDIR)VDBAbstractContainer.$(O) \
-    $(OUTDIR)VDBAbstractListApplication.$(O) \
-    $(OUTDIR)VDBAbstractUnixConsoleApplication.$(O) \
-    $(OUTDIR)VDBBreakpointApplication.$(O) \
-    $(OUTDIR)VDBBreakpointPresenter.$(O) \
-    $(OUTDIR)VDBDebuggerApplication.$(O) \
-    $(OUTDIR)VDBEventLogApplication.$(O) \
-    $(OUTDIR)VDBFrameApplication.$(O) \
-    $(OUTDIR)VDBFramePresenter.$(O) \
-    $(OUTDIR)VDBMemoryApplication.$(O) \
-    $(OUTDIR)VDBSourceApplication.$(O) \
-    $(OUTDIR)VDBThreadGroupPresenter.$(O) \
-    $(OUTDIR)VDBThreadPresenter.$(O) \
-    $(OUTDIR)VDBVariableObjectPresenter.$(O) \
-    $(OUTDIR)VDBWindowsDebuggerConsoleApplication.$(O) \
-    $(OUTDIR)VDBAbstractTreeApplication.$(O) \
-    $(OUTDIR)VDBBreakpointListApplication.$(O) \
-    $(OUTDIR)VDBTabbingContainer.$(O) \
-    $(OUTDIR)VDBUnixDebuggerConsoleApplication.$(O) \
-    $(OUTDIR)VDBUnixInferiorConsoleApplication.$(O) \
-    $(OUTDIR)VDBStackApplication.$(O) \
-    $(OUTDIR)VDBVariableObjectListApplication.$(O) \
-    $(OUTDIR)extensions.$(O) \
-
-
-
+# $Header$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: jv_vdb.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# This file contains specifications which are common to all platforms.
+#
+
+# Do NOT CHANGE THESE DEFINITIONS
+# (otherwise, ST/X will have a hard time to find out the packages location from its packageID,
+#  to find the source code of a class and to find the library for a package)
+MODULE=jv
+MODULE_DIR=vdb
+PACKAGE=$(MODULE):$(MODULE_DIR)
+
+
+# Argument(s) to the stc compiler (stc --usage).
+#  -headerDir=. : create header files locally
+#                (if removed, they will be created as common
+#  -Pxxx       : defines the package
+#  -Zxxx       : a prefix for variables within the classLib
+#  -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
+#  +optspace3  : optimized even more for space
+#  +optinline  : generate inline code for some ST constructs
+#  +inlineNew  : additionally inline new
+#  +inlineMath : additionally inline some floatPnt math stuff
+#
+# ********** OPTIONAL: MODIFY the next line(s) ***
+# STCLOCALOPTIMIZATIONS=+optinline +inlineNew
+# STCLOCALOPTIMIZATIONS=+optspace3
+STCLOCALOPTIMIZATIONS=+optspace3
+
+
+# Argument(s) to the stc compiler (stc --usage).
+#  -warn            : no warnings
+#  -warnNonStandard : no warnings about ST/X extensions
+#  -warnEOLComments : no warnings about EOL comment extension
+#  -warnPrivacy     : no warnings about privateClass extension
+#  -warnUnused      : no warnings about unused variables
+#
+# ********** OPTIONAL: MODIFY the next line(s) ***
+# STCWARNINGS=-warn
+# STCWARNINGS=-warnNonStandard
+# STCWARNINGS=-warnEOLComments
+STCWARNINGS=-warnNonStandard
+
+COMMON_CLASSES= \
+	VDBAbstractApplication \
+	VDBAbstractPresenter \
+	VDBEvaluator \
+	VDBIconLibrary \
+	VDBVirtualMemoryMap \
+	VDBVirtualMemoryRegion \
+	VDBWindowsDebuggerConsoleView \
+	jv_vdb \
+	VDBAbstractContainer \
+	VDBAbstractListApplication \
+	VDBAbstractUnixConsoleApplication \
+	VDBBreakpointApplication \
+	VDBBreakpointPresenter \
+	VDBDebuggerApplication \
+	VDBEventLogApplication \
+	VDBFrameApplication \
+	VDBFramePresenter \
+	VDBMemoryApplication \
+	VDBSourceApplication \
+	VDBThreadGroupPresenter \
+	VDBThreadPresenter \
+	VDBVariableObjectPresenter \
+	VDBWindowsDebuggerConsoleApplication \
+	VDBAbstractTreeApplication \
+	VDBBreakpointListApplication \
+	VDBTabbingContainer \
+	VDBUnixDebuggerConsoleApplication \
+	VDBUnixInferiorConsoleApplication \
+	VDBStackApplication \
+	VDBVariableObjectListApplication \
+
+
+
+
+COMMON_OBJS= \
+    $(OUTDIR)VDBAbstractApplication.$(O) \
+    $(OUTDIR)VDBAbstractPresenter.$(O) \
+    $(OUTDIR)VDBEvaluator.$(O) \
+    $(OUTDIR)VDBIconLibrary.$(O) \
+    $(OUTDIR)VDBVirtualMemoryMap.$(O) \
+    $(OUTDIR)VDBVirtualMemoryRegion.$(O) \
+    $(OUTDIR)VDBWindowsDebuggerConsoleView.$(O) \
+    $(OUTDIR)jv_vdb.$(O) \
+    $(OUTDIR)VDBAbstractContainer.$(O) \
+    $(OUTDIR)VDBAbstractListApplication.$(O) \
+    $(OUTDIR)VDBAbstractUnixConsoleApplication.$(O) \
+    $(OUTDIR)VDBBreakpointApplication.$(O) \
+    $(OUTDIR)VDBBreakpointPresenter.$(O) \
+    $(OUTDIR)VDBDebuggerApplication.$(O) \
+    $(OUTDIR)VDBEventLogApplication.$(O) \
+    $(OUTDIR)VDBFrameApplication.$(O) \
+    $(OUTDIR)VDBFramePresenter.$(O) \
+    $(OUTDIR)VDBMemoryApplication.$(O) \
+    $(OUTDIR)VDBSourceApplication.$(O) \
+    $(OUTDIR)VDBThreadGroupPresenter.$(O) \
+    $(OUTDIR)VDBThreadPresenter.$(O) \
+    $(OUTDIR)VDBVariableObjectPresenter.$(O) \
+    $(OUTDIR)VDBWindowsDebuggerConsoleApplication.$(O) \
+    $(OUTDIR)VDBAbstractTreeApplication.$(O) \
+    $(OUTDIR)VDBBreakpointListApplication.$(O) \
+    $(OUTDIR)VDBTabbingContainer.$(O) \
+    $(OUTDIR)VDBUnixDebuggerConsoleApplication.$(O) \
+    $(OUTDIR)VDBUnixInferiorConsoleApplication.$(O) \
+    $(OUTDIR)VDBStackApplication.$(O) \
+    $(OUTDIR)VDBVariableObjectListApplication.$(O) \
+    $(OUTDIR)extensions.$(O) \
+
+
+
--- a/Makefile.init	Wed Apr 04 23:16:30 2018 +0100
+++ b/Makefile.init	Mon Apr 09 21:43:54 2018 +0100
@@ -1,27 +1,27 @@
-#
-# DO NOT EDIT
-#
-# make uses this file (Makefile) only, if there is no
-# file named "makefile" (lower-case m) in the same directory.
-# My only task is to generate the real makefile and call make again.
-# Thereafter, I am no longer used and needed.
-#
-# MACOSX caveat:
-#   as filenames are not case sensitive (in a default setup),
-#   we cannot use the above trick. Therefore, this file is now named
-#   "Makefile.init", and you have to execute "make -f Makefile.init" to
-#   get the initial makefile.  This is now also done by the toplevel CONFIG
-#   script.
-
-.PHONY: run
-
-run: makefile
-	$(MAKE) -f makefile
-
-#only needed for the definition of $(TOP)
-include Make.proto
-
-makefile: mf
-
-mf:
-	$(TOP)/rules/stmkmf
+#
+# DO NOT EDIT
+#
+# make uses this file (Makefile) only, if there is no
+# file named "makefile" (lower-case m) in the same directory.
+# My only task is to generate the real makefile and call make again.
+# Thereafter, I am no longer used and needed.
+#
+# MACOSX caveat:
+#   as filenames are not case sensitive (in a default setup),
+#   we cannot use the above trick. Therefore, this file is now named
+#   "Makefile.init", and you have to execute "make -f Makefile.init" to
+#   get the initial makefile.  This is now also done by the toplevel CONFIG
+#   script.
+
+.PHONY: run
+
+run: makefile
+	$(MAKE) -f makefile
+
+#only needed for the definition of $(TOP)
+include Make.proto
+
+makefile: mf
+
+mf:
+	$(TOP)/rules/stmkmf
--- a/VDBAbstractListApplication.st	Wed Apr 04 23:16:30 2018 +0100
+++ b/VDBAbstractListApplication.st	Mon Apr 09 21:43:54 2018 +0100
@@ -56,10 +56,12 @@
     ^ 
     #(FullSpec
        name: windowSpec
+       uuid: '0f7dc3f0-3c2f-11e8-93ae-0021ccd5e3d3'
        window: 
       (WindowSpec
          label: 'VDBAbstractListApplication'
          name: 'VDBAbstractListApplication'
+         uuid: '0f7dc3f1-3c2f-11e8-93ae-0021ccd5e3d3'
          min: (Point 10 10)
          bounds: (Rectangle 0 0 300 300)
        )
@@ -69,6 +71,7 @@
           (SelectionInListModelViewSpec
              name: 'SelectionInListModelView1'
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+             uuid: '0f7dc3f2-3c2f-11e8-93ae-0021ccd5e3d3'
              model: internalSelectionHolder
              menu: contextMenu
              hasHorizontalScrollBar: true
@@ -77,6 +80,7 @@
              useIndex: false
              highlightMode: line
              doubleClickSelector: doDoubleClick
+             selectConditionSelector: internalCanSelect:
              postBuildCallback: postBuildInternalListView:
            )
           )
@@ -84,7 +88,7 @@
        )
      )
 
-    "Modified: / 11-07-2017 / 15:19:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 09-04-2018 / 20:52:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !VDBAbstractListApplication class methodsFor:'menu specs'!
@@ -201,27 +205,6 @@
     ^ self == VDBAbstractListApplication.
 ! !
 
-!VDBAbstractListApplication methodsFor:'actions'!
-
-postBuildInternalListView: aView
-    <resource: #uiCallback>
-
-    | columns |
-
-    internalListView := aView.
-    internalListView font: CodeView defaultFont.
-
-    columns := self class columnsSpec.
-    columns notEmptyOrNil ifTrue:[
-        | renderer |
-
-        renderer := aView setupTableRenderer.
-        renderer columnDescriptors: columns
-    ].
-
-    "Modified: / 11-06-2017 / 22:16:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
 !VDBAbstractListApplication methodsFor:'aspects'!
 
 backgroundColorFor: aVDBPresenter
@@ -323,6 +306,25 @@
 
     "Created: / 18-09-2014 / 00:29:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 20-09-2014 / 23:50:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+postBuildInternalListView: aView
+    <resource: #uiCallback>
+
+    | columns |
+
+    internalListView := aView.
+    internalListView font: CodeView defaultFont.
+
+    columns := self class columnsSpec.
+    columns notEmptyOrNil ifTrue:[
+        | renderer |
+
+        renderer := aView setupTableRenderer.
+        renderer columnDescriptors: columns
+    ].
+
+    "Modified: / 11-06-2017 / 22:16:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !VDBAbstractListApplication methodsFor:'menu'!
@@ -397,8 +399,25 @@
     "Modified: / 12-06-2017 / 12:00:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!VDBAbstractListApplication methodsFor:'private'!
+
+internalCanSelect: index
+    | item |
+
+    item := internalListHolder value at: index.
+    ^self canSelect: item
+
+    "Created: / 09-04-2018 / 20:52:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !VDBAbstractListApplication methodsFor:'queries'!
 
+canSelect: anItem
+    ^ true
+
+    "Modified: / 09-04-2018 / 20:50:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 hasSelection
     ^ self internalSelectionHolder value notEmptyOrNil
 
--- a/VDBAbstractTreeApplication.st	Wed Apr 04 23:16:30 2018 +0100
+++ b/VDBAbstractTreeApplication.st	Mon Apr 09 21:43:54 2018 +0100
@@ -50,10 +50,12 @@
     ^ 
     #(FullSpec
        name: windowSpec
+       uuid: '07a39290-3c2f-11e8-93ae-0021ccd5e3d3'
        window: 
       (WindowSpec
          label: 'Execution Stack'
          name: 'Execution Stack'
+         uuid: '07a39291-3c2f-11e8-93ae-0021ccd5e3d3'
          min: (Point 10 10)
          bounds: (Rectangle 0 0 300 300)
        )
@@ -63,6 +65,7 @@
           (HierarchicalListViewSpec
              name: 'Stack'
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+             uuid: '07a39292-3c2f-11e8-93ae-0021ccd5e3d3'
              model: internalSelectionHolder
              menu: contextMenu
              hasHorizontalScrollBar: true
@@ -71,6 +74,7 @@
              useIndex: false
              highlightMode: line
              doubleClickSelector: doDoubleClick
+             selectConditionSelector: internalCanSelect:
              showLines: false
              useDefaultIcons: false
              showRoot: false
@@ -80,6 +84,8 @@
         
        )
      )
+
+    "Modified: / 09-04-2018 / 20:52:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !VDBAbstractTreeApplication class methodsFor:'plugIn spec'!
--- a/VDBFrameApplication.st	Wed Apr 04 23:16:30 2018 +0100
+++ b/VDBFrameApplication.st	Mon Apr 09 21:43:54 2018 +0100
@@ -207,9 +207,16 @@
         self variableObjectListHolder value:#().
         ^ self.
     ].
-    list := frame variables collect:[:v | v varobj ].
+    "/ It may happen that the variable is out of scope. In that case, we get an error
+    "/ '-var-create: unable to create variable object'. So, ignore all such variables.
+    "/ See GDB source code:
+    "/ 
+    "/    gdb/mi/mi-cmd-var.c
+    "/    gdb/testsuite/gdb.mi/mi-var-cmd.exp
+    list := frame variables collect:[:v | [ v varobj ] on: GDBCommandFailedError do:[ nil ]] thenSelect:[ :v | v notNil ].
     self variableObjectListHolder value:list.
 
     "Created: / 03-02-2018 / 07:30:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (comment): / 09-04-2018 / 18:47:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
--- a/VDBFramePresenter.st	Wed Apr 04 23:16:30 2018 +0100
+++ b/VDBFramePresenter.st	Mon Apr 09 21:43:54 2018 +0100
@@ -116,6 +116,25 @@
     "Modified: / 05-02-2018 / 12:13:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!VDBFramePresenter methodsFor:'private-displaying'!
+
+displayLabel:aLabel h:lH on:aGC x:x y:y h:h isHighlightedAsSelected:isHighlightedAsSelected
+    | color |
+    frame thread isStopped ifFalse:[ 
+        color := aGC paint.
+        aGC paint: Color gray.
+        [
+           super displayLabel:aLabel h:lH on:aGC x:x y:y h:h isHighlightedAsSelected:isHighlightedAsSelected
+        ] ensure:[ 
+            aGC paint: color.
+        ].
+    ] ifTrue:[ 
+        super displayLabel:aLabel h:lH on:aGC x:x y:y h:h isHighlightedAsSelected:isHighlightedAsSelected
+    ].
+
+    "Created: / 09-04-2018 / 16:50:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !VDBFramePresenter methodsFor:'protocol-accessing'!
 
 fetchChildren
--- a/VDBStackApplication.st	Wed Apr 04 23:16:30 2018 +0100
+++ b/VDBStackApplication.st	Mon Apr 09 21:43:54 2018 +0100
@@ -266,12 +266,10 @@
             root children anElement children anElement expand.
         ]
     ].
-    internalListView notNil ifTrue:[
-        internalListView invalidate.
-    ]
+    self delayedInvalidateInternalList
 
     "Created: / 20-09-2014 / 23:05:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 02-03-2015 / 06:43:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 09-04-2018 / 19:52:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 delayedUpdateSelection
@@ -303,10 +301,14 @@
 !VDBStackApplication methodsFor:'event handling'!
 
 onRunningEvent: event
-    internalListView invalidate
+    self selectedFrameHolder value notNil ifTrue:[ 
+        self internalSelectionHolder value: nil.
+    ].
+    self delayedInvalidateInternalList
 
     "Created: / 30-09-2014 / 00:02:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 17-01-2018 / 06:59:11 / jv"
+    "Modified: / 09-04-2018 / 20:43:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 onStoppedEvent: event
@@ -352,6 +354,14 @@
     "Modified: / 17-01-2018 / 06:56:46 / jv"
 ! !
 
+!VDBStackApplication methodsFor:'queries'!
+
+canSelect: anItem
+    ^ anItem isFramePresenter not or:[ anItem frame thread isStopped ]
+
+    "Created: / 09-04-2018 / 20:52:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !VDBStackApplication class methodsFor:'documentation'!
 
 version_HG
--- a/abbrev.stc	Wed Apr 04 23:16:30 2018 +0100
+++ b/abbrev.stc	Mon Apr 09 21:43:54 2018 +0100
@@ -1,33 +1,33 @@
-# 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' 2
-VDBAbstractPresenter VDBAbstractPresenter jv:vdb 'VDB-Presentation' 0
-VDBEvaluator VDBEvaluator jv:vdb 'VDB-Tools' 0
-VDBIconLibrary VDBIconLibrary jv:vdb 'VDB-UI-Support' 0
-VDBVirtualMemoryMap VDBVirtualMemoryMap jv:vdb 'VDB-Tools' 0
-VDBVirtualMemoryRegion VDBVirtualMemoryRegion jv:vdb 'VDB-Tools' 0
-VDBWindowsDebuggerConsoleView VDBWindowsDebuggerConsoleView jv:vdb 'VDB-UI-Console-Windows' 2
-jv_vdb jv_vdb jv:vdb '* Projects & Packages *' 3
-VDBAbstractContainer VDBAbstractContainer jv:vdb 'VDB-UI-Abstract' 2
-VDBAbstractListApplication VDBAbstractListApplication jv:vdb 'VDB-UI-Abstract' 2
-VDBAbstractUnixConsoleApplication VDBAbstractUnixConsoleApplication jv:vdb 'VDB-UI-Console-Unix' 2
-VDBBreakpointApplication VDBBreakpointApplication jv:vdb 'VDB-UI-Others' 2
-VDBBreakpointPresenter VDBBreakpointPresenter jv:vdb 'VDB-Presentation' 0
-VDBDebuggerApplication VDBDebuggerApplication jv:vdb 'VDB-UI' 2
-VDBEventLogApplication VDBEventLogApplication jv:vdb 'VDB-UI-Events' 2
-VDBFrameApplication VDBFrameApplication jv:vdb 'VDB-UI-Others' 2
-VDBFramePresenter VDBFramePresenter jv:vdb 'VDB-Presentation' 0
-VDBMemoryApplication VDBMemoryApplication jv:vdb 'VDB-UI-Others' 2
-VDBSourceApplication VDBSourceApplication jv:vdb 'VDB-UI-Source' 2
-VDBThreadGroupPresenter VDBThreadGroupPresenter jv:vdb 'VDB-Presentation' 0
-VDBThreadPresenter VDBThreadPresenter jv:vdb 'VDB-Presentation' 0
-VDBVariableObjectPresenter VDBVariableObjectPresenter jv:vdb 'VDB-Presentation' 0
-VDBWindowsDebuggerConsoleApplication VDBWindowsDebuggerConsoleApplication jv:vdb 'VDB-UI-Console-Windows' 2
-VDBAbstractTreeApplication VDBAbstractTreeApplication jv:vdb 'VDB-UI-Abstract' 2
-VDBBreakpointListApplication VDBBreakpointListApplication jv:vdb 'VDB-UI-Others' 2
-VDBTabbingContainer VDBTabbingContainer jv:vdb 'VDB-UI-Containers' 2
-VDBUnixDebuggerConsoleApplication VDBUnixDebuggerConsoleApplication jv:vdb 'VDB-UI-Console-Unix' 2
-VDBUnixInferiorConsoleApplication VDBUnixInferiorConsoleApplication jv:vdb 'VDB-UI-Console-Unix' 2
-VDBStackApplication VDBStackApplication jv:vdb 'VDB-UI-Others' 2
-VDBVariableObjectListApplication VDBVariableObjectListApplication jv:vdb 'VDB-UI-Others' 2
+# 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' 2
+VDBAbstractPresenter VDBAbstractPresenter jv:vdb 'VDB-Presentation' 0
+VDBEvaluator VDBEvaluator jv:vdb 'VDB-Tools' 0
+VDBIconLibrary VDBIconLibrary jv:vdb 'VDB-UI-Support' 0
+VDBVirtualMemoryMap VDBVirtualMemoryMap jv:vdb 'VDB-Tools' 0
+VDBVirtualMemoryRegion VDBVirtualMemoryRegion jv:vdb 'VDB-Tools' 0
+VDBWindowsDebuggerConsoleView VDBWindowsDebuggerConsoleView jv:vdb 'VDB-UI-Console-Windows' 2
+jv_vdb jv_vdb jv:vdb '* Projects & Packages *' 3
+VDBAbstractContainer VDBAbstractContainer jv:vdb 'VDB-UI-Abstract' 2
+VDBAbstractListApplication VDBAbstractListApplication jv:vdb 'VDB-UI-Abstract' 2
+VDBAbstractUnixConsoleApplication VDBAbstractUnixConsoleApplication jv:vdb 'VDB-UI-Console-Unix' 2
+VDBBreakpointApplication VDBBreakpointApplication jv:vdb 'VDB-UI-Others' 2
+VDBBreakpointPresenter VDBBreakpointPresenter jv:vdb 'VDB-Presentation' 0
+VDBDebuggerApplication VDBDebuggerApplication jv:vdb 'VDB-UI' 2
+VDBEventLogApplication VDBEventLogApplication jv:vdb 'VDB-UI-Events' 2
+VDBFrameApplication VDBFrameApplication jv:vdb 'VDB-UI-Others' 2
+VDBFramePresenter VDBFramePresenter jv:vdb 'VDB-Presentation' 0
+VDBMemoryApplication VDBMemoryApplication jv:vdb 'VDB-UI-Others' 2
+VDBSourceApplication VDBSourceApplication jv:vdb 'VDB-UI-Source' 2
+VDBThreadGroupPresenter VDBThreadGroupPresenter jv:vdb 'VDB-Presentation' 0
+VDBThreadPresenter VDBThreadPresenter jv:vdb 'VDB-Presentation' 0
+VDBVariableObjectPresenter VDBVariableObjectPresenter jv:vdb 'VDB-Presentation' 0
+VDBWindowsDebuggerConsoleApplication VDBWindowsDebuggerConsoleApplication jv:vdb 'VDB-UI-Console-Windows' 2
+VDBAbstractTreeApplication VDBAbstractTreeApplication jv:vdb 'VDB-UI-Abstract' 2
+VDBBreakpointListApplication VDBBreakpointListApplication jv:vdb 'VDB-UI-Others' 2
+VDBTabbingContainer VDBTabbingContainer jv:vdb 'VDB-UI-Containers' 2
+VDBUnixDebuggerConsoleApplication VDBUnixDebuggerConsoleApplication jv:vdb 'VDB-UI-Console-Unix' 2
+VDBUnixInferiorConsoleApplication VDBUnixInferiorConsoleApplication jv:vdb 'VDB-UI-Console-Unix' 2
+VDBStackApplication VDBStackApplication jv:vdb 'VDB-UI-Others' 2
+VDBVariableObjectListApplication VDBVariableObjectListApplication jv:vdb 'VDB-UI-Others' 2
--- a/application/Make.proto	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/Make.proto	Mon Apr 09 21:43:54 2018 +0100
@@ -1,583 +1,583 @@
-# $Header$
-#
-# automagically generated from the projectDefinition: jv_vdb_application.
-#
-# -------------- no need to change anything below ----------
-#
-# This makefile generates some standalone demo applications
-#
-#    make
-#       generates vdb.do
-#
-
-TOP=../../../stx
-INCLUDE_TOP=$(TOP)/..
-
-# set to a dummy file name (like FORCE=@@@FORCE-BUILD@@@) to force the build of prereq packages
-FORCE=
-.PHONY: $(FORCE)
-
-PACKAGE=jv:vdb/application
-SUBDIRS=
-SUPPRESS_LOCAL_ABBREVS="yes"
-NOAUTOLOAD=1
-NOSUBAUTOLOAD=1
-
-LOCALINCLUDES= -I$(INCLUDE_TOP)/jv/libgdbs -I$(INCLUDE_TOP)/jv/vdb -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libtool
-LOCALDEFINES=
-GLOBALDEFINES=
-MAIN_DEFINES=-DIGNORE_IMAGE -DNO_DISPLAY
-
-RCSSOURCES=Make.proto *.st
-LINKSOURCES=Make.proto *.st
-
-DELIVERBINARIES=
-
-APPNAME=libjv_vdb_application
-LIBNAME=libjv_vdb_application
-STCLOCALOPT='-package=$(PACKAGE)' -I. -headerDir=. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=.  -varPrefix=$(LIBNAME)
-
-
-# ********** OPTIONAL: MODIFY the next line ***
-# additional C-libraries that should be pre-linked with the class-objects
-LD_OBJ_LIBS=
-LOCAL_SHARED_LIBS=
-
-
-# ********** OPTIONAL: MODIFY the next line ***
-# additional C targets or libraries should be added below
-LOCAL_EXTRA_TARGETS=
-
-OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
-
-
-
-
-
-LIBLIST = $(REQUIRED_LIBS)
-
-# required libs:
-#
-
-REQUIRED_LIBS= libstx_libbasic \
- libstx_goodies_announcements \
- libstx_libbasic2 \
- libstx_libcomp \
- libstx_goodies_refactoryBrowser_parser \
- libstx_libbasic3 \
- libstx_libview \
- libstx_libui \
- libstx_libview2 \
- libstx_libwidg \
- libstx_goodies_magritte \
- libstx_libhtml \
- libstx_libwidg2 \
- libstx_libcompat \
- libstx_libtool \
- libstx_goodies_xml_vw \
- libjv_libgdbs \
- libstx_libtool2 \
- libjv_vdb \
-
-
-REQUIRED_LIBOBJS= $(TOP)/libbasic/libstx_libbasic$(O_EXT) \
- $(TOP)/goodies/announcements/libstx_goodies_announcements$(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)/libui/libstx_libui$(O_EXT) \
- $(TOP)/libview2/libstx_libview2$(O_EXT) \
- $(TOP)/libwidg/libstx_libwidg$(O_EXT) \
- $(TOP)/goodies/magritte/libstx_goodies_magritte$(O_EXT) \
- $(TOP)/libhtml/libstx_libhtml$(O_EXT) \
- $(TOP)/libwidg2/libstx_libwidg2$(O_EXT) \
- $(TOP)/libcompat/libstx_libcompat$(O_EXT) \
- $(TOP)/libtool/libstx_libtool$(O_EXT) \
- $(TOP)/goodies/xml/vw/libstx_goodies_xml_vw$(O_EXT) \
- ../../libgdbs/libjv_libgdbs$(O_EXT) \
- $(TOP)/libtool2/libstx_libtool2$(O_EXT) \
- ..//libjv_vdb$(O_EXT) \
-
-
-REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \
- libstx_goodies_announcements$(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_libui$(O_EXT) \
- libstx_libview2$(O_EXT) \
- libstx_libwidg$(O_EXT) \
- libstx_goodies_magritte$(O_EXT) \
- libstx_libhtml$(O_EXT) \
- libstx_libwidg2$(O_EXT) \
- libstx_libcompat$(O_EXT) \
- libstx_libtool$(O_EXT) \
- libstx_goodies_xml_vw$(O_EXT) \
- libjv_libgdbs$(O_EXT) \
- libstx_libtool2$(O_EXT) \
- libjv_vdb$(O_EXT) \
-
-
-REQUIRED_SUPPORT_DIRS=RESOURCEFILES
-
-SUBPROJECT_LIBS=
-
-
-target: ALL
-
-all::   prereq ALL_NP
-
-# like ALL, but not prereqs
-ALL_NP:: exe subProjects $(REQUIRED_SUPPORT_DIRS) $(SETUP_RULE)
-
-exe:    vdb.do registerApplication
-
-vdb.do: $(APP_DIRS_TO_MAKE) $(APP_LIBOBJS) $(REQUIRED_LIBOBJS) $(OBJS)
-	$(MAKE) link_vdb.do
-
-
-link_vdb.do:
-	$(MAKE) GUI_APPLICATION \
-		    TARGET=vdb.do \
-		    APPLICATION_CLASSES="$(COMMON_CLASSES) $(UNIX_CLASSES)" \
-		    APPLICATION_OBJS="$(OBJS)" \
-		    APPLICATION_LIBLIST="$(REQUIRED_LIBS)" \
-		    APPLICATION_LIBOBJS="$(REQUIRED_LIBOBJS)" \
-		    APPLICATION_LINK_LIBOBJS="$(REQUIRED_LINK_LIBOBJS)" \
-		    STARTUP_CLASS="VDBStartup" \
-		    STARTUP_SELECTOR="start" \
-		    MAIN_DEFINES="-DIGNORE_IMAGE -DNO_DISPLAY"
-
-# build all mandatory prerequisite packages (containing superclasses) for this package
-prereq:
-	$(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 \
-	    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 mac, a dmg is generated
-# (SETUP_RULE is set to setup_macosx)
-#
-setup_macosx:   "Visual___VM_Debugger_dmg"
-	-rm "Visual___VM_Debugger.dmg"
-	hdiutil create -fs HFSX -layout SPUD "Visual___VM_Debugger.dmg" -srcfolder "Visual___VM_Debugger_dmg" -format UDZO -volname "Visual / VM Debugger" -quiet
-
-app: "Visual___VM_Debugger_dmg"
-
-"Visual___VM_Debugger_dmg": $(SUBPROJECT_LIBS) $(REQUIRED_SUPPORT_DIRS) 
-	@-rm -rf "Visual___VM_Debugger_dmg"
-	@-mkdir "Visual___VM_Debugger_dmg"
-	@-mkdir "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app"
-	@-mkdir "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents"
-	@-mkdir "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS"
-	cp "vdb.do" "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/"
-	@-cp osx/Info.plist "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/"
-	@-mkdir "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/."
-	-cp -r *.so "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/."
-	-cp -r symbols.stc "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/."
-	-cp -r *.stx "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/."
-	-cp -r *.rc "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/."
-	-cp -r resources "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/."
-	@-rm "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/"*WINrc.rc
-
-
-
-SOURCEFILES: vdb.do_SOURCES \
-	stx_SOURCES
-
-
-
-
-RESOURCEFILES: vdb.do_RESOURCES vdb.do_BITMAPS  \
-	stx_RESOURCES stx_STYLES stx_BITMAPS
-
-
-vdb.do_RESOURCES: 
-	mkdir -p resources/jv/vdb/application
-	-cp ../resources/*.rs ../resources/*.style resources/jv/vdb/application/..
-
-vdb.do_BITMAPS: 
-	mkdir -p resources/jv/vdb/application/bitmaps
-	-cp *.ico *.gif *.png resources/jv/vdb/application/bitmaps
-
-
-
-stx_RESOURCES: \
-	keyboard.rc \
-	keyboardMacros.rc \
-	display.rc \
-	libbasic_RESOURCES \
-	libview_RESOURCES \
-	libtool_RESOURCES  \
-	libtool2_RESOURCES
-
-keyboard.rc: $(TOP)/projects/smalltalk/keyboard.rc
-	cp $(TOP)/projects/smalltalk/keyboard.rc .
-
-keyboardMacros.rc: $(TOP)/projects/smalltalk/keyboardMacros.rc
-	cp $(TOP)/projects/smalltalk/keyboardMacros.rc .
-
-display.rc: $(TOP)/projects/smalltalk/display.rc
-	cp $(TOP)/projects/smalltalk/display.rc .
-
-stx_STYLES: 
-	mkdir -p resources/stx/libview
-	mkdir -p resources/stx/libview/styles
-	cp $(TOP)/libview/styles/*.common resources/stx/libview/styles
-	cp $(TOP)/libview/styles/*.style resources/stx/libview/styles
-
-stx_BITMAPS: \
-	libwidg_BITMAPS
-
-libwidg_BITMAPS: 
-	mkdir -p resources/stx/libwidg/bitmaps
-	-cp $(TOP)/libwidg/bitmaps/*.* resources/stx/libwidg/bitmaps
-
-libbasic_RESOURCES: 
-	mkdir -p resources/stx/libbasic
-	-cp $(TOP)/libbasic/resources/*.* resources/stx/libbasic
-
-libtool_RESOURCES: 
-	mkdir -p resources/stx/libtool
-	-cp $(TOP)/libtool/resources/*.* resources/stx/libtool
-
-libtool2_RESOURCES: 
-	mkdir -p resources/stx/libtool2
-	-cp $(TOP)/libtool2/resources/*.* resources/stx/libtool2
-
-libview_RESOURCES: 
-	mkdir -p resources/stx/libview
-	-cp $(TOP)/libview/resources/*.* resources/stx/libview
-
-libview2_RESOURCES: 
-	mkdir -p resources/stx/libview2
-	-cp $(TOP)/libview2/resources/*.* resources/stx/libview2
-
-bitmaps:
-	mkdir -p bitmaps
-
-doc:
-	mkdir -p doc
-
-
-
-libstx_libbasic.so: $(TOP)/libbasic/libstx_libbasic.so
-	ln -sf $(TOP)/libbasic/libstx_libbasic.so .
-
-$(TOP)/libbasic/libstx_libbasic.so: $(TOP)/libbasic/makefile $(FORCE)
-	@if [ -f "$(TOP)/libbasic/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/libbasic (no source)"; \
-	else \
-	    cd $(TOP)/libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/libbasic/makefile: $(TOP)/libbasic/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/libbasic
-
-libstx_goodies_announcements.so: $(TOP)/goodies/announcements/libstx_goodies_announcements.so
-	ln -sf $(TOP)/goodies/announcements/libstx_goodies_announcements.so .
-
-$(TOP)/goodies/announcements/libstx_goodies_announcements.so: $(TOP)/goodies/announcements/makefile $(FORCE)
-	@if [ -f "$(TOP)/goodies/announcements/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/goodies/announcements (no source)"; \
-	else \
-	    cd $(TOP)/goodies/announcements && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/goodies/announcements/makefile: $(TOP)/goodies/announcements/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/goodies/announcements
-
-libstx_libbasic2.so: $(TOP)/libbasic2/libstx_libbasic2.so
-	ln -sf $(TOP)/libbasic2/libstx_libbasic2.so .
-
-$(TOP)/libbasic2/libstx_libbasic2.so: $(TOP)/libbasic2/makefile $(FORCE)
-	@if [ -f "$(TOP)/libbasic2/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/libbasic2 (no source)"; \
-	else \
-	    cd $(TOP)/libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/libbasic2/makefile: $(TOP)/libbasic2/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/libbasic2
-
-libstx_libcomp.so: $(TOP)/libcomp/libstx_libcomp.so
-	ln -sf $(TOP)/libcomp/libstx_libcomp.so .
-
-$(TOP)/libcomp/libstx_libcomp.so: $(TOP)/libcomp/makefile $(FORCE)
-	@if [ -f "$(TOP)/libcomp/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/libcomp (no source)"; \
-	else \
-	    cd $(TOP)/libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/libcomp/makefile: $(TOP)/libcomp/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/libcomp
-
-libstx_goodies_refactoryBrowser_parser.so: $(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so
-	ln -sf $(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so .
-
-$(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so: $(TOP)/goodies/refactoryBrowser/parser/makefile $(FORCE)
-	@if [ -f "$(TOP)/goodies/refactoryBrowser/parser/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/goodies/refactoryBrowser/parser (no source)"; \
-	else \
-	    cd $(TOP)/goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/goodies/refactoryBrowser/parser/makefile: $(TOP)/goodies/refactoryBrowser/parser/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/goodies/refactoryBrowser/parser
-
-libstx_libbasic3.so: $(TOP)/libbasic3/libstx_libbasic3.so
-	ln -sf $(TOP)/libbasic3/libstx_libbasic3.so .
-
-$(TOP)/libbasic3/libstx_libbasic3.so: $(TOP)/libbasic3/makefile $(FORCE)
-	@if [ -f "$(TOP)/libbasic3/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/libbasic3 (no source)"; \
-	else \
-	    cd $(TOP)/libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/libbasic3/makefile: $(TOP)/libbasic3/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/libbasic3
-
-libstx_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 .
-
-$(TOP)/libui/libstx_libui.so: $(TOP)/libui/makefile $(FORCE)
-	@if [ -f "$(TOP)/libui/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/libui (no source)"; \
-	else \
-	    cd $(TOP)/libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/libui/makefile: $(TOP)/libui/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/libui
-
-libstx_libview2.so: $(TOP)/libview2/libstx_libview2.so
-	ln -sf $(TOP)/libview2/libstx_libview2.so .
-
-$(TOP)/libview2/libstx_libview2.so: $(TOP)/libview2/makefile $(FORCE)
-	@if [ -f "$(TOP)/libview2/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/libview2 (no source)"; \
-	else \
-	    cd $(TOP)/libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/libview2/makefile: $(TOP)/libview2/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/libview2
-
-libstx_libwidg.so: $(TOP)/libwidg/libstx_libwidg.so
-	ln -sf $(TOP)/libwidg/libstx_libwidg.so .
-
-$(TOP)/libwidg/libstx_libwidg.so: $(TOP)/libwidg/makefile $(FORCE)
-	@if [ -f "$(TOP)/libwidg/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/libwidg (no source)"; \
-	else \
-	    cd $(TOP)/libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/libwidg/makefile: $(TOP)/libwidg/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/libwidg
-
-libstx_goodies_magritte.so: $(TOP)/goodies/magritte/libstx_goodies_magritte.so
-	ln -sf $(TOP)/goodies/magritte/libstx_goodies_magritte.so .
-
-$(TOP)/goodies/magritte/libstx_goodies_magritte.so: $(TOP)/goodies/magritte/makefile $(FORCE)
-	@if [ -f "$(TOP)/goodies/magritte/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/goodies/magritte (no source)"; \
-	else \
-	    cd $(TOP)/goodies/magritte && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/goodies/magritte/makefile: $(TOP)/goodies/magritte/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/goodies/magritte
-
-libstx_libhtml.so: $(TOP)/libhtml/libstx_libhtml.so
-	ln -sf $(TOP)/libhtml/libstx_libhtml.so .
-
-$(TOP)/libhtml/libstx_libhtml.so: $(TOP)/libhtml/makefile $(FORCE)
-	@if [ -f "$(TOP)/libhtml/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/libhtml (no source)"; \
-	else \
-	    cd $(TOP)/libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/libhtml/makefile: $(TOP)/libhtml/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/libhtml
-
-libstx_libwidg2.so: $(TOP)/libwidg2/libstx_libwidg2.so
-	ln -sf $(TOP)/libwidg2/libstx_libwidg2.so .
-
-$(TOP)/libwidg2/libstx_libwidg2.so: $(TOP)/libwidg2/makefile $(FORCE)
-	@if [ -f "$(TOP)/libwidg2/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/libwidg2 (no source)"; \
-	else \
-	    cd $(TOP)/libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/libwidg2/makefile: $(TOP)/libwidg2/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/libwidg2
-
-libstx_libcompat.so: $(TOP)/libcompat/libstx_libcompat.so
-	ln -sf $(TOP)/libcompat/libstx_libcompat.so .
-
-$(TOP)/libcompat/libstx_libcompat.so: $(TOP)/libcompat/makefile $(FORCE)
-	@if [ -f "$(TOP)/libcompat/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/libcompat (no source)"; \
-	else \
-	    cd $(TOP)/libcompat && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/libcompat/makefile: $(TOP)/libcompat/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/libcompat
-
-libstx_libtool.so: $(TOP)/libtool/libstx_libtool.so
-	ln -sf $(TOP)/libtool/libstx_libtool.so .
-
-$(TOP)/libtool/libstx_libtool.so: $(TOP)/libtool/makefile $(FORCE)
-	@if [ -f "$(TOP)/libtool/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/libtool (no source)"; \
-	else \
-	    cd $(TOP)/libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/libtool/makefile: $(TOP)/libtool/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/libtool
-
-libstx_goodies_xml_vw.so: $(TOP)/goodies/xml/vw/libstx_goodies_xml_vw.so
-	ln -sf $(TOP)/goodies/xml/vw/libstx_goodies_xml_vw.so .
-
-$(TOP)/goodies/xml/vw/libstx_goodies_xml_vw.so: $(TOP)/goodies/xml/vw/makefile $(FORCE)
-	@if [ -f "$(TOP)/goodies/xml/vw/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/goodies/xml/vw (no source)"; \
-	else \
-	    cd $(TOP)/goodies/xml/vw && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/goodies/xml/vw/makefile: $(TOP)/goodies/xml/vw/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/goodies/xml/vw
-
-libjv_libgdbs.so: ../../libgdbs/libjv_libgdbs.so
-	ln -sf ../../libgdbs/libjv_libgdbs.so .
-
-../../libgdbs/libjv_libgdbs.so: ../../libgdbs/makefile $(FORCE)
-	@if [ -f "../../libgdbs/.NOSOURCE" ]; then \
-	    echo "skip make in ../../libgdbs (no source)"; \
-	else \
-	    cd ../../libgdbs && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-../../libgdbs/makefile: ../../libgdbs/Make.proto
-	$(TOP)/rules/stmkmf --cd ../../libgdbs
-
-libstx_libtool2.so: $(TOP)/libtool2/libstx_libtool2.so
-	ln -sf $(TOP)/libtool2/libstx_libtool2.so .
-
-$(TOP)/libtool2/libstx_libtool2.so: $(TOP)/libtool2/makefile $(FORCE)
-	@if [ -f "$(TOP)/libtool2/.NOSOURCE" ]; then \
-	    echo "skip make in $(TOP)/libtool2 (no source)"; \
-	else \
-	    cd $(TOP)/libtool2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-$(TOP)/libtool2/makefile: $(TOP)/libtool2/Make.proto
-	$(TOP)/rules/stmkmf --cd $(TOP)/libtool2
-
-libjv_vdb.so: ..//libjv_vdb.so
-	ln -sf ..//libjv_vdb.so .
-
-..//libjv_vdb.so: ..//makefile $(FORCE)
-	@if [ -f "..//.NOSOURCE" ]; then \
-	    echo "skip make in ../ (no source)"; \
-	else \
-	    cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
-	fi
-
-..//makefile: ..//Make.proto
-	$(TOP)/rules/stmkmf --cd ../
-
-
-
-
-
-
-
-
-
-
-# Enforce recompilation of package definition class if Mercurial working
-# copy state changes. Together with --guessVersion it ensures that package
-# definition class always contains correct binary revision string.
-ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
-jv_vdb_application.$(O): $(shell hg root)/.hg/dirstate
-endif
-
-
-
-
-clean::
-	-rm -f *.so vdb.do.$(O)
-
-clobber:: clean
-	-rm -f vdb.do *.img *.sav
-
-# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(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
+# $Header$
+#
+# automagically generated from the projectDefinition: jv_vdb_application.
+#
+# -------------- no need to change anything below ----------
+#
+# This makefile generates some standalone demo applications
+#
+#    make
+#       generates vdb.do
+#
+
+TOP=../../../stx
+INCLUDE_TOP=$(TOP)/..
+
+# set to a dummy file name (like FORCE=@@@FORCE-BUILD@@@) to force the build of prereq packages
+FORCE=
+.PHONY: $(FORCE)
+
+PACKAGE=jv:vdb/application
+SUBDIRS=
+SUPPRESS_LOCAL_ABBREVS="yes"
+NOAUTOLOAD=1
+NOSUBAUTOLOAD=1
+
+LOCALINCLUDES= -I$(INCLUDE_TOP)/jv/libgdbs -I$(INCLUDE_TOP)/jv/vdb -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libtool
+LOCALDEFINES=
+GLOBALDEFINES=
+MAIN_DEFINES=-DIGNORE_IMAGE -DNO_DISPLAY
+
+RCSSOURCES=Make.proto *.st
+LINKSOURCES=Make.proto *.st
+
+DELIVERBINARIES=
+
+APPNAME=libjv_vdb_application
+LIBNAME=libjv_vdb_application
+STCLOCALOPT='-package=$(PACKAGE)' -I. -headerDir=. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=.  -varPrefix=$(LIBNAME)
+
+
+# ********** OPTIONAL: MODIFY the next line ***
+# additional C-libraries that should be pre-linked with the class-objects
+LD_OBJ_LIBS=
+LOCAL_SHARED_LIBS=
+
+
+# ********** OPTIONAL: MODIFY the next line ***
+# additional C targets or libraries should be added below
+LOCAL_EXTRA_TARGETS=
+
+OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
+
+
+
+
+
+LIBLIST = $(REQUIRED_LIBS)
+
+# required libs:
+#
+
+REQUIRED_LIBS= libstx_libbasic \
+ libstx_goodies_announcements \
+ libstx_libbasic2 \
+ libstx_libcomp \
+ libstx_goodies_refactoryBrowser_parser \
+ libstx_libbasic3 \
+ libstx_libview \
+ libstx_libui \
+ libstx_libview2 \
+ libstx_libwidg \
+ libstx_goodies_magritte \
+ libstx_libhtml \
+ libstx_libwidg2 \
+ libstx_libcompat \
+ libstx_libtool \
+ libstx_goodies_xml_vw \
+ libjv_libgdbs \
+ libstx_libtool2 \
+ libjv_vdb \
+
+
+REQUIRED_LIBOBJS= $(TOP)/libbasic/libstx_libbasic$(O_EXT) \
+ $(TOP)/goodies/announcements/libstx_goodies_announcements$(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)/libui/libstx_libui$(O_EXT) \
+ $(TOP)/libview2/libstx_libview2$(O_EXT) \
+ $(TOP)/libwidg/libstx_libwidg$(O_EXT) \
+ $(TOP)/goodies/magritte/libstx_goodies_magritte$(O_EXT) \
+ $(TOP)/libhtml/libstx_libhtml$(O_EXT) \
+ $(TOP)/libwidg2/libstx_libwidg2$(O_EXT) \
+ $(TOP)/libcompat/libstx_libcompat$(O_EXT) \
+ $(TOP)/libtool/libstx_libtool$(O_EXT) \
+ $(TOP)/goodies/xml/vw/libstx_goodies_xml_vw$(O_EXT) \
+ ../../libgdbs/libjv_libgdbs$(O_EXT) \
+ $(TOP)/libtool2/libstx_libtool2$(O_EXT) \
+ ..//libjv_vdb$(O_EXT) \
+
+
+REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \
+ libstx_goodies_announcements$(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_libui$(O_EXT) \
+ libstx_libview2$(O_EXT) \
+ libstx_libwidg$(O_EXT) \
+ libstx_goodies_magritte$(O_EXT) \
+ libstx_libhtml$(O_EXT) \
+ libstx_libwidg2$(O_EXT) \
+ libstx_libcompat$(O_EXT) \
+ libstx_libtool$(O_EXT) \
+ libstx_goodies_xml_vw$(O_EXT) \
+ libjv_libgdbs$(O_EXT) \
+ libstx_libtool2$(O_EXT) \
+ libjv_vdb$(O_EXT) \
+
+
+REQUIRED_SUPPORT_DIRS=RESOURCEFILES
+
+SUBPROJECT_LIBS=
+
+
+target: ALL
+
+all::   prereq ALL_NP
+
+# like ALL, but not prereqs
+ALL_NP:: exe subProjects $(REQUIRED_SUPPORT_DIRS) $(SETUP_RULE)
+
+exe:    vdb.do registerApplication
+
+vdb.do: $(APP_DIRS_TO_MAKE) $(APP_LIBOBJS) $(REQUIRED_LIBOBJS) $(OBJS)
+	$(MAKE) link_vdb.do
+
+
+link_vdb.do:
+	$(MAKE) GUI_APPLICATION \
+		    TARGET=vdb.do \
+		    APPLICATION_CLASSES="$(COMMON_CLASSES) $(UNIX_CLASSES)" \
+		    APPLICATION_OBJS="$(OBJS)" \
+		    APPLICATION_LIBLIST="$(REQUIRED_LIBS)" \
+		    APPLICATION_LIBOBJS="$(REQUIRED_LIBOBJS)" \
+		    APPLICATION_LINK_LIBOBJS="$(REQUIRED_LINK_LIBOBJS)" \
+		    STARTUP_CLASS="VDBStartup" \
+		    STARTUP_SELECTOR="start" \
+		    MAIN_DEFINES="-DIGNORE_IMAGE -DNO_DISPLAY"
+
+# build all mandatory prerequisite packages (containing superclasses) for this package
+prereq:
+	$(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 \
+	    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 mac, a dmg is generated
+# (SETUP_RULE is set to setup_macosx)
+#
+setup_macosx:   "Visual___VM_Debugger_dmg"
+	-rm "Visual___VM_Debugger.dmg"
+	hdiutil create -fs HFSX -layout SPUD "Visual___VM_Debugger.dmg" -srcfolder "Visual___VM_Debugger_dmg" -format UDZO -volname "Visual / VM Debugger" -quiet
+
+app: "Visual___VM_Debugger_dmg"
+
+"Visual___VM_Debugger_dmg": $(SUBPROJECT_LIBS) $(REQUIRED_SUPPORT_DIRS) 
+	@-rm -rf "Visual___VM_Debugger_dmg"
+	@-mkdir "Visual___VM_Debugger_dmg"
+	@-mkdir "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app"
+	@-mkdir "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents"
+	@-mkdir "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS"
+	cp "vdb.do" "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/"
+	@-cp osx/Info.plist "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/"
+	@-mkdir "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/."
+	-cp -r *.so "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/."
+	-cp -r symbols.stc "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/."
+	-cp -r *.stx "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/."
+	-cp -r *.rc "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/."
+	-cp -r resources "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/."
+	@-rm "Visual___VM_Debugger_dmg/Visual___VM_Debugger.app/Contents/MacOS/"*WINrc.rc
+
+
+
+SOURCEFILES: vdb.do_SOURCES \
+	stx_SOURCES
+
+
+
+
+RESOURCEFILES: vdb.do_RESOURCES vdb.do_BITMAPS  \
+	stx_RESOURCES stx_STYLES stx_BITMAPS
+
+
+vdb.do_RESOURCES: 
+	mkdir -p resources/jv/vdb/application
+	-cp ../resources/*.rs ../resources/*.style resources/jv/vdb/application/..
+
+vdb.do_BITMAPS: 
+	mkdir -p resources/jv/vdb/application/bitmaps
+	-cp *.ico *.gif *.png resources/jv/vdb/application/bitmaps
+
+
+
+stx_RESOURCES: \
+	keyboard.rc \
+	keyboardMacros.rc \
+	display.rc \
+	libbasic_RESOURCES \
+	libview_RESOURCES \
+	libtool_RESOURCES  \
+	libtool2_RESOURCES
+
+keyboard.rc: $(TOP)/projects/smalltalk/keyboard.rc
+	cp $(TOP)/projects/smalltalk/keyboard.rc .
+
+keyboardMacros.rc: $(TOP)/projects/smalltalk/keyboardMacros.rc
+	cp $(TOP)/projects/smalltalk/keyboardMacros.rc .
+
+display.rc: $(TOP)/projects/smalltalk/display.rc
+	cp $(TOP)/projects/smalltalk/display.rc .
+
+stx_STYLES: 
+	mkdir -p resources/stx/libview
+	mkdir -p resources/stx/libview/styles
+	cp $(TOP)/libview/styles/*.common resources/stx/libview/styles
+	cp $(TOP)/libview/styles/*.style resources/stx/libview/styles
+
+stx_BITMAPS: \
+	libwidg_BITMAPS
+
+libwidg_BITMAPS: 
+	mkdir -p resources/stx/libwidg/bitmaps
+	-cp $(TOP)/libwidg/bitmaps/*.* resources/stx/libwidg/bitmaps
+
+libbasic_RESOURCES: 
+	mkdir -p resources/stx/libbasic
+	-cp $(TOP)/libbasic/resources/*.* resources/stx/libbasic
+
+libtool_RESOURCES: 
+	mkdir -p resources/stx/libtool
+	-cp $(TOP)/libtool/resources/*.* resources/stx/libtool
+
+libtool2_RESOURCES: 
+	mkdir -p resources/stx/libtool2
+	-cp $(TOP)/libtool2/resources/*.* resources/stx/libtool2
+
+libview_RESOURCES: 
+	mkdir -p resources/stx/libview
+	-cp $(TOP)/libview/resources/*.* resources/stx/libview
+
+libview2_RESOURCES: 
+	mkdir -p resources/stx/libview2
+	-cp $(TOP)/libview2/resources/*.* resources/stx/libview2
+
+bitmaps:
+	mkdir -p bitmaps
+
+doc:
+	mkdir -p doc
+
+
+
+libstx_libbasic.so: $(TOP)/libbasic/libstx_libbasic.so
+	ln -sf $(TOP)/libbasic/libstx_libbasic.so .
+
+$(TOP)/libbasic/libstx_libbasic.so: $(TOP)/libbasic/makefile $(FORCE)
+	@if [ -f "$(TOP)/libbasic/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libbasic (no source)"; \
+	else \
+	    cd $(TOP)/libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libbasic/makefile: $(TOP)/libbasic/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libbasic
+
+libstx_goodies_announcements.so: $(TOP)/goodies/announcements/libstx_goodies_announcements.so
+	ln -sf $(TOP)/goodies/announcements/libstx_goodies_announcements.so .
+
+$(TOP)/goodies/announcements/libstx_goodies_announcements.so: $(TOP)/goodies/announcements/makefile $(FORCE)
+	@if [ -f "$(TOP)/goodies/announcements/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/goodies/announcements (no source)"; \
+	else \
+	    cd $(TOP)/goodies/announcements && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/goodies/announcements/makefile: $(TOP)/goodies/announcements/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/goodies/announcements
+
+libstx_libbasic2.so: $(TOP)/libbasic2/libstx_libbasic2.so
+	ln -sf $(TOP)/libbasic2/libstx_libbasic2.so .
+
+$(TOP)/libbasic2/libstx_libbasic2.so: $(TOP)/libbasic2/makefile $(FORCE)
+	@if [ -f "$(TOP)/libbasic2/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libbasic2 (no source)"; \
+	else \
+	    cd $(TOP)/libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libbasic2/makefile: $(TOP)/libbasic2/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libbasic2
+
+libstx_libcomp.so: $(TOP)/libcomp/libstx_libcomp.so
+	ln -sf $(TOP)/libcomp/libstx_libcomp.so .
+
+$(TOP)/libcomp/libstx_libcomp.so: $(TOP)/libcomp/makefile $(FORCE)
+	@if [ -f "$(TOP)/libcomp/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libcomp (no source)"; \
+	else \
+	    cd $(TOP)/libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libcomp/makefile: $(TOP)/libcomp/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libcomp
+
+libstx_goodies_refactoryBrowser_parser.so: $(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so
+	ln -sf $(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so .
+
+$(TOP)/goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so: $(TOP)/goodies/refactoryBrowser/parser/makefile $(FORCE)
+	@if [ -f "$(TOP)/goodies/refactoryBrowser/parser/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/goodies/refactoryBrowser/parser (no source)"; \
+	else \
+	    cd $(TOP)/goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/goodies/refactoryBrowser/parser/makefile: $(TOP)/goodies/refactoryBrowser/parser/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/goodies/refactoryBrowser/parser
+
+libstx_libbasic3.so: $(TOP)/libbasic3/libstx_libbasic3.so
+	ln -sf $(TOP)/libbasic3/libstx_libbasic3.so .
+
+$(TOP)/libbasic3/libstx_libbasic3.so: $(TOP)/libbasic3/makefile $(FORCE)
+	@if [ -f "$(TOP)/libbasic3/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libbasic3 (no source)"; \
+	else \
+	    cd $(TOP)/libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libbasic3/makefile: $(TOP)/libbasic3/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libbasic3
+
+libstx_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 .
+
+$(TOP)/libui/libstx_libui.so: $(TOP)/libui/makefile $(FORCE)
+	@if [ -f "$(TOP)/libui/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libui (no source)"; \
+	else \
+	    cd $(TOP)/libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libui/makefile: $(TOP)/libui/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libui
+
+libstx_libview2.so: $(TOP)/libview2/libstx_libview2.so
+	ln -sf $(TOP)/libview2/libstx_libview2.so .
+
+$(TOP)/libview2/libstx_libview2.so: $(TOP)/libview2/makefile $(FORCE)
+	@if [ -f "$(TOP)/libview2/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libview2 (no source)"; \
+	else \
+	    cd $(TOP)/libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libview2/makefile: $(TOP)/libview2/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libview2
+
+libstx_libwidg.so: $(TOP)/libwidg/libstx_libwidg.so
+	ln -sf $(TOP)/libwidg/libstx_libwidg.so .
+
+$(TOP)/libwidg/libstx_libwidg.so: $(TOP)/libwidg/makefile $(FORCE)
+	@if [ -f "$(TOP)/libwidg/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libwidg (no source)"; \
+	else \
+	    cd $(TOP)/libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libwidg/makefile: $(TOP)/libwidg/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libwidg
+
+libstx_goodies_magritte.so: $(TOP)/goodies/magritte/libstx_goodies_magritte.so
+	ln -sf $(TOP)/goodies/magritte/libstx_goodies_magritte.so .
+
+$(TOP)/goodies/magritte/libstx_goodies_magritte.so: $(TOP)/goodies/magritte/makefile $(FORCE)
+	@if [ -f "$(TOP)/goodies/magritte/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/goodies/magritte (no source)"; \
+	else \
+	    cd $(TOP)/goodies/magritte && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/goodies/magritte/makefile: $(TOP)/goodies/magritte/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/goodies/magritte
+
+libstx_libhtml.so: $(TOP)/libhtml/libstx_libhtml.so
+	ln -sf $(TOP)/libhtml/libstx_libhtml.so .
+
+$(TOP)/libhtml/libstx_libhtml.so: $(TOP)/libhtml/makefile $(FORCE)
+	@if [ -f "$(TOP)/libhtml/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libhtml (no source)"; \
+	else \
+	    cd $(TOP)/libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libhtml/makefile: $(TOP)/libhtml/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libhtml
+
+libstx_libwidg2.so: $(TOP)/libwidg2/libstx_libwidg2.so
+	ln -sf $(TOP)/libwidg2/libstx_libwidg2.so .
+
+$(TOP)/libwidg2/libstx_libwidg2.so: $(TOP)/libwidg2/makefile $(FORCE)
+	@if [ -f "$(TOP)/libwidg2/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libwidg2 (no source)"; \
+	else \
+	    cd $(TOP)/libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libwidg2/makefile: $(TOP)/libwidg2/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libwidg2
+
+libstx_libcompat.so: $(TOP)/libcompat/libstx_libcompat.so
+	ln -sf $(TOP)/libcompat/libstx_libcompat.so .
+
+$(TOP)/libcompat/libstx_libcompat.so: $(TOP)/libcompat/makefile $(FORCE)
+	@if [ -f "$(TOP)/libcompat/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libcompat (no source)"; \
+	else \
+	    cd $(TOP)/libcompat && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libcompat/makefile: $(TOP)/libcompat/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libcompat
+
+libstx_libtool.so: $(TOP)/libtool/libstx_libtool.so
+	ln -sf $(TOP)/libtool/libstx_libtool.so .
+
+$(TOP)/libtool/libstx_libtool.so: $(TOP)/libtool/makefile $(FORCE)
+	@if [ -f "$(TOP)/libtool/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libtool (no source)"; \
+	else \
+	    cd $(TOP)/libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libtool/makefile: $(TOP)/libtool/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libtool
+
+libstx_goodies_xml_vw.so: $(TOP)/goodies/xml/vw/libstx_goodies_xml_vw.so
+	ln -sf $(TOP)/goodies/xml/vw/libstx_goodies_xml_vw.so .
+
+$(TOP)/goodies/xml/vw/libstx_goodies_xml_vw.so: $(TOP)/goodies/xml/vw/makefile $(FORCE)
+	@if [ -f "$(TOP)/goodies/xml/vw/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/goodies/xml/vw (no source)"; \
+	else \
+	    cd $(TOP)/goodies/xml/vw && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/goodies/xml/vw/makefile: $(TOP)/goodies/xml/vw/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/goodies/xml/vw
+
+libjv_libgdbs.so: ../../libgdbs/libjv_libgdbs.so
+	ln -sf ../../libgdbs/libjv_libgdbs.so .
+
+../../libgdbs/libjv_libgdbs.so: ../../libgdbs/makefile $(FORCE)
+	@if [ -f "../../libgdbs/.NOSOURCE" ]; then \
+	    echo "skip make in ../../libgdbs (no source)"; \
+	else \
+	    cd ../../libgdbs && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+../../libgdbs/makefile: ../../libgdbs/Make.proto
+	$(TOP)/rules/stmkmf --cd ../../libgdbs
+
+libstx_libtool2.so: $(TOP)/libtool2/libstx_libtool2.so
+	ln -sf $(TOP)/libtool2/libstx_libtool2.so .
+
+$(TOP)/libtool2/libstx_libtool2.so: $(TOP)/libtool2/makefile $(FORCE)
+	@if [ -f "$(TOP)/libtool2/.NOSOURCE" ]; then \
+	    echo "skip make in $(TOP)/libtool2 (no source)"; \
+	else \
+	    cd $(TOP)/libtool2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+$(TOP)/libtool2/makefile: $(TOP)/libtool2/Make.proto
+	$(TOP)/rules/stmkmf --cd $(TOP)/libtool2
+
+libjv_vdb.so: ..//libjv_vdb.so
+	ln -sf ..//libjv_vdb.so .
+
+..//libjv_vdb.so: ..//makefile $(FORCE)
+	@if [ -f "..//.NOSOURCE" ]; then \
+	    echo "skip make in ../ (no source)"; \
+	else \
+	    cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+	fi
+
+..//makefile: ..//Make.proto
+	$(TOP)/rules/stmkmf --cd ../
+
+
+
+
+
+
+
+
+
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
+jv_vdb_application.$(O): $(shell hg root)/.hg/dirstate
+endif
+
+
+
+
+clean::
+	-rm -f *.so vdb.do.$(O)
+
+clobber:: clean
+	-rm -f vdb.do *.img *.sav
+
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(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	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/Make.spec	Mon Apr 09 21:43:54 2018 +0100
@@ -1,65 +1,65 @@
-# $Header$
-#
-# DO NOT EDIT
-# automagically generated from the projectDefinition: jv_vdb_application.
-#
-# Warning: once you modify this file, do not rerun
-# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
-#
-# This file contains specifications which are common to all platforms.
-#
-
-# Do NOT CHANGE THESE DEFINITIONS
-# (otherwise, ST/X will have a hard time to find out the packages location from its packageID,
-#  to find the source code of a class and to find the library for a package)
-MODULE=jv
-MODULE_DIR=vdb/application
-PACKAGE=$(MODULE):$(MODULE_DIR)
-
-
-# Argument(s) to the stc compiler (stc --usage).
-#  -headerDir=. : create header files locally
-#                (if removed, they will be created as common
-#  -Pxxx       : defines the package
-#  -Zxxx       : a prefix for variables within the classLib
-#  -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
-#  +optspace3  : optimized even more for space
-#  +optinline  : generate inline code for some ST constructs
-#  +inlineNew  : additionally inline new
-#  +inlineMath : additionally inline some floatPnt math stuff
-#
-# ********** OPTIONAL: MODIFY the next line(s) ***
-# STCLOCALOPTIMIZATIONS=+optinline +inlineNew
-# STCLOCALOPTIMIZATIONS=+optspace3
-STCLOCALOPTIMIZATIONS=+optspace3
-
-
-# Argument(s) to the stc compiler (stc --usage).
-#  -warn            : no warnings
-#  -warnNonStandard : no warnings about ST/X extensions
-#  -warnEOLComments : no warnings about EOL comment extension
-#  -warnPrivacy     : no warnings about privateClass extension
-#  -warnUnused      : no warnings about unused variables
-#
-# ********** OPTIONAL: MODIFY the next line(s) ***
-# STCWARNINGS=-warn
-# STCWARNINGS=-warnNonStandard
-# STCWARNINGS=-warnEOLComments
-STCWARNINGS=-warnNonStandard
-
-COMMON_CLASSES= \
-	VDBStartup \
-	jv_vdb_application \
-
-
-
-
-COMMON_OBJS= \
-    $(OUTDIR)VDBStartup.$(O) \
-    $(OUTDIR)jv_vdb_application.$(O) \
-
-
-
+# $Header$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: jv_vdb_application.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# This file contains specifications which are common to all platforms.
+#
+
+# Do NOT CHANGE THESE DEFINITIONS
+# (otherwise, ST/X will have a hard time to find out the packages location from its packageID,
+#  to find the source code of a class and to find the library for a package)
+MODULE=jv
+MODULE_DIR=vdb/application
+PACKAGE=$(MODULE):$(MODULE_DIR)
+
+
+# Argument(s) to the stc compiler (stc --usage).
+#  -headerDir=. : create header files locally
+#                (if removed, they will be created as common
+#  -Pxxx       : defines the package
+#  -Zxxx       : a prefix for variables within the classLib
+#  -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
+#  +optspace3  : optimized even more for space
+#  +optinline  : generate inline code for some ST constructs
+#  +inlineNew  : additionally inline new
+#  +inlineMath : additionally inline some floatPnt math stuff
+#
+# ********** OPTIONAL: MODIFY the next line(s) ***
+# STCLOCALOPTIMIZATIONS=+optinline +inlineNew
+# STCLOCALOPTIMIZATIONS=+optspace3
+STCLOCALOPTIMIZATIONS=+optspace3
+
+
+# Argument(s) to the stc compiler (stc --usage).
+#  -warn            : no warnings
+#  -warnNonStandard : no warnings about ST/X extensions
+#  -warnEOLComments : no warnings about EOL comment extension
+#  -warnPrivacy     : no warnings about privateClass extension
+#  -warnUnused      : no warnings about unused variables
+#
+# ********** OPTIONAL: MODIFY the next line(s) ***
+# STCWARNINGS=-warn
+# STCWARNINGS=-warnNonStandard
+# STCWARNINGS=-warnEOLComments
+STCWARNINGS=-warnNonStandard
+
+COMMON_CLASSES= \
+	VDBStartup \
+	jv_vdb_application \
+
+
+
+
+COMMON_OBJS= \
+    $(OUTDIR)VDBStartup.$(O) \
+    $(OUTDIR)jv_vdb_application.$(O) \
+
+
+
--- a/application/Makefile.init	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/Makefile.init	Mon Apr 09 21:43:54 2018 +0100
@@ -1,27 +1,27 @@
-#
-# DO NOT EDIT
-#
-# make uses this file (Makefile) only, if there is no
-# file named "makefile" (lower-case m) in the same directory.
-# My only task is to generate the real makefile and call make again.
-# Thereafter, I am no longer used and needed.
-#
-# MACOSX caveat:
-#   as filenames are not case sensitive (in a default setup),
-#   we cannot use the above trick. Therefore, this file is now named
-#   "Makefile.init", and you have to execute "make -f Makefile.init" to
-#   get the initial makefile.  This is now also done by the toplevel CONFIG
-#   script.
-
-.PHONY: run
-
-run: makefile
-	$(MAKE) -f makefile
-
-#only needed for the definition of $(TOP)
-include Make.proto
-
-makefile: mf
-
-mf:
-	$(TOP)/rules/stmkmf
+#
+# DO NOT EDIT
+#
+# make uses this file (Makefile) only, if there is no
+# file named "makefile" (lower-case m) in the same directory.
+# My only task is to generate the real makefile and call make again.
+# Thereafter, I am no longer used and needed.
+#
+# MACOSX caveat:
+#   as filenames are not case sensitive (in a default setup),
+#   we cannot use the above trick. Therefore, this file is now named
+#   "Makefile.init", and you have to execute "make -f Makefile.init" to
+#   get the initial makefile.  This is now also done by the toplevel CONFIG
+#   script.
+
+.PHONY: run
+
+run: makefile
+	$(MAKE) -f makefile
+
+#only needed for the definition of $(TOP)
+include Make.proto
+
+makefile: mf
+
+mf:
+	$(TOP)/rules/stmkmf
--- a/application/abbrev.stc	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/abbrev.stc	Mon Apr 09 21:43:54 2018 +0100
@@ -1,5 +1,5 @@
-# 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.
-VDBStartup VDBStartup jv:vdb/application 'VDB-UI' 1
-jv_vdb_application jv_vdb_application jv:vdb/application '* Projects & Packages *' 3
+# 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.
+VDBStartup VDBStartup jv:vdb/application 'VDB-UI' 1
+jv_vdb_application jv_vdb_application jv:vdb/application '* Projects & Packages *' 3
--- a/application/application.nsi	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/application.nsi	Mon Apr 09 21:43:54 2018 +0100
@@ -1,213 +1,213 @@
-; $Header$
-; Script generated by ProjectDefinition.
-
-!define PRODUCT_NAME "Visual / VM Debugger"
-!define PRODUCT_FILENAME "Visual___VM_Debugger"
-!define PRODUCT_VERSION "8.0.0.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 / VM DebuggerSetup"
-!endif
-
-!define STX_ROOT "..\..\..\stx\.."
-
-SetCompressor /solid lzma
-
-!include "MUI2.nsh"
-!include "x64.nsh"
-
-; MUI Settings
-
-!define MUI_WELCOMEPAGE_TITLE_3LINES
-!define MUI_ABORTWARNING
-;; !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
-!define MUI_ICON "vdb.ico"
-;; !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
-!define MUI_UNICON "vdb.ico"
-
-; Language Selection Dialog Settings
-!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
-!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
-!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
-
-; Welcome page
-!insertmacro MUI_PAGE_WELCOME
-; License page
-; !define MUI_LICENSEPAGE_CHECKBOX
-
-
-!insertmacro MUI_PAGE_COMPONENTS
-; Directory page
-!insertmacro MUI_PAGE_DIRECTORY
-; Instfiles page
-!insertmacro MUI_PAGE_INSTFILES
-; Finish page
-!insertmacro MUI_PAGE_FINISH
-
-; Uninstaller pages
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Language files
-!insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "German"
-
-; MUI end ------
-
-
-
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-VIProductVersion "${PRODUCT_VERSION}.0"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${PRODUCT_NAME}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "${PRODUCT_PUBLISHER}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "8.0.32767.32767"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${PRODUCT_NAME} Installer"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${PRODUCT_VERSION}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright (C) Jan Vrany 2015-now"
-
-
-OutFile "${SETUP_NAME}.exe"
-InstallDir "$PROGRAMFILES\vdb"
-ShowInstDetails show
-ShowUnInstDetails show
-
-Function .onInit
-  !insertmacro MUI_LANGDLL_DISPLAY
-FunctionEnd
-
-InstType Full
-InstType Partial
-
-Section "Programme" Section1
-  SectionIn 1 2
-  SetOutPath "$INSTDIR\bin"
-  SetOverwrite ifnewer
-  File "vdb.exe"
-  File "*.dll"
-  File "symbols.stc"
-  File "*.stx"
-  File "*.rc"
-  File /r /x CVS /x ".*" resources
-
-
-
-
-
-  WriteRegStr HKCR "Jv.Visual___VM_Debugger.1" "" "Visual___VM_Debugger File"
-  WriteRegStr HKCR "Jv.Visual___VM_Debugger.1\DefaultIcon" "" '$INSTDIR\bin\vdb.exe,0'
-  WriteRegStr HKCR "Jv.Visual___VM_Debugger.1\Shell\open" "" $(appOpen)
-  WriteRegStr HKCR "Jv.Visual___VM_Debugger.1\Shell\open\command" "" '"$INSTDIR\bin\vdb.exe" -- "%1"'
-SectionEnd
-
-;; Section "Online-Documentation for Visual / VM Debugger" Section2
-;;   SectionIn 1
-;;   SetOutPath "$INSTDIR\doc"
-;;   SetOverwrite ifnewer
-;;   File /r /x CVS "${STX_ROOT}\jv\vdb.do\doc\*"
-;; SectionEnd
-
-;; Section "Visual / VM Debugger Libraries and Demos" Section3
-;;   SectionIn 1
-;;   SetOutPath "$INSTDIR\lib"
-;;   SetOverwrite ifnewer
-;; ;   File /r /x CVS "${STX_ROOT}\jv\vdb.do\examples\*"
-;; SectionEnd
-;; 
-;; Section "Visual / VM Debugger Reports and Printing" Section4
-;;   SectionIn 1
-;;   SetOutPath "$INSTDIR\reportGenerator"
-;;   SetOverwrite ifnewer
-;; ;  File /r /x CVS "..\reportGenerator\java" "..\reportGenerator\rules" "..\reportGenerator\*.xml" "..\reportGenerator\*.xslt" "..\reportGenerator\CloseApp.exe" "..\reportGenerator\expecco.jpg"
-;; SectionEnd
-
-
-
-
-
-
-
-
-Section -AdditionalIcons
-  SetOutPath "$INSTDIR\bin"
-  WriteIniStr "$INSTDIR\${PRODUCT_FILENAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-  CreateDirectory "$SMPROGRAMS\${PRODUCT_FILENAME}"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_FILENAME}\vdb.do.lnk" "$INSTDIR\bin\vdb.exe"
-  CreateShortCut "$DESKTOP\vdb.do.lnk" "$INSTDIR\bin\vdb.exe"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_FILENAME}\Website.lnk" "$INSTDIR\${PRODUCT_FILENAME}.url"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_FILENAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
-SectionEnd
-
-Section -Post
-  WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
-SectionEnd
-
-LangString appOpen ${LANG_GERMAN}  "Mit Visual / VM Debugger öffnen"
-LangString appOpen ${LANG_ENGLISH} "Open with Visual / VM Debugger"
-
-LangString DESC_Section1 ${LANG_ENGLISH} "Program components of Visual / VM Debugger"
-LangString DESC_Section1 ${LANG_GERMAN}  "Alle Programmkomponenten von Visual / VM Debugger"
-;; LangString DESC_Section2 ${LANG_ENGLISH} "Online-Documentation of Visual / VM Debugger"
-;; LangString DESC_Section2 ${LANG_GERMAN}  "Online-Dokumentation zu Visual / VM Debugger"
-;; LangString DESC_Section3 ${LANG_ENGLISH} "Libraries and Demo Projects"
-;; LangString DESC_Section3 ${LANG_GERMAN}  "Bibliotheken und Beispielprojekte"
-;; LangString DESC_Section4 ${LANG_ENGLISH} "Logfile Printing and Report Generation"
-;; LangString DESC_Section4 ${LANG_GERMAN}  "Drucken und Report-Generierung aus Log-Dateien"
-;; LangString DESC_Section3 ${LANG_ENGLISH} "Sources of ST/X (Base-System)"
-;; LangString DESC_Section3 ${LANG_GERMAN}  "Quellcode von ST/X (Basis-System)"
-;; LangString DESC_Section4 ${LANG_ENGLISH} "Sources of Visual / VM Debugger"
-;; LangString DESC_Section4 ${LANG_GERMAN}  "Quellcode von Visual / VM Debugger"
-
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)
-;;   !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)
-;;  !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3)
-;;  !insertmacro MUI_DESCRIPTION_TEXT ${Section4} $(DESC_Section4)
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-
-
-Function un.onUninstSuccess
-  HideWindow
-  MessageBox MB_ICONINFORMATION|MB_OK "Visual / VM Debugger wurde erfolgreich deinstalliert"
-FunctionEnd
-
-Function un.onInit
-!insertmacro MUI_UNGETLANGUAGE
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Möchten Sie Visual / VM Debugger und alle seine Komponenten deinstallieren?" IDYES +2
-  Abort
-FunctionEnd
-
-Section Uninstall
-  Delete "$INSTDIR\${PRODUCT_FILENAME}.url"
-  Delete "$INSTDIR\uninst.exe"
-
-    Delete "$INSTDIR\*"
-    RMDir /r "$INSTDIR"
-
-  Delete "$SMPROGRAMS\${PRODUCT_FILENAME}\Uninstall.lnk"
-  Delete "$SMPROGRAMS\${PRODUCT_FILENAME}\Website.lnk"
-  Delete "$SMPROGRAMS\${PRODUCT_FILENAME}\vdb.do.lnk"
-  Delete "$DESKTOP\vdb.do.lnk"
-
-  RMDir "$SMPROGRAMS\${PRODUCT_FILENAME}"
-
-  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
-  DeleteRegKey HKCR "Jv.Visual___VM_Debugger.1"
-
-
-
-  SetAutoClose true
-SectionEnd
+; $Header$
+; Script generated by ProjectDefinition.
+
+!define PRODUCT_NAME "Visual / VM Debugger"
+!define PRODUCT_FILENAME "Visual___VM_Debugger"
+!define PRODUCT_VERSION "8.0.0.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 / VM DebuggerSetup"
+!endif
+
+!define STX_ROOT "..\..\..\stx\.."
+
+SetCompressor /solid lzma
+
+!include "MUI2.nsh"
+!include "x64.nsh"
+
+; MUI Settings
+
+!define MUI_WELCOMEPAGE_TITLE_3LINES
+!define MUI_ABORTWARNING
+;; !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
+!define MUI_ICON "vdb.ico"
+;; !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
+!define MUI_UNICON "vdb.ico"
+
+; Language Selection Dialog Settings
+!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
+!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
+!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
+
+; Welcome page
+!insertmacro MUI_PAGE_WELCOME
+; License page
+; !define MUI_LICENSEPAGE_CHECKBOX
+
+
+!insertmacro MUI_PAGE_COMPONENTS
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+!insertmacro MUI_PAGE_FINISH
+
+; Uninstaller pages
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Language files
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "German"
+
+; MUI end ------
+
+
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+VIProductVersion "${PRODUCT_VERSION}.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${PRODUCT_NAME}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "${PRODUCT_PUBLISHER}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "8.0.32767.32767"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${PRODUCT_NAME} Installer"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${PRODUCT_VERSION}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright (C) Jan Vrany 2015-now"
+
+
+OutFile "${SETUP_NAME}.exe"
+InstallDir "$PROGRAMFILES\vdb"
+ShowInstDetails show
+ShowUnInstDetails show
+
+Function .onInit
+  !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
+
+InstType Full
+InstType Partial
+
+Section "Programme" Section1
+  SectionIn 1 2
+  SetOutPath "$INSTDIR\bin"
+  SetOverwrite ifnewer
+  File "vdb.exe"
+  File "*.dll"
+  File "symbols.stc"
+  File "*.stx"
+  File "*.rc"
+  File /r /x CVS /x ".*" resources
+
+
+
+
+
+  WriteRegStr HKCR "Jv.Visual___VM_Debugger.1" "" "Visual___VM_Debugger File"
+  WriteRegStr HKCR "Jv.Visual___VM_Debugger.1\DefaultIcon" "" '$INSTDIR\bin\vdb.exe,0'
+  WriteRegStr HKCR "Jv.Visual___VM_Debugger.1\Shell\open" "" $(appOpen)
+  WriteRegStr HKCR "Jv.Visual___VM_Debugger.1\Shell\open\command" "" '"$INSTDIR\bin\vdb.exe" -- "%1"'
+SectionEnd
+
+;; Section "Online-Documentation for Visual / VM Debugger" Section2
+;;   SectionIn 1
+;;   SetOutPath "$INSTDIR\doc"
+;;   SetOverwrite ifnewer
+;;   File /r /x CVS "${STX_ROOT}\jv\vdb.do\doc\*"
+;; SectionEnd
+
+;; Section "Visual / VM Debugger Libraries and Demos" Section3
+;;   SectionIn 1
+;;   SetOutPath "$INSTDIR\lib"
+;;   SetOverwrite ifnewer
+;; ;   File /r /x CVS "${STX_ROOT}\jv\vdb.do\examples\*"
+;; SectionEnd
+;; 
+;; Section "Visual / VM Debugger Reports and Printing" Section4
+;;   SectionIn 1
+;;   SetOutPath "$INSTDIR\reportGenerator"
+;;   SetOverwrite ifnewer
+;; ;  File /r /x CVS "..\reportGenerator\java" "..\reportGenerator\rules" "..\reportGenerator\*.xml" "..\reportGenerator\*.xslt" "..\reportGenerator\CloseApp.exe" "..\reportGenerator\expecco.jpg"
+;; SectionEnd
+
+
+
+
+
+
+
+
+Section -AdditionalIcons
+  SetOutPath "$INSTDIR\bin"
+  WriteIniStr "$INSTDIR\${PRODUCT_FILENAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
+  CreateDirectory "$SMPROGRAMS\${PRODUCT_FILENAME}"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_FILENAME}\vdb.do.lnk" "$INSTDIR\bin\vdb.exe"
+  CreateShortCut "$DESKTOP\vdb.do.lnk" "$INSTDIR\bin\vdb.exe"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_FILENAME}\Website.lnk" "$INSTDIR\${PRODUCT_FILENAME}.url"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_FILENAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
+SectionEnd
+
+Section -Post
+  WriteUninstaller "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+SectionEnd
+
+LangString appOpen ${LANG_GERMAN}  "Mit Visual / VM Debugger öffnen"
+LangString appOpen ${LANG_ENGLISH} "Open with Visual / VM Debugger"
+
+LangString DESC_Section1 ${LANG_ENGLISH} "Program components of Visual / VM Debugger"
+LangString DESC_Section1 ${LANG_GERMAN}  "Alle Programmkomponenten von Visual / VM Debugger"
+;; LangString DESC_Section2 ${LANG_ENGLISH} "Online-Documentation of Visual / VM Debugger"
+;; LangString DESC_Section2 ${LANG_GERMAN}  "Online-Dokumentation zu Visual / VM Debugger"
+;; LangString DESC_Section3 ${LANG_ENGLISH} "Libraries and Demo Projects"
+;; LangString DESC_Section3 ${LANG_GERMAN}  "Bibliotheken und Beispielprojekte"
+;; LangString DESC_Section4 ${LANG_ENGLISH} "Logfile Printing and Report Generation"
+;; LangString DESC_Section4 ${LANG_GERMAN}  "Drucken und Report-Generierung aus Log-Dateien"
+;; LangString DESC_Section3 ${LANG_ENGLISH} "Sources of ST/X (Base-System)"
+;; LangString DESC_Section3 ${LANG_GERMAN}  "Quellcode von ST/X (Basis-System)"
+;; LangString DESC_Section4 ${LANG_ENGLISH} "Sources of Visual / VM Debugger"
+;; LangString DESC_Section4 ${LANG_GERMAN}  "Quellcode von Visual / VM Debugger"
+
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)
+;;   !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)
+;;  !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3)
+;;  !insertmacro MUI_DESCRIPTION_TEXT ${Section4} $(DESC_Section4)
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+
+
+Function un.onUninstSuccess
+  HideWindow
+  MessageBox MB_ICONINFORMATION|MB_OK "Visual / VM Debugger wurde erfolgreich deinstalliert"
+FunctionEnd
+
+Function un.onInit
+!insertmacro MUI_UNGETLANGUAGE
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Möchten Sie Visual / VM Debugger und alle seine Komponenten deinstallieren?" IDYES +2
+  Abort
+FunctionEnd
+
+Section Uninstall
+  Delete "$INSTDIR\${PRODUCT_FILENAME}.url"
+  Delete "$INSTDIR\uninst.exe"
+
+    Delete "$INSTDIR\*"
+    RMDir /r "$INSTDIR"
+
+  Delete "$SMPROGRAMS\${PRODUCT_FILENAME}\Uninstall.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_FILENAME}\Website.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_FILENAME}\vdb.do.lnk"
+  Delete "$DESKTOP\vdb.do.lnk"
+
+  RMDir "$SMPROGRAMS\${PRODUCT_FILENAME}"
+
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey HKCR "Jv.Visual___VM_Debugger.1"
+
+
+
+  SetAutoClose true
+SectionEnd
--- a/application/autopackage/default.apspec	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/autopackage/default.apspec	Mon Apr 09 21:43:54 2018 +0100
@@ -1,69 +1,69 @@
-# -*- shell-script -*-
-[Meta]
-ShortName: vdb.do
-SoftwareVersion: 8.0.0.0
-DisplayName: Visual / VM Debugger
-RootName: Visual / VM Debugger
-Summary: Visual / VM Debugger
-Maintainer: Jan Vrany
-Packager: Jan Vrany
-PackageVersion: 1
-CPUArchitectures: x86
-AutopackageTarget: 1.0
-Type: Application
-License: Commercial
-
-[Description]
-Visual / VM Debugger
-
-[BuildPrepare]
-# If you're using autotools, the default should be enough.
-# prepareBuild will set up apbuild and run configure for you. If you
-# need to pass arguments to configure, just add them to prepareBuild:
-# prepareBuild --enable-foo --disable-bar
-#prepareBuild
-
-[BuildUnprepare]
-# If you're using prepareBuild above, there is no need to change this!
-#unprepareBuild
-
-[Globals]
-# Variables declared in this section will be available in all other sections
-export APKG_BUILD_SKIP_CONFIGURE=1
-export APKG_BUILD_SKIP_MAKE=1
-export MYPREFIX=/opt/vdb.do
-
-[Prepare]
-#recommend '@autopackage.org/autopackage-gtk' 1
-
-[Imports]
-import <<EOF
-$source_dir/vdb.do
-
-EOF
-
-for i in $source_dir/*.so
-do
-    echo $source_dir/$(readlink $i)
-done | import
-
-[Install]
-if [ "$PREFIX" != "/usr" ]
-then
-    export MYPREFIX=$PREFIX
-fi
-
-find . -type d \( -name CVS -or -name 'not_*' \) -print | xargs rm -rf
-mkdir -p $MYPREFIX
-copyFiles Visual / VM Debugger *.rc resources        $MYPREFIX/bin
-
-
-#installExe Visual / VM Debugger
-#installLib *.so
-
-
-[Uninstall]
-# Leaving this at the default is safe unless you use custom commands in
-# "Install" to create files. All autopackage API functions
-# that installs files are logged.
-uninstallFromLog
+# -*- shell-script -*-
+[Meta]
+ShortName: vdb.do
+SoftwareVersion: 8.0.0.0
+DisplayName: Visual / VM Debugger
+RootName: Visual / VM Debugger
+Summary: Visual / VM Debugger
+Maintainer: Jan Vrany
+Packager: Jan Vrany
+PackageVersion: 1
+CPUArchitectures: x86
+AutopackageTarget: 1.0
+Type: Application
+License: Commercial
+
+[Description]
+Visual / VM Debugger
+
+[BuildPrepare]
+# If you're using autotools, the default should be enough.
+# prepareBuild will set up apbuild and run configure for you. If you
+# need to pass arguments to configure, just add them to prepareBuild:
+# prepareBuild --enable-foo --disable-bar
+#prepareBuild
+
+[BuildUnprepare]
+# If you're using prepareBuild above, there is no need to change this!
+#unprepareBuild
+
+[Globals]
+# Variables declared in this section will be available in all other sections
+export APKG_BUILD_SKIP_CONFIGURE=1
+export APKG_BUILD_SKIP_MAKE=1
+export MYPREFIX=/opt/vdb.do
+
+[Prepare]
+#recommend '@autopackage.org/autopackage-gtk' 1
+
+[Imports]
+import <<EOF
+$source_dir/vdb.do
+
+EOF
+
+for i in $source_dir/*.so
+do
+    echo $source_dir/$(readlink $i)
+done | import
+
+[Install]
+if [ "$PREFIX" != "/usr" ]
+then
+    export MYPREFIX=$PREFIX
+fi
+
+find . -type d \( -name CVS -or -name 'not_*' \) -print | xargs rm -rf
+mkdir -p $MYPREFIX
+copyFiles Visual / VM Debugger *.rc resources        $MYPREFIX/bin
+
+
+#installExe Visual / VM Debugger
+#installLib *.so
+
+
+[Uninstall]
+# Leaving this at the default is safe unless you use custom commands in
+# "Install" to create files. All autopackage API functions
+# that installs files are logged.
+uninstallFromLog
--- a/application/bc.mak	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/bc.mak	Mon Apr 09 21:43:54 2018 +0100
@@ -1,579 +1,579 @@
-# $Header$
-#
-# DO NOT EDIT 
-# automagically generated from the projectDefinition: jv_vdb_application.
-#
-# Warning: once you modify this file, do not rerun
-# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
-#
-# Historic Note:
-#  this used to contain only rules to make with borland 
-#    (called via bmake, by "make.exe -f bc.mak")
-#  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)\..
-
-# An old file, used as a dummy target for FORCE if we do not want
-#   re-make libraries. Windows make does not work if we redefine FORCE=   (empty string)
-# OLD_FILE=bmake.bat
-OLD_FILE="c:\windows\win.ini"
-
-#dummy target to force a build
-!ifndef FORCE
-FORCE=$(OLD_FILE)
-!endif
-
-CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
- -DSTARTUP_CLASS="\"VDBStartup\"" \
- -DSTARTUP_SELECTOR="\"start\"" \
- -DUSE_MODULE_TABLE
-
-#
-
-!INCLUDE $(TOP)\rules\stdHeader_bc
-!INCLUDE Make.spec
-
-OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
-
-
-
-#
-APPNAME=libjv_vdb_application
-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 -I$(INCLUDE_TOP)\stx\libtool
-LOCALDEFINES=
-GLOBALDEFINES=
-
-STCLOCALOPT='-package=$(PACKAGE)' $(LOCALDEFINES) $(LOCALINCLUDES)  $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMFLAG) -varPrefix=$(LIBNAME)
-
-LFLAGS=$(APP_LFLAGS)
-
-PROJECT_NOCONSOLE= vdb.exe
-PROJECT_CONSOLE= vdb.com
-ALLOBJFILES= main.$(O)
-!ifdef USETCC
-RESFILES=
-!else
-RESFILES= jv_vdb_applicationWINrc.$(RES)
-!endif
-
-ALLOBJ= $(ALLOBJFILES) $(OBJS)
-DEFFILE=$(TOP)\rules\bc_exe.def
-
-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_libbasic2.dll \
- libstx_libcomp.dll \
- libstx_goodies_refactoryBrowser_parser.dll \
- libstx_libbasic3.dll \
- libstx_libview.dll \
- libstx_libui.dll \
- libstx_libview2.dll \
- libstx_libwidg.dll \
- libstx_goodies_magritte.dll \
- libstx_libhtml.dll \
- libstx_libwidg2.dll \
- libstx_libcompat.dll \
- libstx_libtool.dll \
- libstx_goodies_xml_vw.dll \
- libjv_libgdbs.dll \
- libstx_libtool2.dll \
- libjv_vdb.dll \
-
-
-REQUIRED_FILES=$(RT_DLL) $(X11_DLL) $(XEXT_DLL) symbols.stc $(REQUIRED_LIBS)
-
-SUBPROJECT_LIBS=
-
-
-REQUIRED_SUPPORT_DIRS=RESOURCEFILES
-
-target: ALL postBuildCleanup 
-
-# the executable, all required files and a self-installing-installer-exe
-ALL:: prereq ALL_NP
-
-# all, but no prereqs
-ALL_NP:: exe $(REQUIRED_SUPPORT_DIRS) postBuildCleanup subProjects
-
-exe:  newBuildDate $(REQUIRED_LIBS) noConsoleApp consoleApp registerApplication
-
-# the executable only
-# with console
-consoleApp: $(REQUIRED_LIBS)
-	-del main.$(O)
-	$(MAKE) -N -f bc.mak $(USE_ARG) \
-		MAKE_BAT=$(MAKE_BAT) \
-		PROJECT=$(PROJECT_CONSOLE) \
-		CFLAGS_APPTYPE=" -DWIN32GUI $(CFLAGS_CONSOLE)" \
-		LFLAGS_APPTYPE=" $(LFLAGS_CONSOLE)" \
-		CRT_STARTUP=" $(CRT_STARTUP_CONSOLE)" theExe
-
-# without console
-noConsoleApp: $(REQUIRED_LIBS)
-	-del main.$(O)
-	$(MAKE) -N -f bc.mak $(USE_ARG) \
-		MAKE_BAT=$(MAKE_BAT) \
-		PROJECT=$(PROJECT_NOCONSOLE) \
-		CFLAGS_APPTYPE=" -DWIN32GUI $(CFLAGS_NOCONSOLE) -DWIN_LOGFILE="\\"\"vdb.do.log\\"\""" \
-		LFLAGS_APPTYPE=" $(LFLAGS_NOCONSOLE)" \
-		CRT_STARTUP=" $(CRT_STARTUP_NOCONSOLE)" theExe
-
-# the executable only (internal target; needs some defines)
-theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT) 
-
-# build all mandatory prerequisite packages (containing superclasses) for this package
-prereq:
-	$(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___VM_DebuggerSetup64 application.nsi
-        
-
-!else
-
-setup: $(PROJECT) postBuildCleanup application.nsi
-	$(MAKENSIS) /DOBJ_DIR=objbc /DSETUP_NAME=Visual___VM_DebuggerSetup application.nsi
-        
-
-!endif
-
-newBuildDate:
-	del buildDate.h
-
-new:
-	$(MAKE_BAT) clean
-	$(MAKE_BAT)
-
-RESOURCEFILES: vdb.do_RESOURCES vdb.do_BITMAPS  \
-	stx_RESOURCES stx_STYLES stx_BITMAPS
-
-
-vdb.do_RESOURCES: resources\jv\vdb\application\NUL
-	-copy ..\resources\*.rs resources\jv\vdb\application\..
-	-copy ..\resources\*.style resources\jv\vdb\application\..
-
-vdb.do_BITMAPS: resources\jv\vdb\application\bitmaps\NUL
-	-copy *.ico resources\jv\vdb\application\bitmaps
-	-copy *.gif resources\jv\vdb\application\bitmaps
-
-resources\jv\vdb\application\bitmaps\NUL: resources\jv\vdb\application\NUL
-	mkdir resources\jv\vdb\application\bitmaps
-
-resources\jv\vdb\application\NUL: resources\jv\vdb\NUL
-	mkdir resources\jv\vdb\application
-
-resources\jv\vdb\NUL: resources\jv\NUL
-	mkdir resources\jv\vdb
-resources\jv\NUL: resources\NUL
-	mkdir resources\jv
-
-
-
-stx_RESOURCES: \
-	keyboard.rc \
-	keyboardMacros.rc \
-	host.rc \
-	h_win32.rc \
-	display.rc \
-	d_win32.rc \
-	libbasic_RESOURCES \
-	libview_RESOURCES \
-	libtool_RESOURCES  \
-	libtool2_RESOURCES
-
-
-keyboard.rc: $(TOP)\projects\smalltalk\keyboard.rc
-	copy $(TOP)\projects\smalltalk\keyboard.rc *.*
-
-keyboardMacros.rc: $(TOP)\projects\smalltalk\keyboardMacros.rc
-	copy $(TOP)\projects\smalltalk\keyboardMacros.rc *.*
-
-host.rc: $(TOP)\projects\smalltalk\host.rc
-	copy $(TOP)\projects\smalltalk\host.rc *.*
-
-h_win32.rc: $(TOP)\projects\smalltalk\h_win32.rc
-	copy $(TOP)\projects\smalltalk\h_win32.rc *.*
-
-display.rc: $(TOP)\projects\smalltalk\display.rc
-	copy $(TOP)\projects\smalltalk\display.rc *.*
-
-d_win32.rc: $(TOP)\projects\smalltalk\d_win32.rc
-	copy $(TOP)\projects\smalltalk\d_win32.rc *.*
-
-stx_STYLES: resources\stx\libview\NUL resources\stx\libview\styles\NUL
-	-copy $(TOP)\libview\styles\*.style resources\stx\libview\styles\*.*
-	-copy $(TOP)\libview\styles\*.common resources\stx\libview\styles\*.*
-
-stx_BITMAPS: \
-	libwidg_BITMAPS
-
-libwidg_BITMAPS: resources\stx\libwidg\bitmaps\NUL
-	-copy $(TOP)\libwidg\bitmaps\*.xpm resources\stx\libwidg\bitmaps\*.*
-
-libbasic_RESOURCES: resources\stx\libbasic\NUL
-	-copy $(TOP)\libbasic\resources\*.rs resources\stx\libbasic\*.*
-
-libtool_RESOURCES: resources\stx\libtool\NUL
-	-copy $(TOP)\libtool\resources\*.rs resources\stx\libtool\*.*
-
-libtool2_RESOURCES: resources\stx\libtool2\NUL
-	-copy $(TOP)\libtool2\resources\*.rs resources\stx\libtool2\*.*
-
-libview_RESOURCES: resources\stx\libview\NUL 
-	-copy $(TOP)\libview\resources\*.rs resources\stx\libview\*.*
-
-libview2_RESOURCES: resources\stx\libview2\NUL
-	-copy $(TOP)\libview2\resources\*.rs resources\stx\libview2\*.*
-
-resources\stx\libbasic\NUL: resources\stx\NUL
-	mkdir resources\stx\libbasic
-
-resources\stx\libtool\NUL: resources\stx\NUL
-	mkdir resources\stx\libtool
-
-resources\stx\libtool2\NUL: resources\stx\NUL
-	mkdir resources\stx\libtool2
-
-resources\stx\libview\NUL: resources\stx\NUL
-	mkdir resources\stx\libview
-
-resources\stx\libview\styles\NUL: resources\stx\libview\NUL
-	mkdir resources\stx\libview\styles
-
-resources\stx\libview2\NUL: resources\stx\NUL
-	mkdir resources\stx\libview2
-
-resources\stx\libwidg\bitmaps\NUL: resources\stx\libwidg\NUL
-	mkdir resources\stx\libwidg\bitmaps
-
-resources\stx\libwidg\NUL: resources\stx\NUL
-	mkdir resources\stx\libwidg
-
-resources\stx\NUL: resources\NUL
-	mkdir resources\stx
-
-resources\NUL:
-	mkdir resources
-
-bitmaps\NUL:
-	mkdir bitmaps
-
-doc\NUL:
-	mkdir doc
-
-
-
-
-
-
-libstx_libbasic.dll: ..\..\..\stx\libbasic\$(OBJDIR)\libstx_libbasic.dll
-	copy ..\..\..\stx\libbasic\$(OBJDIR)\libstx_libbasic.dll *.*
-
-..\..\..\stx\libbasic\$(OBJDIR)\libstx_libbasic.dll: $(FORCE)
-	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_libbasic2.dll: ..\..\..\stx\libbasic2\$(OBJDIR)\libstx_libbasic2.dll
-	copy ..\..\..\stx\libbasic2\$(OBJDIR)\libstx_libbasic2.dll *.*
-
-..\..\..\stx\libbasic2\$(OBJDIR)\libstx_libbasic2.dll: $(FORCE)
-	pushd ..\..\..\stx\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libcomp.dll: ..\..\..\stx\libcomp\$(OBJDIR)\libstx_libcomp.dll
-	copy ..\..\..\stx\libcomp\$(OBJDIR)\libstx_libcomp.dll *.*
-
-..\..\..\stx\libcomp\$(OBJDIR)\libstx_libcomp.dll: $(FORCE)
-	pushd ..\..\..\stx\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_goodies_refactoryBrowser_parser.dll: ..\..\..\stx\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll
-	copy ..\..\..\stx\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll *.*
-
-..\..\..\stx\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll: $(FORCE)
-	pushd ..\..\..\stx\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libbasic3.dll: ..\..\..\stx\libbasic3\$(OBJDIR)\libstx_libbasic3.dll
-	copy ..\..\..\stx\libbasic3\$(OBJDIR)\libstx_libbasic3.dll *.*
-
-..\..\..\stx\libbasic3\$(OBJDIR)\libstx_libbasic3.dll: $(FORCE)
-	pushd ..\..\..\stx\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_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) "
-
-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) "
-
-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) "
-
-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) "
-
-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) "
-
-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) "
-
-libstx_libcompat.dll: ..\..\..\stx\libcompat\$(OBJDIR)\libstx_libcompat.dll
-	copy ..\..\..\stx\libcompat\$(OBJDIR)\libstx_libcompat.dll *.*
-
-..\..\..\stx\libcompat\$(OBJDIR)\libstx_libcompat.dll: $(FORCE)
-	pushd ..\..\..\stx\libcompat & $(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) "
-
-libstx_goodies_xml_vw.dll: ..\..\..\stx\goodies\xml\vw\$(OBJDIR)\libstx_goodies_xml_vw.dll
-	copy ..\..\..\stx\goodies\xml\vw\$(OBJDIR)\libstx_goodies_xml_vw.dll *.*
-
-..\..\..\stx\goodies\xml\vw\$(OBJDIR)\libstx_goodies_xml_vw.dll: $(FORCE)
-	pushd ..\..\..\stx\goodies\xml\vw & $(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_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) "
-
-libjv_vdb.dll: ..\$(OBJDIR)\libjv_vdb.dll
-	copy ..\$(OBJDIR)\libjv_vdb.dll *.*
-
-..\$(OBJDIR)\libjv_vdb.dll: $(FORCE)
-	pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-      
-
-
-sources\NUL: 
-	mkdir sources
-
-show:
-	@echo LFLAGS= $(LFLAGS)
-	@echo ALLOBJ= $(ALLOBJ)
-	@echo PROJECT= $(PROJECT)
-	@echo APP_IMPORTLIBS= $(APP_IMPORTLIBS)
-	@echo ALLLIB= $(ALLLIB)
-	@echo DEFFILE= $(DEFFILE)
-	@echo ALLRES= $(ALLRES)
-
-!ifdef USEBC
-
-$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ), $(PROJECT_CONSOLE),, $(ALLLIB), $(DEFFILE), $(RESFILES)
-
-$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ), $(PROJECT_NOCONSOLE),, $(ALLLIB), $(DEFFILE), $(RESFILES)
-
-!else
-! ifdef USEVC
-
-$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) /OUT:"$(PROJECT_CONSOLE)" \
-	    /MANIFEST /MANIFESTFILE:"$(PROJECT_CONSOLE).manifest" \
-	    /PDB:"$(PROJECT_CONSOLE).pdb" \
-	    /SUBSYSTEM:CONSOLE $(ALLLIB) $(RESFILES)
-
-$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) /OUT:"$(PROJECT_NOCONSOLE)" \
-	    /MANIFEST /MANIFESTFILE:"$(PROJECT_NOCONSOLE).manifest" \
-	    /PDB:"$(PROJECT_NOCONSOLE).pdb" \
-	    /SUBSYSTEM:WINDOWS $(ALLLIB) $(RESFILES)
-
-! else
-!  ifdef USELCC
-
-$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) -subsystem console $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_CONSOLE)" $(ALLLIB) $(RESFILES)
-
-$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) -subsystem windows $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_NOCONSOLE)" $(ALLLIB) $(RESFILES)
-
-!  else
-!   ifdef USETCC
-
-$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_CONSOLE)" $(ALLLIB) $(RESFILES)
-
-$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_NOCONSOLE)" $(ALLLIB) $(RESFILES)
-
-!   else
-!    if defined(USEMINGW32) || defined(USEMINGW64)
-
-$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES) show
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_CONSOLE)" $(ALLLIB) $(RESFILES)
-
-$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES) show
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_NOCONSOLE)" $(ALLLIB) $(APP_IMPORTLIBS) $(RESFILES)
-
-!    else
-error error error
-!    endif
-!   endif
-!  endif
-! endif
-!endif
-
-!INCLUDE $(TOP)\rules\stdRules_bc
-
-#
-# additional rules
-#
-vdb.doWin.$(RES): vdb.doWin.rc vdb.do.ico
-
-main.$(O): buildDate.h main.c bc.mak
-
-main.c: $(TOP)\librun\main.c
-	copy $(TOP)\librun\main.c main.c
-
-# now in stdRules.
-#buildDate.h: $(GENDATE_UTILITIY)
-#        $(GENDATE_UTILITIY)
-
-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)
-
-X11.dll: $(TOP)\support\win32\X11.dll
-	copy $(TOP)\support\win32\X11.dll X11.dll
-
-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
-
-
-
-
-
-clean::
-	-del genDate.exe genDate.com
-	-del c0x32.dll
-	-del c0x32.lib
-	-del buildDate.h
-	-del $(PROJECT)
-	-del install_vdb.do.exe
-	-del stx.lib
-	-del stx.dll
-	-del $(RT_DLL)
-	-del $(REQUIRED_FILES)
-	-del main.c
-	-del *.log
-	-del *.$(RES)
-	-rmdir /S /Q resources
-	-rmdir /S /Q $(OBJDIR)
-
-clobber:: clean
-	-del *.dll *.exe *.com
-
-postBuildCleanup::
-	@rem  stupid win-make does not allow empty
-
-# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(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
-
-# **Must be at end**
-
-# Enforce recompilation of package definition class if Mercurial working
-# copy state changes. Together with --guessVersion it ensures that package
-# definition class always contains correct binary revision string.
-!IFDEF HGROOT
-$(OUTDIR)jv_vdb_application.$(O): $(HGROOT)\.hg\dirstate
-!ENDIF
+# $Header$
+#
+# DO NOT EDIT 
+# automagically generated from the projectDefinition: jv_vdb_application.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# Historic Note:
+#  this used to contain only rules to make with borland 
+#    (called via bmake, by "make.exe -f bc.mak")
+#  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)\..
+
+# An old file, used as a dummy target for FORCE if we do not want
+#   re-make libraries. Windows make does not work if we redefine FORCE=   (empty string)
+# OLD_FILE=bmake.bat
+OLD_FILE="c:\windows\win.ini"
+
+#dummy target to force a build
+!ifndef FORCE
+FORCE=$(OLD_FILE)
+!endif
+
+CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
+ -DSTARTUP_CLASS="\"VDBStartup\"" \
+ -DSTARTUP_SELECTOR="\"start\"" \
+ -DUSE_MODULE_TABLE
+
+#
+
+!INCLUDE $(TOP)\rules\stdHeader_bc
+!INCLUDE Make.spec
+
+OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
+
+
+
+#
+APPNAME=libjv_vdb_application
+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 -I$(INCLUDE_TOP)\stx\libtool
+LOCALDEFINES=
+GLOBALDEFINES=
+
+STCLOCALOPT='-package=$(PACKAGE)' $(LOCALDEFINES) $(LOCALINCLUDES)  $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMFLAG) -varPrefix=$(LIBNAME)
+
+LFLAGS=$(APP_LFLAGS)
+
+PROJECT_NOCONSOLE= vdb.exe
+PROJECT_CONSOLE= vdb.com
+ALLOBJFILES= main.$(O)
+!ifdef USETCC
+RESFILES=
+!else
+RESFILES= jv_vdb_applicationWINrc.$(RES)
+!endif
+
+ALLOBJ= $(ALLOBJFILES) $(OBJS)
+DEFFILE=$(TOP)\rules\bc_exe.def
+
+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_libbasic2.dll \
+ libstx_libcomp.dll \
+ libstx_goodies_refactoryBrowser_parser.dll \
+ libstx_libbasic3.dll \
+ libstx_libview.dll \
+ libstx_libui.dll \
+ libstx_libview2.dll \
+ libstx_libwidg.dll \
+ libstx_goodies_magritte.dll \
+ libstx_libhtml.dll \
+ libstx_libwidg2.dll \
+ libstx_libcompat.dll \
+ libstx_libtool.dll \
+ libstx_goodies_xml_vw.dll \
+ libjv_libgdbs.dll \
+ libstx_libtool2.dll \
+ libjv_vdb.dll \
+
+
+REQUIRED_FILES=$(RT_DLL) $(X11_DLL) $(XEXT_DLL) symbols.stc $(REQUIRED_LIBS)
+
+SUBPROJECT_LIBS=
+
+
+REQUIRED_SUPPORT_DIRS=RESOURCEFILES
+
+target: ALL postBuildCleanup 
+
+# the executable, all required files and a self-installing-installer-exe
+ALL:: prereq ALL_NP
+
+# all, but no prereqs
+ALL_NP:: exe $(REQUIRED_SUPPORT_DIRS) postBuildCleanup subProjects
+
+exe:  newBuildDate $(REQUIRED_LIBS) noConsoleApp consoleApp registerApplication
+
+# the executable only
+# with console
+consoleApp: $(REQUIRED_LIBS)
+	-del main.$(O)
+	$(MAKE) -N -f bc.mak $(USE_ARG) \
+		MAKE_BAT=$(MAKE_BAT) \
+		PROJECT=$(PROJECT_CONSOLE) \
+		CFLAGS_APPTYPE=" -DWIN32GUI $(CFLAGS_CONSOLE)" \
+		LFLAGS_APPTYPE=" $(LFLAGS_CONSOLE)" \
+		CRT_STARTUP=" $(CRT_STARTUP_CONSOLE)" theExe
+
+# without console
+noConsoleApp: $(REQUIRED_LIBS)
+	-del main.$(O)
+	$(MAKE) -N -f bc.mak $(USE_ARG) \
+		MAKE_BAT=$(MAKE_BAT) \
+		PROJECT=$(PROJECT_NOCONSOLE) \
+		CFLAGS_APPTYPE=" -DWIN32GUI $(CFLAGS_NOCONSOLE) -DWIN_LOGFILE="\\"\"vdb.do.log\\"\""" \
+		LFLAGS_APPTYPE=" $(LFLAGS_NOCONSOLE)" \
+		CRT_STARTUP=" $(CRT_STARTUP_NOCONSOLE)" theExe
+
+# the executable only (internal target; needs some defines)
+theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT) 
+
+# build all mandatory prerequisite packages (containing superclasses) for this package
+prereq:
+	$(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___VM_DebuggerSetup64 application.nsi
+        
+
+!else
+
+setup: $(PROJECT) postBuildCleanup application.nsi
+	$(MAKENSIS) /DOBJ_DIR=objbc /DSETUP_NAME=Visual___VM_DebuggerSetup application.nsi
+        
+
+!endif
+
+newBuildDate:
+	del buildDate.h
+
+new:
+	$(MAKE_BAT) clean
+	$(MAKE_BAT)
+
+RESOURCEFILES: vdb.do_RESOURCES vdb.do_BITMAPS  \
+	stx_RESOURCES stx_STYLES stx_BITMAPS
+
+
+vdb.do_RESOURCES: resources\jv\vdb\application\NUL
+	-copy ..\resources\*.rs resources\jv\vdb\application\..
+	-copy ..\resources\*.style resources\jv\vdb\application\..
+
+vdb.do_BITMAPS: resources\jv\vdb\application\bitmaps\NUL
+	-copy *.ico resources\jv\vdb\application\bitmaps
+	-copy *.gif resources\jv\vdb\application\bitmaps
+
+resources\jv\vdb\application\bitmaps\NUL: resources\jv\vdb\application\NUL
+	mkdir resources\jv\vdb\application\bitmaps
+
+resources\jv\vdb\application\NUL: resources\jv\vdb\NUL
+	mkdir resources\jv\vdb\application
+
+resources\jv\vdb\NUL: resources\jv\NUL
+	mkdir resources\jv\vdb
+resources\jv\NUL: resources\NUL
+	mkdir resources\jv
+
+
+
+stx_RESOURCES: \
+	keyboard.rc \
+	keyboardMacros.rc \
+	host.rc \
+	h_win32.rc \
+	display.rc \
+	d_win32.rc \
+	libbasic_RESOURCES \
+	libview_RESOURCES \
+	libtool_RESOURCES  \
+	libtool2_RESOURCES
+
+
+keyboard.rc: $(TOP)\projects\smalltalk\keyboard.rc
+	copy $(TOP)\projects\smalltalk\keyboard.rc *.*
+
+keyboardMacros.rc: $(TOP)\projects\smalltalk\keyboardMacros.rc
+	copy $(TOP)\projects\smalltalk\keyboardMacros.rc *.*
+
+host.rc: $(TOP)\projects\smalltalk\host.rc
+	copy $(TOP)\projects\smalltalk\host.rc *.*
+
+h_win32.rc: $(TOP)\projects\smalltalk\h_win32.rc
+	copy $(TOP)\projects\smalltalk\h_win32.rc *.*
+
+display.rc: $(TOP)\projects\smalltalk\display.rc
+	copy $(TOP)\projects\smalltalk\display.rc *.*
+
+d_win32.rc: $(TOP)\projects\smalltalk\d_win32.rc
+	copy $(TOP)\projects\smalltalk\d_win32.rc *.*
+
+stx_STYLES: resources\stx\libview\NUL resources\stx\libview\styles\NUL
+	-copy $(TOP)\libview\styles\*.style resources\stx\libview\styles\*.*
+	-copy $(TOP)\libview\styles\*.common resources\stx\libview\styles\*.*
+
+stx_BITMAPS: \
+	libwidg_BITMAPS
+
+libwidg_BITMAPS: resources\stx\libwidg\bitmaps\NUL
+	-copy $(TOP)\libwidg\bitmaps\*.xpm resources\stx\libwidg\bitmaps\*.*
+
+libbasic_RESOURCES: resources\stx\libbasic\NUL
+	-copy $(TOP)\libbasic\resources\*.rs resources\stx\libbasic\*.*
+
+libtool_RESOURCES: resources\stx\libtool\NUL
+	-copy $(TOP)\libtool\resources\*.rs resources\stx\libtool\*.*
+
+libtool2_RESOURCES: resources\stx\libtool2\NUL
+	-copy $(TOP)\libtool2\resources\*.rs resources\stx\libtool2\*.*
+
+libview_RESOURCES: resources\stx\libview\NUL 
+	-copy $(TOP)\libview\resources\*.rs resources\stx\libview\*.*
+
+libview2_RESOURCES: resources\stx\libview2\NUL
+	-copy $(TOP)\libview2\resources\*.rs resources\stx\libview2\*.*
+
+resources\stx\libbasic\NUL: resources\stx\NUL
+	mkdir resources\stx\libbasic
+
+resources\stx\libtool\NUL: resources\stx\NUL
+	mkdir resources\stx\libtool
+
+resources\stx\libtool2\NUL: resources\stx\NUL
+	mkdir resources\stx\libtool2
+
+resources\stx\libview\NUL: resources\stx\NUL
+	mkdir resources\stx\libview
+
+resources\stx\libview\styles\NUL: resources\stx\libview\NUL
+	mkdir resources\stx\libview\styles
+
+resources\stx\libview2\NUL: resources\stx\NUL
+	mkdir resources\stx\libview2
+
+resources\stx\libwidg\bitmaps\NUL: resources\stx\libwidg\NUL
+	mkdir resources\stx\libwidg\bitmaps
+
+resources\stx\libwidg\NUL: resources\stx\NUL
+	mkdir resources\stx\libwidg
+
+resources\stx\NUL: resources\NUL
+	mkdir resources\stx
+
+resources\NUL:
+	mkdir resources
+
+bitmaps\NUL:
+	mkdir bitmaps
+
+doc\NUL:
+	mkdir doc
+
+
+
+
+
+
+libstx_libbasic.dll: ..\..\..\stx\libbasic\$(OBJDIR)\libstx_libbasic.dll
+	copy ..\..\..\stx\libbasic\$(OBJDIR)\libstx_libbasic.dll *.*
+
+..\..\..\stx\libbasic\$(OBJDIR)\libstx_libbasic.dll: $(FORCE)
+	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_libbasic2.dll: ..\..\..\stx\libbasic2\$(OBJDIR)\libstx_libbasic2.dll
+	copy ..\..\..\stx\libbasic2\$(OBJDIR)\libstx_libbasic2.dll *.*
+
+..\..\..\stx\libbasic2\$(OBJDIR)\libstx_libbasic2.dll: $(FORCE)
+	pushd ..\..\..\stx\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libcomp.dll: ..\..\..\stx\libcomp\$(OBJDIR)\libstx_libcomp.dll
+	copy ..\..\..\stx\libcomp\$(OBJDIR)\libstx_libcomp.dll *.*
+
+..\..\..\stx\libcomp\$(OBJDIR)\libstx_libcomp.dll: $(FORCE)
+	pushd ..\..\..\stx\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_goodies_refactoryBrowser_parser.dll: ..\..\..\stx\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll
+	copy ..\..\..\stx\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll *.*
+
+..\..\..\stx\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll: $(FORCE)
+	pushd ..\..\..\stx\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libbasic3.dll: ..\..\..\stx\libbasic3\$(OBJDIR)\libstx_libbasic3.dll
+	copy ..\..\..\stx\libbasic3\$(OBJDIR)\libstx_libbasic3.dll *.*
+
+..\..\..\stx\libbasic3\$(OBJDIR)\libstx_libbasic3.dll: $(FORCE)
+	pushd ..\..\..\stx\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_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) "
+
+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) "
+
+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) "
+
+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) "
+
+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) "
+
+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) "
+
+libstx_libcompat.dll: ..\..\..\stx\libcompat\$(OBJDIR)\libstx_libcompat.dll
+	copy ..\..\..\stx\libcompat\$(OBJDIR)\libstx_libcompat.dll *.*
+
+..\..\..\stx\libcompat\$(OBJDIR)\libstx_libcompat.dll: $(FORCE)
+	pushd ..\..\..\stx\libcompat & $(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) "
+
+libstx_goodies_xml_vw.dll: ..\..\..\stx\goodies\xml\vw\$(OBJDIR)\libstx_goodies_xml_vw.dll
+	copy ..\..\..\stx\goodies\xml\vw\$(OBJDIR)\libstx_goodies_xml_vw.dll *.*
+
+..\..\..\stx\goodies\xml\vw\$(OBJDIR)\libstx_goodies_xml_vw.dll: $(FORCE)
+	pushd ..\..\..\stx\goodies\xml\vw & $(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_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) "
+
+libjv_vdb.dll: ..\$(OBJDIR)\libjv_vdb.dll
+	copy ..\$(OBJDIR)\libjv_vdb.dll *.*
+
+..\$(OBJDIR)\libjv_vdb.dll: $(FORCE)
+	pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+      
+
+
+sources\NUL: 
+	mkdir sources
+
+show:
+	@echo LFLAGS= $(LFLAGS)
+	@echo ALLOBJ= $(ALLOBJ)
+	@echo PROJECT= $(PROJECT)
+	@echo APP_IMPORTLIBS= $(APP_IMPORTLIBS)
+	@echo ALLLIB= $(ALLLIB)
+	@echo DEFFILE= $(DEFFILE)
+	@echo ALLRES= $(ALLRES)
+
+!ifdef USEBC
+
+$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ), $(PROJECT_CONSOLE),, $(ALLLIB), $(DEFFILE), $(RESFILES)
+
+$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ), $(PROJECT_NOCONSOLE),, $(ALLLIB), $(DEFFILE), $(RESFILES)
+
+!else
+! ifdef USEVC
+
+$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) /OUT:"$(PROJECT_CONSOLE)" \
+	    /MANIFEST /MANIFESTFILE:"$(PROJECT_CONSOLE).manifest" \
+	    /PDB:"$(PROJECT_CONSOLE).pdb" \
+	    /SUBSYSTEM:CONSOLE $(ALLLIB) $(RESFILES)
+
+$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) /OUT:"$(PROJECT_NOCONSOLE)" \
+	    /MANIFEST /MANIFESTFILE:"$(PROJECT_NOCONSOLE).manifest" \
+	    /PDB:"$(PROJECT_NOCONSOLE).pdb" \
+	    /SUBSYSTEM:WINDOWS $(ALLLIB) $(RESFILES)
+
+! else
+!  ifdef USELCC
+
+$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+	$(APP_LINKER) -subsystem console $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_CONSOLE)" $(ALLLIB) $(RESFILES)
+
+$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+	$(APP_LINKER) -subsystem windows $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_NOCONSOLE)" $(ALLLIB) $(RESFILES)
+
+!  else
+!   ifdef USETCC
+
+$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_CONSOLE)" $(ALLLIB) $(RESFILES)
+
+$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_NOCONSOLE)" $(ALLLIB) $(RESFILES)
+
+!   else
+!    if defined(USEMINGW32) || defined(USEMINGW64)
+
+$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES) show
+	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_CONSOLE)" $(ALLLIB) $(RESFILES)
+
+$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES) show
+	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_NOCONSOLE)" $(ALLLIB) $(APP_IMPORTLIBS) $(RESFILES)
+
+!    else
+error error error
+!    endif
+!   endif
+!  endif
+! endif
+!endif
+
+!INCLUDE $(TOP)\rules\stdRules_bc
+
+#
+# additional rules
+#
+vdb.doWin.$(RES): vdb.doWin.rc vdb.do.ico
+
+main.$(O): buildDate.h main.c bc.mak
+
+main.c: $(TOP)\librun\main.c
+	copy $(TOP)\librun\main.c main.c
+
+# now in stdRules.
+#buildDate.h: $(GENDATE_UTILITIY)
+#        $(GENDATE_UTILITIY)
+
+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)
+
+X11.dll: $(TOP)\support\win32\X11.dll
+	copy $(TOP)\support\win32\X11.dll X11.dll
+
+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
+
+
+
+
+
+clean::
+	-del genDate.exe genDate.com
+	-del c0x32.dll
+	-del c0x32.lib
+	-del buildDate.h
+	-del $(PROJECT)
+	-del install_vdb.do.exe
+	-del stx.lib
+	-del stx.dll
+	-del $(RT_DLL)
+	-del $(REQUIRED_FILES)
+	-del main.c
+	-del *.log
+	-del *.$(RES)
+	-rmdir /S /Q resources
+	-rmdir /S /Q $(OBJDIR)
+
+clobber:: clean
+	-del *.dll *.exe *.com
+
+postBuildCleanup::
+	@rem  stupid win-make does not allow empty
+
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(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
+
+# **Must be at end**
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+!IFDEF HGROOT
+$(OUTDIR)jv_vdb_application.$(O): $(HGROOT)\.hg\dirstate
+!ENDIF
--- a/application/bmake.bat	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/bmake.bat	Mon Apr 09 21:43:54 2018 +0100
@@ -1,14 +1,14 @@
-@REM -------
-@REM make using Borland bcc32
-@REM type bmake, and wait...
-@REM do not edit - automatically generated from ProjectDefinition
-@REM -------
-@SET DEFINES=
-
-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
-
-
+@REM -------
+@REM make using Borland bcc32
+@REM type bmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+@SET DEFINES=
+
+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	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/builder/baseline.rbspec	Mon Apr 09 21:43:54 2018 +0100
@@ -1,44 +1,44 @@
-
-# generated from project definition
-
-# load package dependencies
-load 'package.deps.rake'
-
-# kludge: clear some invalid dependencies of libwidg
-# (should be fixed in baseline)
-clear "stx:libwidg" => "stx:libui"
-clear "stx:libwidg2" => "stx:libui"
-
-project :'vdb.do:baseline' do
-  # preamble
-  
-  # --------
-
-  package "stx:libbasic"
-  package "stx:goodies/announcements"
-  package "stx:libbasic2"
-  package "stx:libcomp"
-  package "stx:goodies/refactoryBrowser/parser"
-  package "stx:libbasic3"
-  package "stx:libview"
-  package "stx:libui"
-  package "stx:libview2"
-  package "stx:libwidg"
-  package "stx:goodies/magritte"
-  package "stx:libhtml"
-  package "stx:libwidg2"
-  package "stx:libcompat"
-  package "stx:libtool"
-  package "stx:goodies/xml/vw"
-  package "jv:libgdbs"
-  package "stx:libtool2"
-  package "jv:vdb"
-
-
-  application "jv:vdb/application"
-
-  # postamble
-  
-  # ---------
-
-end
+
+# generated from project definition
+
+# load package dependencies
+load 'package.deps.rake'
+
+# kludge: clear some invalid dependencies of libwidg
+# (should be fixed in baseline)
+clear "stx:libwidg" => "stx:libui"
+clear "stx:libwidg2" => "stx:libui"
+
+project :'vdb.do:baseline' do
+  # preamble
+  
+  # --------
+
+  package "stx:libbasic"
+  package "stx:goodies/announcements"
+  package "stx:libbasic2"
+  package "stx:libcomp"
+  package "stx:goodies/refactoryBrowser/parser"
+  package "stx:libbasic3"
+  package "stx:libview"
+  package "stx:libui"
+  package "stx:libview2"
+  package "stx:libwidg"
+  package "stx:goodies/magritte"
+  package "stx:libhtml"
+  package "stx:libwidg2"
+  package "stx:libcompat"
+  package "stx:libtool"
+  package "stx:goodies/xml/vw"
+  package "jv:libgdbs"
+  package "stx:libtool2"
+  package "jv:vdb"
+
+
+  application "jv:vdb/application"
+
+  # postamble
+  
+  # ---------
+
+end
--- a/application/builder/package.deps.rake	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/builder/package.deps.rake	Mon Apr 09 21:43:54 2018 +0100
@@ -1,98 +1,98 @@
-
-# Package dependencies.
-# Automatically generated by project defintion.
-
-task "jv:libgdbs" => "stx:goodies/announcements"
-task "jv:libgdbs" => "stx:goodies/magritte"
-task "jv:libgdbs" => "stx:libbasic"
-
-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 "stx:goodies/announcements" => "stx:libbasic"
-
-
-task "stx:goodies/refactoryBrowser/parser" => "stx:libbasic"
-
-task "stx:goodies/xml/vw" => "stx:libbasic"
-
-
-task "stx:libbasic2" => "stx:libbasic"
-
-task "stx:libbasic3" => "stx:libbasic"
-
-task "stx:libcomp" => "stx:libbasic"
-
-task "stx:libcompat" => "stx:libbasic"
-task "stx:libcompat" => "stx:libbasic2"
-task "stx:libcompat" => "stx:libbasic3"
-task "stx:libcompat" => "stx:libview"
-task "stx:libcompat" => "stx:libview2"
-task "stx:libcompat" => "stx:libwidg"
-task "stx:libcompat" => "stx:libwidg2"
-
-task "stx:libhtml" => "stx:libbasic"
-task "stx:libhtml" => "stx:libview"
-task "stx:libhtml" => "stx:libwidg"
-
-task "stx:libtool" => "stx:goodies/refactoryBrowser/parser"
-task "stx:libtool" => "stx:libbasic"
-task "stx:libtool" => "stx:libbasic2"
-task "stx:libtool" => "stx:libbasic3"
-task "stx:libtool" => "stx:libcomp"
-task "stx:libtool" => "stx:libui"
-task "stx:libtool" => "stx:libview"
-task "stx:libtool" => "stx:libview2"
-task "stx:libtool" => "stx:libwidg"
-task "stx:libtool" => "stx:libwidg2"
-
-task "stx: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:libui" => "stx:libbasic"
-
-task "stx:libview" => "stx:libbasic"
-
-task "stx:libview2" => "stx:libbasic"
-task "stx:libview2" => "stx:libbasic2"
-task "stx:libview2" => "stx:libview"
-
-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/xml/vw"
-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:libcompat"
-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"
-
-
+
+# Package dependencies.
+# Automatically generated by project defintion.
+
+task "jv:libgdbs" => "stx:goodies/announcements"
+task "jv:libgdbs" => "stx:goodies/magritte"
+task "jv:libgdbs" => "stx:libbasic"
+
+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 "stx:goodies/announcements" => "stx:libbasic"
+
+
+task "stx:goodies/refactoryBrowser/parser" => "stx:libbasic"
+
+task "stx:goodies/xml/vw" => "stx:libbasic"
+
+
+task "stx:libbasic2" => "stx:libbasic"
+
+task "stx:libbasic3" => "stx:libbasic"
+
+task "stx:libcomp" => "stx:libbasic"
+
+task "stx:libcompat" => "stx:libbasic"
+task "stx:libcompat" => "stx:libbasic2"
+task "stx:libcompat" => "stx:libbasic3"
+task "stx:libcompat" => "stx:libview"
+task "stx:libcompat" => "stx:libview2"
+task "stx:libcompat" => "stx:libwidg"
+task "stx:libcompat" => "stx:libwidg2"
+
+task "stx:libhtml" => "stx:libbasic"
+task "stx:libhtml" => "stx:libview"
+task "stx:libhtml" => "stx:libwidg"
+
+task "stx:libtool" => "stx:goodies/refactoryBrowser/parser"
+task "stx:libtool" => "stx:libbasic"
+task "stx:libtool" => "stx:libbasic2"
+task "stx:libtool" => "stx:libbasic3"
+task "stx:libtool" => "stx:libcomp"
+task "stx:libtool" => "stx:libui"
+task "stx:libtool" => "stx:libview"
+task "stx:libtool" => "stx:libview2"
+task "stx:libtool" => "stx:libwidg"
+task "stx:libtool" => "stx:libwidg2"
+
+task "stx: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:libui" => "stx:libbasic"
+
+task "stx:libview" => "stx:libbasic"
+
+task "stx:libview2" => "stx:libbasic"
+task "stx:libview2" => "stx:libbasic2"
+task "stx:libview2" => "stx:libview"
+
+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/xml/vw"
+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:libcompat"
+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"
+
+
--- a/application/mingwmake.bat	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/mingwmake.bat	Mon Apr 09 21:43:54 2018 +0100
@@ -1,22 +1,22 @@
-@REM -------
-@REM make using mingw gnu compiler
-@REM type mingwmake, and wait...
-@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%"
-
-@pushd ..\..\..\stx\rules
-@call find_mingw.bat
-@popd
-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
-
-
-
+@REM -------
+@REM make using mingw gnu compiler
+@REM type mingwmake, and wait...
+@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%"
+
+@pushd ..\..\..\stx\rules
+@call find_mingw.bat
+@popd
+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.c	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/modules.c	Mon Apr 09 21:43:54 2018 +0100
@@ -1,22 +1,22 @@
-/* $Header$
- *
- * DO NOT EDIT 
- * automagically generated from the projectDefinition: jv_vdb_application.
- *
- * Warning: once you modify this file, do not rerun
- * stmkmp or projectDefinition-build again - otherwise, your changes are lost.
- */
-typedef void (*vf)();
-
-extern void _VDBStartup_Init();
-extern void _jv_137vdb_137application_Init();
-
-
-static vf modules[] = {
-    _VDBStartup_Init,
-_jv_137vdb_137application_Init,
-
-    (vf)0
-};
-
-vf *__modules__ = modules;
+/* $Header$
+ *
+ * DO NOT EDIT 
+ * automagically generated from the projectDefinition: jv_vdb_application.
+ *
+ * Warning: once you modify this file, do not rerun
+ * stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+ */
+typedef void (*vf)();
+
+extern void _VDBStartup_Init();
+extern void _jv_137vdb_137application_Init();
+
+
+static vf modules[] = {
+    _VDBStartup_Init,
+_jv_137vdb_137application_Init,
+
+    (vf)0
+};
+
+vf *__modules__ = modules;
--- a/application/modules.stx	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/modules.stx	Mon Apr 09 21:43:54 2018 +0100
@@ -1,37 +1,37 @@
-# $Header$
-#
-# DO NOT EDIT 
-# automagically generated from the projectDefinition: jv_vdb_application.
-#
-# Warning: once you modify this file, do not rerun
-# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
-#
-# This file is (currently) only used with win-95 / win-NT versions of STX.
-# It lists the dll's which are to be loaded at startup time.
-# Notice, lines starting with a "#" are comments.
-# Lines starting with a "*" are treated as comments by the VM, but are usually loaded
-# by the application at the very beginning.
-#
-# All classes loaded at startup time will be present as precompiled classes.
-# Others might be autoloaded or loaded explicit using "Smalltalk loadPackage:xxx".
-#
-libstx_libbasic
-libstx_goodies_announcements
-libstx_libbasic2
-libstx_libcomp
-libstx_goodies_refactoryBrowser_parser
-libstx_libbasic3
-libstx_libview
-libstx_libui
-libstx_libview2
-libstx_libwidg
-libstx_goodies_magritte
-libstx_libhtml
-libstx_libwidg2
-libstx_libcompat
-libstx_libtool
-libstx_goodies_xml_vw
-libjv_libgdbs
-libstx_libtool2
-libjv_vdb
-
+# $Header$
+#
+# DO NOT EDIT 
+# automagically generated from the projectDefinition: jv_vdb_application.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# This file is (currently) only used with win-95 / win-NT versions of STX.
+# It lists the dll's which are to be loaded at startup time.
+# Notice, lines starting with a "#" are comments.
+# Lines starting with a "*" are treated as comments by the VM, but are usually loaded
+# by the application at the very beginning.
+#
+# All classes loaded at startup time will be present as precompiled classes.
+# Others might be autoloaded or loaded explicit using "Smalltalk loadPackage:xxx".
+#
+libstx_libbasic
+libstx_goodies_announcements
+libstx_libbasic2
+libstx_libcomp
+libstx_goodies_refactoryBrowser_parser
+libstx_libbasic3
+libstx_libview
+libstx_libui
+libstx_libview2
+libstx_libwidg
+libstx_goodies_magritte
+libstx_libhtml
+libstx_libwidg2
+libstx_libcompat
+libstx_libtool
+libstx_goodies_xml_vw
+libjv_libgdbs
+libstx_libtool2
+libjv_vdb
+
--- a/application/osx/Info.plist	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/osx/Info.plist	Mon Apr 09 21:43:54 2018 +0100
@@ -1,22 +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>CFBundlePackageType</key>
-<string>APPL</string>
-<key>CFBundleExecutable</key>
-<string>vdb.do</string>
-<key>CFBundleShortVersionString</key>
-<string>8.0.32767.32767</string>
-<key>CFBundleName</key>
-<string>vdb.do</string>
-<key>CFBundleInfoDictionaryVersion</key>
-<string>6.0</string>
-<key>LSMinimumSystemVersion</key>
-<string>10.6</string>
-<key>CFBundleIdentifier</key>
-<string>jv.vdb</string>
-<key>CFBundleVersion</key>
-<string>8.0.32767.32767</string>
-</dict>
-</plist>
+<?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>CFBundlePackageType</key>
+<string>APPL</string>
+<key>CFBundleExecutable</key>
+<string>vdb.do</string>
+<key>CFBundleShortVersionString</key>
+<string>8.0.32767.32767</string>
+<key>CFBundleName</key>
+<string>vdb.do</string>
+<key>CFBundleInfoDictionaryVersion</key>
+<string>6.0</string>
+<key>LSMinimumSystemVersion</key>
+<string>10.6</string>
+<key>CFBundleIdentifier</key>
+<string>jv.vdb</string>
+<key>CFBundleVersion</key>
+<string>8.0.32767.32767</string>
+</dict>
+</plist>
--- a/application/vcmake.bat	Wed Apr 04 23:16:30 2018 +0100
+++ b/application/vcmake.bat	Mon Apr 09 21:43:54 2018 +0100
@@ -1,26 +1,26 @@
-@REM -------
-@REM make using Microsoft Visual C compiler
-@REM type vcmake, and wait...
-@REM do not edit - automatically generated from ProjectDefinition
-@REM -------
-
-@if not defined VSINSTALLDIR (
-    pushd ..\..\..\stx\rules
-    call vcsetup.bat
-    popd
-)
-@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 -DUSEVC=1 %DEFINES% %*
-
-
-@IF "%1" EQU "exe" exit /b 0
-@IF "%1" EQU "setup" exit /b 0
-@IF "%1" EQU "pluginSetup" exit /b 0
-
-
-
+@REM -------
+@REM make using Microsoft Visual C compiler
+@REM type vcmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+
+@if not defined VSINSTALLDIR (
+    pushd ..\..\..\stx\rules
+    call vcsetup.bat
+    popd
+)
+@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 -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	Wed Apr 04 23:16:30 2018 +0100
+++ b/bc.mak	Mon Apr 09 21:43:54 2018 +0100
@@ -1,120 +1,120 @@
-# $Header$
-#
-# DO NOT EDIT
-# automagically generated from the projectDefinition: jv_vdb.
-#
-# Warning: once you modify this file, do not rerun
-# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
-#
-# Notice, that the name bc.mak is historical (from times, when only borland c was supported).
-# This file contains make rules for the win32 platform using either borland-bcc or visual-c.
-# It shares common definitions with the unix-make in Make.spec.
-# The bc.mak supports the following targets:
-#    bmake         - compile all st-files to a classLib (dll)
-#    bmake clean   - clean all temp files
-#    bmake clobber - clean all
-#
-# Historic Note:
-#  this used to contain only rules to make with borland
-#    (called via bmake, by "make.exe -f bc.mak")
-#  this has changed; it is now also possible to build using microsoft visual c
-#    (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
-#
-TOP=..\..\stx
-INCLUDE_TOP=$(TOP)\..
-
-
-
-!INCLUDE $(TOP)\rules\stdHeader_bc
-
-!INCLUDE Make.spec
-
-LIBNAME=libjv_vdb
-MODULE_PATH=vdb
-RESFILES=jv_vdbWINrc.$(RES)
-
-
-
-LOCALINCLUDES= -I$(INCLUDE_TOP)\jv\libgdbs -I$(INCLUDE_TOP)\stx\goodies\xml\vw -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
-LOCALDEFINES=
-
-STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
-LOCALLIBS=
-
-OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
-
-ALL::  classLibRule
-
-classLibRule: $(OUTDIR) $(OUTDIR)$(LIBNAME).dll
-
-!INCLUDE $(TOP)\rules\stdRules_bc
-
-# 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\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\stx\libview2 & $(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) "
-
-
-
-
-
-
-
-test: $(TOP)\goodies\builder\reports\NUL
-	pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
-	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
-        
-clean::
-	-del *.$(CSUFFIX)
-
-
-# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(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)VDBAbstractPresenter.$(O) VDBAbstractPresenter.$(C) VDBAbstractPresenter.$(H): VDBAbstractPresenter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBEvaluator.$(O) VDBEvaluator.$(C) VDBEvaluator.$(H): VDBEvaluator.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)VDBIconLibrary.$(O) VDBIconLibrary.$(C) VDBIconLibrary.$(H): VDBIconLibrary.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)VDBVirtualMemoryMap.$(O) VDBVirtualMemoryMap.$(C) VDBVirtualMemoryMap.$(H): VDBVirtualMemoryMap.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)VDBVirtualMemoryRegion.$(O) VDBVirtualMemoryRegion.$(C) VDBVirtualMemoryRegion.$(H): VDBVirtualMemoryRegion.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)VDBWindowsDebuggerConsoleView.$(O) VDBWindowsDebuggerConsoleView.$(C) VDBWindowsDebuggerConsoleView.$(H): VDBWindowsDebuggerConsoleView.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)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)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)VDBAbstractUnixConsoleApplication.$(O) VDBAbstractUnixConsoleApplication.$(C) VDBAbstractUnixConsoleApplication.$(H): VDBAbstractUnixConsoleApplication.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)VDBBreakpointApplication.$(O) VDBBreakpointApplication.$(C) VDBBreakpointApplication.$(H): VDBBreakpointApplication.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)VDBBreakpointPresenter.$(O) VDBBreakpointPresenter.$(C) VDBBreakpointPresenter.$(H): VDBBreakpointPresenter.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(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)VDBFrameApplication.$(O) VDBFrameApplication.$(C) VDBFrameApplication.$(H): VDBFrameApplication.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\VDBAbstractPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBMemoryApplication.$(O) VDBMemoryApplication.$(C) VDBMemoryApplication.$(H): VDBMemoryApplication.st $(INCLUDE_TOP)\jv\libgdbs\GDBOutputFormats.$(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)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\VDBAbstractPresenter.$(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\VDBAbstractPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBVariableObjectPresenter.$(O) VDBVariableObjectPresenter.$(C) VDBVariableObjectPresenter.$(H): VDBVariableObjectPresenter.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
-$(OUTDIR)VDBWindowsDebuggerConsoleApplication.$(O) VDBWindowsDebuggerConsoleApplication.$(C) VDBWindowsDebuggerConsoleApplication.$(H): VDBWindowsDebuggerConsoleApplication.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)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)VDBBreakpointListApplication.$(O) VDBBreakpointListApplication.$(C) VDBBreakpointListApplication.$(H): VDBBreakpointListApplication.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.$(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)VDBUnixDebuggerConsoleApplication.$(O) VDBUnixDebuggerConsoleApplication.$(C) VDBUnixDebuggerConsoleApplication.$(H): VDBUnixDebuggerConsoleApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractUnixConsoleApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)VDBUnixInferiorConsoleApplication.$(O) VDBUnixInferiorConsoleApplication.$(C) VDBUnixInferiorConsoleApplication.$(H): VDBUnixInferiorConsoleApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractUnixConsoleApplication.$(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)
-$(OUTDIR)VDBVariableObjectListApplication.$(O) VDBVariableObjectListApplication.$(C) VDBVariableObjectListApplication.$(H): VDBVariableObjectListApplication.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)extensions.$(O): extensions.st $(INCLUDE_TOP)\jv\libgdbs\GDBDebuggerObject.$(H) $(INCLUDE_TOP)\jv\libgdbs\GDBObject.$(H) $(INCLUDE_TOP)\jv\libgdbs\GDBVariableObject.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-
-# ENDMAKEDEPEND --- do not remove this line
-
-# **Must be at end**
-
-# Enforce recompilation of package definition class if Mercurial working
-# copy state changes. Together with --guessVersion it ensures that package
-# definition class always contains correct binary revision string.
-!IFDEF HGROOT
-$(OUTDIR)jv_vdb.$(O): $(HGROOT)\.hg\dirstate
-!ENDIF
+# $Header$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: jv_vdb.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# Notice, that the name bc.mak is historical (from times, when only borland c was supported).
+# This file contains make rules for the win32 platform using either borland-bcc or visual-c.
+# It shares common definitions with the unix-make in Make.spec.
+# The bc.mak supports the following targets:
+#    bmake         - compile all st-files to a classLib (dll)
+#    bmake clean   - clean all temp files
+#    bmake clobber - clean all
+#
+# Historic Note:
+#  this used to contain only rules to make with borland
+#    (called via bmake, by "make.exe -f bc.mak")
+#  this has changed; it is now also possible to build using microsoft visual c
+#    (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
+#
+TOP=..\..\stx
+INCLUDE_TOP=$(TOP)\..
+
+
+
+!INCLUDE $(TOP)\rules\stdHeader_bc
+
+!INCLUDE Make.spec
+
+LIBNAME=libjv_vdb
+MODULE_PATH=vdb
+RESFILES=jv_vdbWINrc.$(RES)
+
+
+
+LOCALINCLUDES= -I$(INCLUDE_TOP)\jv\libgdbs -I$(INCLUDE_TOP)\stx\goodies\xml\vw -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
+LOCALDEFINES=
+
+STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
+LOCALLIBS=
+
+OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
+
+ALL::  classLibRule
+
+classLibRule: $(OUTDIR) $(OUTDIR)$(LIBNAME).dll
+
+!INCLUDE $(TOP)\rules\stdRules_bc
+
+# 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\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\stx\libview2 & $(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) "
+
+
+
+
+
+
+
+test: $(TOP)\goodies\builder\reports\NUL
+	pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
+	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
+        
+clean::
+	-del *.$(CSUFFIX)
+
+
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(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)VDBAbstractPresenter.$(O) VDBAbstractPresenter.$(C) VDBAbstractPresenter.$(H): VDBAbstractPresenter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBEvaluator.$(O) VDBEvaluator.$(C) VDBEvaluator.$(H): VDBEvaluator.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)VDBIconLibrary.$(O) VDBIconLibrary.$(C) VDBIconLibrary.$(H): VDBIconLibrary.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)VDBVirtualMemoryMap.$(O) VDBVirtualMemoryMap.$(C) VDBVirtualMemoryMap.$(H): VDBVirtualMemoryMap.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)VDBVirtualMemoryRegion.$(O) VDBVirtualMemoryRegion.$(C) VDBVirtualMemoryRegion.$(H): VDBVirtualMemoryRegion.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)VDBWindowsDebuggerConsoleView.$(O) VDBWindowsDebuggerConsoleView.$(C) VDBWindowsDebuggerConsoleView.$(H): VDBWindowsDebuggerConsoleView.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)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)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)VDBAbstractUnixConsoleApplication.$(O) VDBAbstractUnixConsoleApplication.$(C) VDBAbstractUnixConsoleApplication.$(H): VDBAbstractUnixConsoleApplication.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)VDBBreakpointApplication.$(O) VDBBreakpointApplication.$(C) VDBBreakpointApplication.$(H): VDBBreakpointApplication.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)VDBBreakpointPresenter.$(O) VDBBreakpointPresenter.$(C) VDBBreakpointPresenter.$(H): VDBBreakpointPresenter.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(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)VDBFrameApplication.$(O) VDBFrameApplication.$(C) VDBFrameApplication.$(H): VDBFrameApplication.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\VDBAbstractPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBMemoryApplication.$(O) VDBMemoryApplication.$(C) VDBMemoryApplication.$(H): VDBMemoryApplication.st $(INCLUDE_TOP)\jv\libgdbs\GDBOutputFormats.$(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)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\VDBAbstractPresenter.$(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\VDBAbstractPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBVariableObjectPresenter.$(O) VDBVariableObjectPresenter.$(C) VDBVariableObjectPresenter.$(H): VDBVariableObjectPresenter.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractPresenter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)VDBWindowsDebuggerConsoleApplication.$(O) VDBWindowsDebuggerConsoleApplication.$(C) VDBWindowsDebuggerConsoleApplication.$(H): VDBWindowsDebuggerConsoleApplication.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)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)VDBBreakpointListApplication.$(O) VDBBreakpointListApplication.$(C) VDBBreakpointListApplication.$(H): VDBBreakpointListApplication.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.$(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)VDBUnixDebuggerConsoleApplication.$(O) VDBUnixDebuggerConsoleApplication.$(C) VDBUnixDebuggerConsoleApplication.$(H): VDBUnixDebuggerConsoleApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractUnixConsoleApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)VDBUnixInferiorConsoleApplication.$(O) VDBUnixInferiorConsoleApplication.$(C) VDBUnixInferiorConsoleApplication.$(H): VDBUnixInferiorConsoleApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\jv\vdb\VDBAbstractUnixConsoleApplication.$(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)
+$(OUTDIR)VDBVariableObjectListApplication.$(O) VDBVariableObjectListApplication.$(C) VDBVariableObjectListApplication.$(H): VDBVariableObjectListApplication.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)extensions.$(O): extensions.st $(INCLUDE_TOP)\jv\libgdbs\GDBDebuggerObject.$(H) $(INCLUDE_TOP)\jv\libgdbs\GDBObject.$(H) $(INCLUDE_TOP)\jv\libgdbs\GDBVariableObject.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+
+# ENDMAKEDEPEND --- do not remove this line
+
+# **Must be at end**
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+!IFDEF HGROOT
+$(OUTDIR)jv_vdb.$(O): $(HGROOT)\.hg\dirstate
+!ENDIF
--- a/bmake.bat	Wed Apr 04 23:16:30 2018 +0100
+++ b/bmake.bat	Mon Apr 09 21:43:54 2018 +0100
@@ -1,15 +1,15 @@
-@REM -------
-@REM make using Borland bcc32
-@REM type bmake, and wait...
-@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% %*
-
-
-
-
+@REM -------
+@REM make using Borland bcc32
+@REM type bmake, and wait...
+@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% %*
+
+
+
+
--- a/libInit.cc	Wed Apr 04 23:16:30 2018 +0100
+++ b/libInit.cc	Mon Apr 09 21:43:54 2018 +0100
@@ -1,96 +1,96 @@
-/*
- * $Header$
- *
- * DO NOT EDIT
- * automagically generated from the projectDefinition: jv_vdb.
- */
-#define __INDIRECTVMINITCALLS__
-#include <stc.h>
-
-#ifdef WIN32
-# pragma codeseg INITCODE "INITCODE"
-#endif
-
-#if defined(INIT_TEXT_SECTION) || defined(DLL_EXPORT)
-DLL_EXPORT void _libjv_vdb_Init() INIT_TEXT_SECTION;
-DLL_EXPORT void _libjv_vdb_InitDefinition() INIT_TEXT_SECTION;
-#endif
-
-extern void _VDBAbstractApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBAbstractPresenter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBEvaluator_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBIconLibrary_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBVirtualMemoryMap_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBVirtualMemoryRegion_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBWindowsDebuggerConsoleView_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _jv_137vdb_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 _VDBAbstractUnixConsoleApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBBreakpointApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBBreakpointPresenter_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 _VDBFrameApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBFramePresenter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBMemoryApplication_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 _VDBVariableObjectPresenter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBWindowsDebuggerConsoleApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBAbstractTreeApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBBreakpointListApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBTabbingContainer_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBUnixDebuggerConsoleApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBUnixInferiorConsoleApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBStackApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-extern void _VDBVariableObjectListApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-
-extern void _jv_137vdb_extensions_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-
-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(int pass, struct __vmData__ *__pRT__, OBJ snd)
-{
-  __BEGIN_PACKAGE2__("libjv_vdb", _libjv_vdb_Init, "jv:vdb");
-    _VDBAbstractApplication_Init(pass,__pRT__,snd);
-    _VDBAbstractPresenter_Init(pass,__pRT__,snd);
-    _VDBEvaluator_Init(pass,__pRT__,snd);
-    _VDBIconLibrary_Init(pass,__pRT__,snd);
-    _VDBVirtualMemoryMap_Init(pass,__pRT__,snd);
-    _VDBVirtualMemoryRegion_Init(pass,__pRT__,snd);
-    _VDBWindowsDebuggerConsoleView_Init(pass,__pRT__,snd);
-    _jv_137vdb_Init(pass,__pRT__,snd);
-    _VDBAbstractContainer_Init(pass,__pRT__,snd);
-    _VDBAbstractListApplication_Init(pass,__pRT__,snd);
-    _VDBAbstractUnixConsoleApplication_Init(pass,__pRT__,snd);
-    _VDBBreakpointApplication_Init(pass,__pRT__,snd);
-    _VDBBreakpointPresenter_Init(pass,__pRT__,snd);
-    _VDBDebuggerApplication_Init(pass,__pRT__,snd);
-    _VDBEventLogApplication_Init(pass,__pRT__,snd);
-    _VDBFrameApplication_Init(pass,__pRT__,snd);
-    _VDBFramePresenter_Init(pass,__pRT__,snd);
-    _VDBMemoryApplication_Init(pass,__pRT__,snd);
-    _VDBSourceApplication_Init(pass,__pRT__,snd);
-    _VDBThreadGroupPresenter_Init(pass,__pRT__,snd);
-    _VDBThreadPresenter_Init(pass,__pRT__,snd);
-    _VDBVariableObjectPresenter_Init(pass,__pRT__,snd);
-    _VDBWindowsDebuggerConsoleApplication_Init(pass,__pRT__,snd);
-    _VDBAbstractTreeApplication_Init(pass,__pRT__,snd);
-    _VDBBreakpointListApplication_Init(pass,__pRT__,snd);
-    _VDBTabbingContainer_Init(pass,__pRT__,snd);
-    _VDBUnixDebuggerConsoleApplication_Init(pass,__pRT__,snd);
-    _VDBUnixInferiorConsoleApplication_Init(pass,__pRT__,snd);
-    _VDBStackApplication_Init(pass,__pRT__,snd);
-    _VDBVariableObjectListApplication_Init(pass,__pRT__,snd);
-
-    _jv_137vdb_extensions_Init(pass,__pRT__,snd);
-  __END_PACKAGE__();
-}
+/*
+ * $Header$
+ *
+ * DO NOT EDIT
+ * automagically generated from the projectDefinition: jv_vdb.
+ */
+#define __INDIRECTVMINITCALLS__
+#include <stc.h>
+
+#ifdef WIN32
+# pragma codeseg INITCODE "INITCODE"
+#endif
+
+#if defined(INIT_TEXT_SECTION) || defined(DLL_EXPORT)
+DLL_EXPORT void _libjv_vdb_Init() INIT_TEXT_SECTION;
+DLL_EXPORT void _libjv_vdb_InitDefinition() INIT_TEXT_SECTION;
+#endif
+
+extern void _VDBAbstractApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBAbstractPresenter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBEvaluator_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBIconLibrary_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBVirtualMemoryMap_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBVirtualMemoryRegion_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBWindowsDebuggerConsoleView_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _jv_137vdb_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 _VDBAbstractUnixConsoleApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBBreakpointApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBBreakpointPresenter_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 _VDBFrameApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBFramePresenter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBMemoryApplication_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 _VDBVariableObjectPresenter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBWindowsDebuggerConsoleApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBAbstractTreeApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBBreakpointListApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBTabbingContainer_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBUnixDebuggerConsoleApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBUnixInferiorConsoleApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBStackApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _VDBVariableObjectListApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+
+extern void _jv_137vdb_extensions_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+
+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(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+  __BEGIN_PACKAGE2__("libjv_vdb", _libjv_vdb_Init, "jv:vdb");
+    _VDBAbstractApplication_Init(pass,__pRT__,snd);
+    _VDBAbstractPresenter_Init(pass,__pRT__,snd);
+    _VDBEvaluator_Init(pass,__pRT__,snd);
+    _VDBIconLibrary_Init(pass,__pRT__,snd);
+    _VDBVirtualMemoryMap_Init(pass,__pRT__,snd);
+    _VDBVirtualMemoryRegion_Init(pass,__pRT__,snd);
+    _VDBWindowsDebuggerConsoleView_Init(pass,__pRT__,snd);
+    _jv_137vdb_Init(pass,__pRT__,snd);
+    _VDBAbstractContainer_Init(pass,__pRT__,snd);
+    _VDBAbstractListApplication_Init(pass,__pRT__,snd);
+    _VDBAbstractUnixConsoleApplication_Init(pass,__pRT__,snd);
+    _VDBBreakpointApplication_Init(pass,__pRT__,snd);
+    _VDBBreakpointPresenter_Init(pass,__pRT__,snd);
+    _VDBDebuggerApplication_Init(pass,__pRT__,snd);
+    _VDBEventLogApplication_Init(pass,__pRT__,snd);
+    _VDBFrameApplication_Init(pass,__pRT__,snd);
+    _VDBFramePresenter_Init(pass,__pRT__,snd);
+    _VDBMemoryApplication_Init(pass,__pRT__,snd);
+    _VDBSourceApplication_Init(pass,__pRT__,snd);
+    _VDBThreadGroupPresenter_Init(pass,__pRT__,snd);
+    _VDBThreadPresenter_Init(pass,__pRT__,snd);
+    _VDBVariableObjectPresenter_Init(pass,__pRT__,snd);
+    _VDBWindowsDebuggerConsoleApplication_Init(pass,__pRT__,snd);
+    _VDBAbstractTreeApplication_Init(pass,__pRT__,snd);
+    _VDBBreakpointListApplication_Init(pass,__pRT__,snd);
+    _VDBTabbingContainer_Init(pass,__pRT__,snd);
+    _VDBUnixDebuggerConsoleApplication_Init(pass,__pRT__,snd);
+    _VDBUnixInferiorConsoleApplication_Init(pass,__pRT__,snd);
+    _VDBStackApplication_Init(pass,__pRT__,snd);
+    _VDBVariableObjectListApplication_Init(pass,__pRT__,snd);
+
+    _jv_137vdb_extensions_Init(pass,__pRT__,snd);
+  __END_PACKAGE__();
+}
--- a/mingwmake.bat	Wed Apr 04 23:16:30 2018 +0100
+++ b/mingwmake.bat	Mon Apr 09 21:43:54 2018 +0100
@@ -1,18 +1,18 @@
-@REM -------
-@REM make using mingw gnu compiler
-@REM type mingwmake, and wait...
-@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%"
-
-@pushd ..\..\stx\rules
-@call find_mingw.bat
-@popd
-make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
-
-
-
-
+@REM -------
+@REM make using mingw gnu compiler
+@REM type mingwmake, and wait...
+@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%"
+
+@pushd ..\..\stx\rules
+@call find_mingw.bat
+@popd
+make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
+
+
+
+
--- a/tests/Make.proto	Wed Apr 04 23:16:30 2018 +0100
+++ b/tests/Make.proto	Mon Apr 09 21:43:54 2018 +0100
@@ -1,127 +1,127 @@
-# $Header$
-#
-# DO NOT EDIT
-# automagically generated from the projectDefinition: jv_vdb_tests.
-#
-# Warning: once you modify this file, do not rerun
-# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
-#
-# The Makefile as generated by this Make.proto supports the following targets:
-#    make         - compile all st-files to a classLib
-#    make clean   - clean all temp files
-#    make clobber - clean all
-#
-# This file contains definitions for Unix based platforms.
-# It shares common definitions with the win32-make in Make.spec.
-
-#
-# position (of this package) in directory hierarchy:
-# (must point to ST/X top directory, for tools and includes)
-TOP=../../../stx
-INCLUDE_TOP=$(TOP)/..
-
-# subdirectories where targets are to be made:
-SUBDIRS=
-
-
-# subdirectories where Makefiles are to be made:
-# (only define if different from SUBDIRS)
-# ALLSUBDIRS=
-
-REQUIRED_SUPPORT_DIRS=
-
-# if your embedded C code requires any system includes,
-# add the path(es) here:,
-# ********** OPTIONAL: MODIFY the next lines ***
-# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic
-
-
-# if you need any additional defines for embedded C code,
-# add them here:,
-# ********** OPTIONAL: MODIFY the next lines ***
-# LOCALDEFINES=-Dfoo -Dbar -DDEBUG
-LOCALDEFINES=
-
-LIBNAME=libjv_vdb_tests
-STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=.  -varPrefix=$(LIBNAME)
-
-
-# ********** OPTIONAL: MODIFY the next line ***
-# additional C-libraries that should be pre-linked with the class-objects
-LD_OBJ_LIBS=
-LOCAL_SHARED_LIBS=
-
-
-# ********** OPTIONAL: MODIFY the next line ***
-# additional C targets or libraries should be added below
-LOCAL_EXTRA_TARGETS=
-
-OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
-
-
-
-all:: preMake classLibRule postMake
-
-pre_objs::  
-
-
-
-
-
-
-# Enforce recompilation of package definition class if Mercurial working
-# copy state changes. Together with --guessVersion it ensures that package
-# definition class always contains correct binary revision string.
-ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
-jv_vdb_tests.$(O): $(shell hg root)/.hg/dirstate
-endif
-
-
-
-
-# run default testsuite for this package
-test: $(TOP)/goodies/builder/reports
-	$(MAKE) -C $(TOP)/goodies/builder/reports -f Makefile.init
-	$(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE)
-
-
-
-# add more install actions here
-install::
-
-# add more install actions for aux-files (resources) here
-installAux::
-
-# add more preMake actions here
-preMake::
-
-# add more postMake actions here
-postMake:: cleanjunk
-
-# build all mandatory prerequisite packages (containing superclasses) for this package
-prereq:
-	cd $(TOP)/libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-
-
-# build all packages containing referenced classes for this package
-# they are not needed to compile the package (but later, to load it)
-references:
-
-
-cleanjunk::
-	-rm -f *.s *.s2
-
-clean::
-	-rm -f *.o *.H
-
-clobber:: clean
-	-rm -f *.so *.dll
-
-
-# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(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
-
+# $Header$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: jv_vdb_tests.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# The Makefile as generated by this Make.proto supports the following targets:
+#    make         - compile all st-files to a classLib
+#    make clean   - clean all temp files
+#    make clobber - clean all
+#
+# This file contains definitions for Unix based platforms.
+# It shares common definitions with the win32-make in Make.spec.
+
+#
+# position (of this package) in directory hierarchy:
+# (must point to ST/X top directory, for tools and includes)
+TOP=../../../stx
+INCLUDE_TOP=$(TOP)/..
+
+# subdirectories where targets are to be made:
+SUBDIRS=
+
+
+# subdirectories where Makefiles are to be made:
+# (only define if different from SUBDIRS)
+# ALLSUBDIRS=
+
+REQUIRED_SUPPORT_DIRS=
+
+# if your embedded C code requires any system includes,
+# add the path(es) here:,
+# ********** OPTIONAL: MODIFY the next lines ***
+# LOCALINCLUDES=-Ifoo -Ibar
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic
+
+
+# if you need any additional defines for embedded C code,
+# add them here:,
+# ********** OPTIONAL: MODIFY the next lines ***
+# LOCALDEFINES=-Dfoo -Dbar -DDEBUG
+LOCALDEFINES=
+
+LIBNAME=libjv_vdb_tests
+STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=.  -varPrefix=$(LIBNAME)
+
+
+# ********** OPTIONAL: MODIFY the next line ***
+# additional C-libraries that should be pre-linked with the class-objects
+LD_OBJ_LIBS=
+LOCAL_SHARED_LIBS=
+
+
+# ********** OPTIONAL: MODIFY the next line ***
+# additional C targets or libraries should be added below
+LOCAL_EXTRA_TARGETS=
+
+OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
+
+
+
+all:: preMake classLibRule postMake
+
+pre_objs::  
+
+
+
+
+
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
+jv_vdb_tests.$(O): $(shell hg root)/.hg/dirstate
+endif
+
+
+
+
+# run default testsuite for this package
+test: $(TOP)/goodies/builder/reports
+	$(MAKE) -C $(TOP)/goodies/builder/reports -f Makefile.init
+	$(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE)
+
+
+
+# add more install actions here
+install::
+
+# add more install actions for aux-files (resources) here
+installAux::
+
+# add more preMake actions here
+preMake::
+
+# add more postMake actions here
+postMake:: cleanjunk
+
+# build all mandatory prerequisite packages (containing superclasses) for this package
+prereq:
+	cd $(TOP)/libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+
+
+# build all packages containing referenced classes for this package
+# they are not needed to compile the package (but later, to load it)
+references:
+
+
+cleanjunk::
+	-rm -f *.s *.s2
+
+clean::
+	-rm -f *.o *.H
+
+clobber:: clean
+	-rm -f *.so *.dll
+
+
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(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	Wed Apr 04 23:16:30 2018 +0100
+++ b/tests/Make.spec	Mon Apr 09 21:43:54 2018 +0100
@@ -1,63 +1,63 @@
-# $Header$
-#
-# DO NOT EDIT
-# automagically generated from the projectDefinition: jv_vdb_tests.
-#
-# Warning: once you modify this file, do not rerun
-# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
-#
-# This file contains specifications which are common to all platforms.
-#
-
-# Do NOT CHANGE THESE DEFINITIONS
-# (otherwise, ST/X will have a hard time to find out the packages location from its packageID,
-#  to find the source code of a class and to find the library for a package)
-MODULE=jv
-MODULE_DIR=vdb/tests
-PACKAGE=$(MODULE):$(MODULE_DIR)
-
-
-# Argument(s) to the stc compiler (stc --usage).
-#  -headerDir=. : create header files locally
-#                (if removed, they will be created as common
-#  -Pxxx       : defines the package
-#  -Zxxx       : a prefix for variables within the classLib
-#  -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
-#  +optspace3  : optimized even more for space
-#  +optinline  : generate inline code for some ST constructs
-#  +inlineNew  : additionally inline new
-#  +inlineMath : additionally inline some floatPnt math stuff
-#
-# ********** OPTIONAL: MODIFY the next line(s) ***
-# STCLOCALOPTIMIZATIONS=+optinline +inlineNew
-# STCLOCALOPTIMIZATIONS=+optspace3
-STCLOCALOPTIMIZATIONS=+optspace3
-
-
-# Argument(s) to the stc compiler (stc --usage).
-#  -warn            : no warnings
-#  -warnNonStandard : no warnings about ST/X extensions
-#  -warnEOLComments : no warnings about EOL comment extension
-#  -warnPrivacy     : no warnings about privateClass extension
-#  -warnUnused      : no warnings about unused variables
-#
-# ********** OPTIONAL: MODIFY the next line(s) ***
-# STCWARNINGS=-warn
-# STCWARNINGS=-warnNonStandard
-# STCWARNINGS=-warnEOLComments
-STCWARNINGS=-warnNonStandard
-
-COMMON_CLASSES= \
-	jv_vdb_tests \
-
-
-
-
-COMMON_OBJS= \
-    $(OUTDIR)jv_vdb_tests.$(O) \
-
-
-
+# $Header$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: jv_vdb_tests.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# This file contains specifications which are common to all platforms.
+#
+
+# Do NOT CHANGE THESE DEFINITIONS
+# (otherwise, ST/X will have a hard time to find out the packages location from its packageID,
+#  to find the source code of a class and to find the library for a package)
+MODULE=jv
+MODULE_DIR=vdb/tests
+PACKAGE=$(MODULE):$(MODULE_DIR)
+
+
+# Argument(s) to the stc compiler (stc --usage).
+#  -headerDir=. : create header files locally
+#                (if removed, they will be created as common
+#  -Pxxx       : defines the package
+#  -Zxxx       : a prefix for variables within the classLib
+#  -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
+#  +optspace3  : optimized even more for space
+#  +optinline  : generate inline code for some ST constructs
+#  +inlineNew  : additionally inline new
+#  +inlineMath : additionally inline some floatPnt math stuff
+#
+# ********** OPTIONAL: MODIFY the next line(s) ***
+# STCLOCALOPTIMIZATIONS=+optinline +inlineNew
+# STCLOCALOPTIMIZATIONS=+optspace3
+STCLOCALOPTIMIZATIONS=+optspace3
+
+
+# Argument(s) to the stc compiler (stc --usage).
+#  -warn            : no warnings
+#  -warnNonStandard : no warnings about ST/X extensions
+#  -warnEOLComments : no warnings about EOL comment extension
+#  -warnPrivacy     : no warnings about privateClass extension
+#  -warnUnused      : no warnings about unused variables
+#
+# ********** OPTIONAL: MODIFY the next line(s) ***
+# STCWARNINGS=-warn
+# STCWARNINGS=-warnNonStandard
+# STCWARNINGS=-warnEOLComments
+STCWARNINGS=-warnNonStandard
+
+COMMON_CLASSES= \
+	jv_vdb_tests \
+
+
+
+
+COMMON_OBJS= \
+    $(OUTDIR)jv_vdb_tests.$(O) \
+
+
+
--- a/tests/Makefile.init	Wed Apr 04 23:16:30 2018 +0100
+++ b/tests/Makefile.init	Mon Apr 09 21:43:54 2018 +0100
@@ -1,27 +1,27 @@
-#
-# DO NOT EDIT
-#
-# make uses this file (Makefile) only, if there is no
-# file named "makefile" (lower-case m) in the same directory.
-# My only task is to generate the real makefile and call make again.
-# Thereafter, I am no longer used and needed.
-#
-# MACOSX caveat:
-#   as filenames are not case sensitive (in a default setup),
-#   we cannot use the above trick. Therefore, this file is now named
-#   "Makefile.init", and you have to execute "make -f Makefile.init" to
-#   get the initial makefile.  This is now also done by the toplevel CONFIG
-#   script.
-
-.PHONY: run
-
-run: makefile
-	$(MAKE) -f makefile
-
-#only needed for the definition of $(TOP)
-include Make.proto
-
-makefile: mf
-
-mf:
-	$(TOP)/rules/stmkmf
+#
+# DO NOT EDIT
+#
+# make uses this file (Makefile) only, if there is no
+# file named "makefile" (lower-case m) in the same directory.
+# My only task is to generate the real makefile and call make again.
+# Thereafter, I am no longer used and needed.
+#
+# MACOSX caveat:
+#   as filenames are not case sensitive (in a default setup),
+#   we cannot use the above trick. Therefore, this file is now named
+#   "Makefile.init", and you have to execute "make -f Makefile.init" to
+#   get the initial makefile.  This is now also done by the toplevel CONFIG
+#   script.
+
+.PHONY: run
+
+run: makefile
+	$(MAKE) -f makefile
+
+#only needed for the definition of $(TOP)
+include Make.proto
+
+makefile: mf
+
+mf:
+	$(TOP)/rules/stmkmf
--- a/tests/abbrev.stc	Wed Apr 04 23:16:30 2018 +0100
+++ b/tests/abbrev.stc	Mon Apr 09 21:43:54 2018 +0100
@@ -1,4 +1,4 @@
-# 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.
-jv_vdb_tests jv_vdb_tests jv:vdb/tests '* Projects & Packages *' 3
+# 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.
+jv_vdb_tests jv_vdb_tests jv:vdb/tests '* Projects & Packages *' 3
--- a/tests/bc.mak	Wed Apr 04 23:16:30 2018 +0100
+++ b/tests/bc.mak	Mon Apr 09 21:43:54 2018 +0100
@@ -1,82 +1,82 @@
-# $Header$
-#
-# DO NOT EDIT
-# automagically generated from the projectDefinition: jv_vdb_tests.
-#
-# Warning: once you modify this file, do not rerun
-# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
-#
-# Notice, that the name bc.mak is historical (from times, when only borland c was supported).
-# This file contains make rules for the win32 platform using either borland-bcc or visual-c.
-# It shares common definitions with the unix-make in Make.spec.
-# The bc.mak supports the following targets:
-#    bmake         - compile all st-files to a classLib (dll)
-#    bmake clean   - clean all temp files
-#    bmake clobber - clean all
-#
-# Historic Note:
-#  this used to contain only rules to make with borland
-#    (called via bmake, by "make.exe -f bc.mak")
-#  this has changed; it is now also possible to build using microsoft visual c
-#    (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
-#
-TOP=..\..\..\stx
-INCLUDE_TOP=$(TOP)\..
-
-
-
-!INCLUDE $(TOP)\rules\stdHeader_bc
-
-!INCLUDE Make.spec
-
-LIBNAME=libjv_vdb_tests
-MODULE_PATH=vdb\tests
-RESFILES=jv_vdb_testsWINrc.$(RES)
-
-
-
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic
-LOCALDEFINES=
-
-STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
-LOCALLIBS=
-
-OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
-
-ALL::  classLibRule
-
-classLibRule: $(OUTDIR) $(OUTDIR)$(LIBNAME).dll
-
-!INCLUDE $(TOP)\rules\stdRules_bc
-
-# build all mandatory prerequisite packages (containing superclasses) for this package
-prereq:
-	pushd ..\..\..\stx\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-
-
-
-
-
-
-test: $(TOP)\goodies\builder\reports\NUL
-	pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
-	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
-        
-clean::
-	-del *.$(CSUFFIX)
-
-
-# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(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
-
-# **Must be at end**
-
-# Enforce recompilation of package definition class if Mercurial working
-# copy state changes. Together with --guessVersion it ensures that package
-# definition class always contains correct binary revision string.
-!IFDEF HGROOT
-$(OUTDIR)jv_vdb_tests.$(O): $(HGROOT)\.hg\dirstate
-!ENDIF
+# $Header$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: jv_vdb_tests.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# Notice, that the name bc.mak is historical (from times, when only borland c was supported).
+# This file contains make rules for the win32 platform using either borland-bcc or visual-c.
+# It shares common definitions with the unix-make in Make.spec.
+# The bc.mak supports the following targets:
+#    bmake         - compile all st-files to a classLib (dll)
+#    bmake clean   - clean all temp files
+#    bmake clobber - clean all
+#
+# Historic Note:
+#  this used to contain only rules to make with borland
+#    (called via bmake, by "make.exe -f bc.mak")
+#  this has changed; it is now also possible to build using microsoft visual c
+#    (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
+#
+TOP=..\..\..\stx
+INCLUDE_TOP=$(TOP)\..
+
+
+
+!INCLUDE $(TOP)\rules\stdHeader_bc
+
+!INCLUDE Make.spec
+
+LIBNAME=libjv_vdb_tests
+MODULE_PATH=vdb\tests
+RESFILES=jv_vdb_testsWINrc.$(RES)
+
+
+
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic
+LOCALDEFINES=
+
+STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
+LOCALLIBS=
+
+OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
+
+ALL::  classLibRule
+
+classLibRule: $(OUTDIR) $(OUTDIR)$(LIBNAME).dll
+
+!INCLUDE $(TOP)\rules\stdRules_bc
+
+# build all mandatory prerequisite packages (containing superclasses) for this package
+prereq:
+	pushd ..\..\..\stx\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+
+
+
+
+
+
+test: $(TOP)\goodies\builder\reports\NUL
+	pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
+	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
+        
+clean::
+	-del *.$(CSUFFIX)
+
+
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(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
+
+# **Must be at end**
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+!IFDEF HGROOT
+$(OUTDIR)jv_vdb_tests.$(O): $(HGROOT)\.hg\dirstate
+!ENDIF
--- a/tests/bmake.bat	Wed Apr 04 23:16:30 2018 +0100
+++ b/tests/bmake.bat	Mon Apr 09 21:43:54 2018 +0100
@@ -1,15 +1,15 @@
-@REM -------
-@REM make using Borland bcc32
-@REM type bmake, and wait...
-@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% %*
-
-
-
-
+@REM -------
+@REM make using Borland bcc32
+@REM type bmake, and wait...
+@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% %*
+
+
+
+
--- a/tests/libInit.cc	Wed Apr 04 23:16:30 2018 +0100
+++ b/tests/libInit.cc	Mon Apr 09 21:43:54 2018 +0100
@@ -1,38 +1,38 @@
-/*
- * $Header$
- *
- * DO NOT EDIT
- * automagically generated from the projectDefinition: jv_vdb_tests.
- */
-#define __INDIRECTVMINITCALLS__
-#include <stc.h>
-
-#ifdef WIN32
-# pragma codeseg INITCODE "INITCODE"
-#endif
-
-#if defined(INIT_TEXT_SECTION) || defined(DLL_EXPORT)
-DLL_EXPORT void _libjv_vdb_tests_Init() INIT_TEXT_SECTION;
-DLL_EXPORT void _libjv_vdb_tests_InitDefinition() INIT_TEXT_SECTION;
-#endif
-
-extern void _jv_137vdb_137tests_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
-
-
-
-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(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__();
-}
+/*
+ * $Header$
+ *
+ * DO NOT EDIT
+ * automagically generated from the projectDefinition: jv_vdb_tests.
+ */
+#define __INDIRECTVMINITCALLS__
+#include <stc.h>
+
+#ifdef WIN32
+# pragma codeseg INITCODE "INITCODE"
+#endif
+
+#if defined(INIT_TEXT_SECTION) || defined(DLL_EXPORT)
+DLL_EXPORT void _libjv_vdb_tests_Init() INIT_TEXT_SECTION;
+DLL_EXPORT void _libjv_vdb_tests_InitDefinition() INIT_TEXT_SECTION;
+#endif
+
+extern void _jv_137vdb_137tests_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+
+
+
+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(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__();
+}
--- a/tests/mingwmake.bat	Wed Apr 04 23:16:30 2018 +0100
+++ b/tests/mingwmake.bat	Mon Apr 09 21:43:54 2018 +0100
@@ -1,18 +1,18 @@
-@REM -------
-@REM make using mingw gnu compiler
-@REM type mingwmake, and wait...
-@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%"
-
-@pushd ..\..\..\stx\rules
-@call find_mingw.bat
-@popd
-make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
-
-
-
-
+@REM -------
+@REM make using mingw gnu compiler
+@REM type mingwmake, and wait...
+@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%"
+
+@pushd ..\..\..\stx\rules
+@call find_mingw.bat
+@popd
+make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
+
+
+
+
--- a/tests/vcmake.bat	Wed Apr 04 23:16:30 2018 +0100
+++ b/tests/vcmake.bat	Mon Apr 09 21:43:54 2018 +0100
@@ -1,22 +1,22 @@
-@REM -------
-@REM make using Microsoft Visual C compiler
-@REM type vcmake, and wait...
-@REM do not edit - automatically generated from ProjectDefinition
-@REM -------
-
-@if not defined VSINSTALLDIR (
-    pushd ..\..\..\stx\rules
-    call vcsetup.bat
-    popd
-)
-@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 -DUSEVC=1 %DEFINES% %*
-
-
-
-
+@REM -------
+@REM make using Microsoft Visual C compiler
+@REM type vcmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+
+@if not defined VSINSTALLDIR (
+    pushd ..\..\..\stx\rules
+    call vcsetup.bat
+    popd
+)
+@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 -DUSEVC=1 %DEFINES% %*
+
+
+
+
--- a/vcmake.bat	Wed Apr 04 23:16:30 2018 +0100
+++ b/vcmake.bat	Mon Apr 09 21:43:54 2018 +0100
@@ -1,22 +1,22 @@
-@REM -------
-@REM make using Microsoft Visual C compiler
-@REM type vcmake, and wait...
-@REM do not edit - automatically generated from ProjectDefinition
-@REM -------
-
-@if not defined VSINSTALLDIR (
-    pushd ..\..\stx\rules
-    call vcsetup.bat
-    popd
-)
-@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 -DUSEVC=1 %DEFINES% %*
-
-
-
-
+@REM -------
+@REM make using Microsoft Visual C compiler
+@REM type vcmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+
+@if not defined VSINSTALLDIR (
+    pushd ..\..\stx\rules
+    call vcsetup.bat
+    popd
+)
+@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 -DUSEVC=1 %DEFINES% %*
+
+
+
+