hg/stx-projects-smalltalk: comparison smalltalk

equal deleted inserted replaced

-:efa48d08c563
+:2425cb5d073e
 STX_EXE="$STX_TOPDIR/bin/stx-bin"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$STX_LIBDIR/lib"
 else
 # Running from build tree
 STX_LIBDIR="$STX_BIN_DIR"
+if [ -x "$STX_BIN_DIR/../../../../config.guess" ]; then
+	native_target=$($STX_BIN_DIR/../../../../config.guess)
+STX_EXE="$STX_BIN_DIR/build/${native_target}/stx"
+if [ ! -x "$STX_EXE" ]; then
+	    # Sigh, special hack for i386. I know, I know, this is kind of
+	    # dated, but still, I'd like to keep it alive as this is
+# - as of today - the only working 32bit architecture.
+	    if [ "${native_target}" == "x86_64-pc-linux-gnu" ]; then
+		# Try i386...
+		STX_EXE="$STX_BIN_DIR/build/i686-pc-linux-gnu/stx"
+		if [ ! -x "$STX_EXE" ]; then
+STX_EXE=stx
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$(dirname $STX_EXE)"
+fi
+	    else
+STX_EXE=stx
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$(dirname $STX_EXE)"
+fi
+fi
+fi
 fi
 if [ "$STX_LIBDIR" != "" ]
 then
 if [ ! -f $STX_LIBDIR/smalltalk.rc ]
 # notice: STXLIBDIR is filled in here by install-sh script
 if test -z "$STX_LIBDIR"
 then
 bindir=`dirname $0`
 case "$bindir" in
 /* )
 ;;
 .* )
 bindir=`( cd $bindir; pwd ) 2> /dev/null`
 ;;
 esac
 if [ -d ${bindir}/../lib ]
 then
 STX_LIBDIR=`cd ${bindir}/../lib ; pwd`
 fi
 fi
 if [ -z "$STX_LIBDIR" ]
 then
 if [ -d ../lib ]
 then
 STX_LIBDIR=`cd ../lib ; pwd`
 fi
 fi
 if [ ! -d "$STX_LIBDIR" ]
 then
 if [ -d ../lib ]
 then
 STX_LIBDIR=`cd ../lib ; pwd`
 fi
 fi
 if test -z "$STX_TOPDIR"
 then
 if [ -f ../lib/smalltalk.rc ]
 then
 STX_TOPDIR=`cd .. ; pwd`
 else
 if [ -f $STX_LIBDIR/../lib/smalltalk.rc ]
 then
 STX_TOPDIR=`cd $STX_LIBDIR/.. ; pwd`
 else
 if [ -f $STX_BIN_DIR/smalltalk.rc ]
 then
 STX_TOPDIR=`cd $STX_BIN_DIR/../.. ; pwd`
 fi
 fi
 fi
 fi
 # echo STX_LIBDIR is $STX_LIBDIR
 export STX_LIBDIR STX_TOPDIR
 # echo STX is $STX_EXE
 function error() {
-	echo "$0: $1"
+echo "$0: $1"
-	exit 1
+exit 1
 }
 function usage() {
 cat <<USAGE_END
 usage: $(basename $0) <args to launcher script> <args to VM> <args to startup classes>
 --ldd .................. show which shared libraries are used
 --vdb .................. run with Visual / VM Debugger
 --gdb .................. run with gdb (type r in debugger to start)
 --cgdb ................. run with cgdb (type r in debugger to start)
 --callgrind ............ run under callgrind profiler tool with profiling
 off. Use this to profile some benchmark.
 --callgrind-startup .... run under callgrind profiler tool with profiling
 on. Use this to profile VM startup.
 --stap SCRIPT .......... run given systemtap script, passing stx command as
 stap -c 'stx ...' Systemtap may not be compiled in.
 --record ............... record execution using rr.
 --replay ............... replay last recorded execution using rr. Must be used
 in combination with --vdb.
 USAGE_END
 $STX_BIN_DIR/$STX_EXE --help
 exit 0
 }
 while [ $# -gt 0 ]
 do
 case $1 in
 --help)
 usage
 ;;
 -x)
 STX_EXE=$2
 shift 2
 ;;
 -X)
 STX_EXE=$2/stx
 shift 2
 ;;
 --ldd)
 DEBUGLIB=yes
+shift
+;;
+--gdb|--cgdb|--vdb|--callgrind|--callgrind-startup|--stap)
+if [ ! -z "$SUPERVISOR" ]; then
+error "$1 cannot be used together with $SUPERVISOR."
+fi
+if [ "x$RECORD" == "xyes" ]; then
+error "$1 cannot be used together with --record"
+fi
+if [ "x$REPLAY" == "xyes" ]; then
+if [ "$1" != "--vdb" ]; then
+error "$1 cannot be used together with --replay"
+fi
+fi
+SUPERVISOR=$1
+if [ $SUPERVISOR == "--stap" ]; then
+if [ -z "$2" ]; then
+error "--stap requires systemtap script to run"
+fi
+if [ ! -r "$2" ]; then
+error "$2: no such file or not readable"
+fi
+STAPSCRIPT=$2
+shift
+fi
+shift
+;;
+--record)
+if [ ! -z "$SUPERVISOR" ]; then
+error "$1 cannot be used together with $SUPERVISOR."
+fi
+if [ "x$REPLAY" == "xyes" ]; then
+error "$1 cannot be used together with --replay"
+fi
+RECORD=yes
 shift
 ;;
---gdb|--cgdb|--vdb|--callgrind|--callgrind-startup|--stap)
+--replay)
-			if [ ! -z "$SUPERVISOR" ]; then
+if [ ! -z "$SUPERVISOR" ]; then
-				error "$1 cannot be used together with $SUPERVISOR."
+if [ "$SUPERVISOR" != "--vgb" ]; then
-			fi
+error "$1 cannot be used together with $SUPERVISOR."
-			if [ "x$RECORD" == "xyes" ]; then
-				error "$1 cannot be used together with --record"
-			fi
-			if [ "x$REPLAY" == "xyes" ]; then
-				if [ "$1" != "--vdb" ]; then
-					error "$1 cannot be used together with --replay"
-				fi
-			fi
-SUPERVISOR=$1
-if [ $SUPERVISOR == "--stap" ]; then
-	if [ -z "$2" ]; then
-	error "--stap requires systemtap script to run"
 fi
-if [ ! -r "$2" ]; then
+fi
-	error "$2: no such file or not readable"
+if [ "x$RECORD" == "xyes" ]; then
-fi
+error "$1 cannot be used together with --record"
-STAPSCRIPT=$2
+fi
-shift
+REPLAY=yes
-fi
+shift
-shift
+;;
-;;
+*)
---record)
+break
-			if [ ! -z "$SUPERVISOR" ]; then
+;;
-				error "$1 cannot be used together with $SUPERVISOR."
-			fi
-			if [ "x$REPLAY" == "xyes" ]; then
-				error "$1 cannot be used together with --replay"
-			fi
-			RECORD=yes
-			shift
-	;;
---replay)
-			if [ ! -z "$SUPERVISOR" ]; then
-				if [ "$SUPERVISOR" != "--vgb" ]; then
-					error "$1 cannot be used together with $SUPERVISOR."
-				fi
-			fi
-			if [ "x$RECORD" == "xyes" ]; then
-				error "$1 cannot be used together with --record"
-			fi
-	REPLAY=yes
-	shift
-	;;
-*)
-break
-;;
 esac
 done
 #
 #
 # echo PATH is $PATH
 # echo DISPLAY is $DISPLAY
 #
 # When running on modern DE (such as GNOME or KDE), install
 # .desktop and .svg so to get nice(r) icon and - more importantly -
 # proper window grouping in task list.
 #
 # See issue #66: https://swing.fit.cvut.cz/projects/stx-jv/ticket/66
 #
 if [ ! -z "$XDG_CURRENT_DESKTOP" ]; then
 icon_dir=~/.local/share/icons/hicolor/scalable/apps
 dskp_dir=~/.local/share/applications
 if [ ! -f "$icon_dir/smalltalkx.svg" ]; then
 mkdir -p "$icon_dir" || true
 cp "$STX_LIBDIR/smalltalkx.svg" "$icon_dir" || true
 fi
 if [ ! -f "$dskp_dir/smalltalkx.desktop" ]; then
 mkdir -p "$dskp_dir" || true
 cp "$STX_LIBDIR/smalltalkx.desktop" "$dskp_dir" || true
 fi
 fi
 if [ ! -z "$STAPSCRIPT" ]; then
 echo "$CMD"
 exec stap --unprivileged $STAPSCRIPT -I "$STX_TOPDIR/hacking/tapset" -c "$CMD"
 fi
 if [ "x$RECORD" == "xyes" ]; then
-	exec rr $STX_EXE ${1+"$@"}
+exec rr $STX_EXE ${1+"$@"}
+elif [ "x$REPLAY" == "xyes" ]; then
+if [ -z "$SUPERVISOR" ]; then
+error "--replay can only be used together with --vdb"
+elif [ "$SUPERVISOR" != "--vdb" ]; then
+error "--replay can only be used together with --vdb"
+else
+exec vdb --replay $STX_EXE ${1+"$@"}
+fi
 elif [ ! -z "$SUPERVISOR" ]; then
-	case "$SUPERVISOR" in
+case "$SUPERVISOR" in
-		--gdb)
+--gdb)
-			exec gdb --tui --args $STX_EXE ${1+"$@"}
+exec gdb --tui --args $STX_EXE ${1+"$@"}
-			;;
+;;
-		--cgdb)
+--cgdb)
-			exec cgdb --args $STX_EXE ${1+"$@"}
+exec cgdb --args $STX_EXE ${1+"$@"}
-			;;
+;;
-		--vdb)
+--vdb)
-			if which "vdb"; then
+if which "vdb"; then
 vdb=vdb
 elif [ -x "$STX_BIN_DIR/../../../jv/vdb/application/vdb" ]; then
 vdb="$STX_BIN_DIR/../../../jv/vdb/application/vdb"
 else
 error "could not find Visual / VM Debugger (vdb)"
 fi
-if [ "x$REPLAY" == "xyes" ]; then
+exec vdb $STX_EXE ${1+"$@"}
-	exec vdb --replay $STX_EXE ${1+"$@"}
+;;
-else
+--callgrind)
-	exec vdb $STX_EXE ${1+"$@"}
+exec valgrind --tool=callgrind --instr-atstart=no $STX_EXE ${1+"$@"}
-fi
+;;
-;;
+--callgrind-startup)
-		--callgrind)
+exec valgrind --tool=callgrind $STX_EXE ${1+"$@"}
-		exec valgrind --tool=callgrind --instr-atstart=no $STX_EXE ${1+"$@"}
+;;
-		;;
+--stap)
-	--callgrind-startup)
+exec stap --unprivileged $STAPSCRIPT -I "$STX_TOPDIR/librun" -c "$STX_EXE $@"
-			exec valgrind --tool=callgrind $STX_EXE ${1+"$@"}
+;;
-		;;
+*)
-	--stap)
+error "Unknown supervisor option: $SUPERVISOR"
-		exec stap --unprivileged $STAPSCRIPT -I "$STX_TOPDIR/librun" -c "$STX_EXE $@"
+;;
-		;;
+esac
-	*)
-			error "Unknown supervisor option: $SUPERVISOR"
-			;;
-	esac
 else
-	exec $STX_EXE ${1+"$@"}
+exec $STX_EXE ${1+"$@"}
 fi

branch	jv
changeset 1625	2425cb5d073e
parent 1587	7fcb40139a7c
child 1626	62ac134d4f7f