# HG changeset patch
# User Jan Vrany <jan.vrany@fit.cvut.cz>
# Date 1563889987 -3600
# Node ID d220862ec65f01f00aff64bc8ba972797e935dcc
# Parent  a47acd6d73ca3201ce117ec44fad743297c143e3
Remove launcher script on UNIX

...ie., `vdb` is the real executable, not just a script that
launches it. Time have shown this laucnher script is not needed.

diff -r a47acd6d73ca -r d220862ec65f application/Make.proto
--- a/application/Make.proto	Tue Jul 23 12:32:01 2019 +0100
+++ b/application/Make.proto	Tue Jul 23 14:53:07 2019 +0100
@@ -7,7 +7,7 @@
 # This makefile generates some standalone demo applications
 #
 #    make
-#       generates vdb.do
+#       generates vdb
 #
 
 TOP=../../../stx
@@ -140,15 +140,15 @@
 # like ALL, but not prereqs
 ALL_NP:: exe subProjects $(REQUIRED_SUPPORT_DIRS) $(SETUP_RULE)
 
-exe:    vdb.do registerApplication
+exe:    vdb registerApplication
 
-vdb.do: $(APP_DIRS_TO_MAKE) $(APP_LIBOBJS) $(REQUIRED_LIBOBJS) $(OBJS)
-	$(MAKE) link_vdb.do
+vdb: $(APP_DIRS_TO_MAKE) $(APP_LIBOBJS) $(REQUIRED_LIBOBJS) $(OBJS)
+	$(MAKE) link_vdb
 
 
-link_vdb.do:
+link_vdb:
 	$(MAKE) GUI_APPLICATION \
-		    TARGET=vdb.do \
+		    TARGET=vdb \
 		    APPLICATION_CLASSES="$(COMMON_CLASSES) $(UNIX_CLASSES)" \
 		    APPLICATION_OBJS="$(OBJS)" \
 		    APPLICATION_LIBLIST="$(REQUIRED_LIBS)" \
@@ -219,7 +219,7 @@
 	@-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 "vdb" "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/."
@@ -231,21 +231,21 @@
 
 
 
-SOURCEFILES: vdb.do_SOURCES \
+SOURCEFILES: vdb_SOURCES \
 	stx_SOURCES
 
 
 
 
-RESOURCEFILES: vdb.do_RESOURCES vdb.do_BITMAPS  \
+RESOURCEFILES: vdb_RESOURCES vdb_BITMAPS  \
 	stx_RESOURCES stx_STYLES stx_BITMAPS
 
 
-vdb.do_RESOURCES: 
+vdb_RESOURCES: 
 	mkdir -p resources/jv/vdb/application
 	-cp ../resources/*.rs ../resources/*.style resources/jv/vdb/application/..
 
-vdb.do_BITMAPS: 
+vdb_BITMAPS: 
 	mkdir -p resources/jv/vdb/application/bitmaps
 	-cp *.ico *.gif *.png resources/jv/vdb/application/bitmaps
 
@@ -603,10 +603,10 @@
 
 
 clean::
-	-rm -f *.so vdb.do.$(O)
+	-rm -f *.so vdb.$(O)
 
 clobber:: clean
-	-rm -f vdb.do *.img *.sav
+	-rm -f vdb *.img *.sav
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 $(OUTDIR)VDBStartupA.$(O) VDBStartupA.$(C) VDBStartupA.$(H): VDBStartupA.st $(INCLUDE_TOP)/jv/vdb/VDBStartup.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/StandaloneStartup.$(H) $(STCHDR)
diff -r a47acd6d73ca -r d220862ec65f application/application.nsi
--- a/application/application.nsi	Tue Jul 23 12:32:01 2019 +0100
+++ b/application/application.nsi	Tue Jul 23 14:53:07 2019 +0100
@@ -109,14 +109,14 @@
 ;;   SectionIn 1
 ;;   SetOutPath "$INSTDIR\doc"
 ;;   SetOverwrite ifnewer
-;;   File /r /x CVS "${STX_ROOT}\jv\vdb.do\doc\*"
+;;   File /r /x CVS "${STX_ROOT}\jv\vdb\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\*"
+;; ;   File /r /x CVS "${STX_ROOT}\jv\vdb\examples\*"
 ;; SectionEnd
 ;; 
 ;; Section "Visual / VM Debugger Reports and Printing" Section4
@@ -137,8 +137,8 @@
   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}\vdb.lnk" "$INSTDIR\bin\vdb.exe"
+  CreateShortCut "$DESKTOP\vdb.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
@@ -199,8 +199,8 @@
 
   Delete "$SMPROGRAMS\${PRODUCT_FILENAME}\Uninstall.lnk"
   Delete "$SMPROGRAMS\${PRODUCT_FILENAME}\Website.lnk"
-  Delete "$SMPROGRAMS\${PRODUCT_FILENAME}\vdb.do.lnk"
-  Delete "$DESKTOP\vdb.do.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_FILENAME}\vdb.lnk"
+  Delete "$DESKTOP\vdb.lnk"
 
   RMDir "$SMPROGRAMS\${PRODUCT_FILENAME}"
 
diff -r a47acd6d73ca -r d220862ec65f application/autopackage/default.apspec
--- a/application/autopackage/default.apspec	Tue Jul 23 12:32:01 2019 +0100
+++ b/application/autopackage/default.apspec	Tue Jul 23 14:53:07 2019 +0100
@@ -1,6 +1,6 @@
 # -*- shell-script -*-
 [Meta]
-ShortName: vdb.do
+ShortName: vdb
 SoftwareVersion: 8.0.99.0
 DisplayName: Visual / VM Debugger
 RootName: Visual / VM Debugger
@@ -31,14 +31,14 @@
 # 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
+export MYPREFIX=/opt/vdb
 
 [Prepare]
 #recommend '@autopackage.org/autopackage-gtk' 1
 
 [Imports]
 import <<EOF
-$source_dir/vdb.do
+$source_dir/vdb
 
 EOF
 
diff -r a47acd6d73ca -r d220862ec65f application/bc.mak
--- a/application/bc.mak	Tue Jul 23 12:32:01 2019 +0100
+++ b/application/bc.mak	Tue Jul 23 14:53:07 2019 +0100
@@ -143,7 +143,7 @@
 	$(MAKE) -N -f bc.mak $(USE_ARG) \
 		MAKE_BAT=$(MAKE_BAT) \
 		PROJECT=$(PROJECT_NOCONSOLE) \
-		CFLAGS_APPTYPE=" -DWIN32GUI $(CFLAGS_NOCONSOLE) -DWIN_LOGFILE="\\"\"vdb.do.log\\"\""" \
+		CFLAGS_APPTYPE=" -DWIN32GUI $(CFLAGS_NOCONSOLE) -DWIN_LOGFILE="\\"\"vdb.log\\"\""" \
 		LFLAGS_APPTYPE=" $(LFLAGS_NOCONSOLE)" \
 		CRT_STARTUP=" $(CRT_STARTUP_NOCONSOLE)" theExe
 
@@ -189,15 +189,15 @@
 	$(MAKE_BAT) clean
 	$(MAKE_BAT)
 
-RESOURCEFILES: vdb.do_RESOURCES vdb.do_BITMAPS  \
+RESOURCEFILES: vdb_RESOURCES vdb_BITMAPS  \
 	stx_RESOURCES stx_STYLES stx_BITMAPS
 
 
-vdb.do_RESOURCES: resources\jv\vdb\application
+vdb_RESOURCES: resources\jv\vdb\application
 	-copy ..\resources\*.rs resources\jv\vdb\application\..
 	-copy ..\resources\*.style resources\jv\vdb\application\..
 
-vdb.do_BITMAPS: resources\jv\vdb\application\bitmaps
+vdb_BITMAPS: resources\jv\vdb\application\bitmaps
 	-copy *.ico resources\jv\vdb\application\bitmaps
 	-copy *.gif resources\jv\vdb\application\bitmaps
 
@@ -511,7 +511,7 @@
 #
 # additional rules
 #
-vdb.doWin.$(RES): vdb.doWin.rc vdb.do.ico
+vdbWin.$(RES): vdbWin.rc vdb.ico
 
 main.$(O): buildDate.h main.c bc.mak
 
@@ -556,7 +556,7 @@
 	-del c0x32.lib
 	-del buildDate.h
 	-del $(PROJECT)
-	-del install_vdb.do.exe
+	-del install_vdb.exe
 	-del stx.lib
 	-del stx.dll
 	-del $(RT_DLL)
diff -r a47acd6d73ca -r d220862ec65f application/builder/baseline.rbspec
--- a/application/builder/baseline.rbspec	Tue Jul 23 12:32:01 2019 +0100
+++ b/application/builder/baseline.rbspec	Tue Jul 23 14:53:07 2019 +0100
@@ -9,7 +9,7 @@
 clear "stx:libwidg" => "stx:libui"
 clear "stx:libwidg2" => "stx:libui"
 
-project :'vdb.do:baseline' do
+project :'vdb:baseline' do
   # preamble
   
   # --------
diff -r a47acd6d73ca -r d220862ec65f application/jv_vdb_application.st
--- a/application/jv_vdb_application.st	Tue Jul 23 12:32:01 2019 +0100
+++ b/application/jv_vdb_application.st	Tue Jul 23 14:53:07 2019 +0100
@@ -45,15 +45,6 @@
     "Modified: / 21-09-2014 / 01:35:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-applicationName
-
-    "/ On UNIX, make it `vdb.so` so `vdb` can be launcher script
-    ^ 'vdb.do'
-
-    "Created: / 21-09-2014 / 01:35:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified (comment): / 05-06-2017 / 21:08:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 excludedFromPreRequisites
     "list packages which are to be explicitely excluded from the automatic constructed
      prerequisites list. If empty, everything that is found along the inheritance of any of
diff -r a47acd6d73ca -r d220862ec65f application/osx/Info.plist
--- a/application/osx/Info.plist	Tue Jul 23 12:32:01 2019 +0100
+++ b/application/osx/Info.plist	Tue Jul 23 14:53:07 2019 +0100
@@ -5,11 +5,11 @@
 <key>CFBundlePackageType</key>
 <string>APPL</string>
 <key>CFBundleExecutable</key>
-<string>vdb.do</string>
+<string>vdb</string>
 <key>CFBundleShortVersionString</key>
 <string>8.0.32767.32767</string>
 <key>CFBundleName</key>
-<string>vdb.do</string>
+<string>vdb</string>
 <key>CFBundleInfoDictionaryVersion</key>
 <string>6.0</string>
 <key>LSMinimumSystemVersion</key>
diff -r a47acd6d73ca -r d220862ec65f application/vdb
--- a/application/vdb	Tue Jul 23 12:32:01 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# Startup script for Visual / VM Debugger
-#
-
-VDB_BINDIR=$(dirname $(realpath $0))
-
-if [ -f "$VDB_BINDIR/vdb.so" ]; then
-    # Standalone excutable
-    exec "$VDB_BINDIR/vdb.so" ${1+"$@"}
-elif [ -x "$VDB_BINDIR/../../../stx/projects/smalltalk/smalltalk" ]; then
-    # In build tree 
-    exec "$VDB_BINDIR/../../../stx/projects/smalltalk/smalltalk" \
-            --load jv:vdb/application --run VDBStartup ${1+"$@"}
-else
-    echo "erorr: could not find vdb.so"
-    exit 1
-fi
-
-
-