Moved some of the common code in Bash scripts into a single file that

is shared between scripts.
Replaced a number of different approaches to path canonicalization in
various scripts with a single uniform approach.
Removed the now obsolete jas_realpath script.

bin/base_utilities

@@ -0,0 +1,92 @@
+################################################################################
+# This file contains some code shared between multiple Bash scripts.
+################################################################################
+
+################################################################################
+# Some functions related to errors and warnings.
+################################################################################
+
+panic()
+{
+	echo "FATAL ERROR: $*" 1>& 2
+	exit 1
+}
+
+warn()
+{
+	echo "WARNING: $*" 1>& 2
+}
+
+eecho()
+{
+	echo "$*" 1>&2
+}
+
+################################################################################
+# Various utility functions.
+################################################################################
+
+# Locate a program by name on the executable search path.
+find_program()
+{
+	local program_names=("$@")
+	local program_name
+	for program_name in "${program_names[@]}"; do
+		program_path="$(type -P "$program_name")" || program_path=
+		if [ -n "$program_path" -a -x "$program_path" ]; then
+			break
+		fi
+	done
+	if [ -z "$program_path" ]; then
+		return 1
+	fi
+	echo "$program_path"
+}
+
+# Canonicalize a path.
+# Some platforms do not have the realpath program.
+# So, we use python and perl as fallbacks, if they are available.
+real_path()
+{
+	[ $# -eq 1 ] || return 1
+	local path="$1"
+	local realpath_path="$(find_program realpath)" || \
+	  realpath_path=
+	local python_path="$(find_program python3 python python2)" || \
+	  python_path=
+	local perl_path="$(find_program perl)" || perl_path=
+
+	# The following is for testing.
+	#realpath_path=
+	#python_path=
+	#perl_path=
+
+	if [ -n "$realpath_path" ]; then
+		"$realpath_path" "$path" || \
+		  return 1
+	elif [ -n "$python_path" ]; then
+		"$python_path" \
+		  -c 'import os,sys;print(os.path.realpath(sys.argv[1]))' \
+		  "$path" || \
+		  return 1
+	elif [ -n "$perl_path" ]; then
+		"$perl_path" \
+		  -MCwd -e 'print Cwd::realpath($ARGV[0]),qq<\n>' "$path" || \
+		  return 1
+	else
+		return 1
+	fi
+}
+
+repeat_string()
+{
+	[ $# -eq 2 ] || return 1
+	local n="$1"
+	local string="$2"
+	local buffer=
+	local i
+	for((i = 0; i < $n; ++i)); do
+		buffer="$buffer$string"
+	done
+	echo "$buffer"
+}

build/base_utilities

@@ -0,0 +1 @@
+../bin/base_utilities

build/build

@@ -6,7 +6,7 @@
 
 panic()
 {
-	echo "ERROR: $@"
+	echo "FATAL ERROR: $*" 1>& 2
 	exit 1
 }
 
@@ -82,10 +82,14 @@ usage()
 # Early initialization.
 ################################################################################
 
-program_dir=$(dirname "$0") || exit 1
-jas_realpath="$program_dir/jas_realpath"
-abs_program_dir=$("$jas_realpath" "$program_dir") || panic
-sysinfo_program="$program_dir/sysinfo"
+self_dir="$(dirname "$0")" || \
+  panic "cannot get self directory"
+source "$self_dir/base_utilities" || \
+  panic "cannot load base utilities"
+self_dir="$(real_path "$self_dir")" || \
+  panic "cannot get self directory"
+
+sysinfo_program="$self_dir/sysinfo"
 
 ################################################################################
 # Process command line.
@@ -424,7 +428,7 @@ fi
 # Perform some initialization.
 ################################################################################
 
-source_dir="$abs_program_dir/.."
+source_dir="$self_dir/.."
 
 if [ -z "$out_dir" ]; then
 	out_dir="$source_dir/tmp_cmake"

build/build_all

@@ -2,15 +2,19 @@
 
 panic()
 {
-	echo "ERROR: $@"
+	echo "FATAL ERROR: $*" 1>& 2
 	exit 1
 }
 
-program_dir=$(dirname "$0") || exit 1
-jas_realpath="$program_dir/jas_realpath"
-abs_program_dir=$("$jas_realpath" "$program_dir") || panic
-build_program="$program_dir/build"
-sysinfo_program="$program_dir/sysinfo"
+self_dir="$(dirname "$0")" || \
+  panic "cannot get self directory"
+source "$self_dir/base_utilities" || \
+  panic "cannot load base utilities"
+self_dir="$(real_path "$self_dir")" || \
+  panic "cannot get self directory"
+
+build_program="$self_dir/build"
+sysinfo_program="$self_dir/sysinfo"
 
 list_directory()
 {
@@ -278,7 +282,7 @@ if [ "$debug_level" -ge 1 -a "$verbose" -eq 0 ]; then
 fi
 
 if [ -z "$build_dir" ]; then
-	build_dir="$abs_program_dir/../tmp_cmake"
+	build_dir="$self_dir/../tmp_cmake"
 fi
 
 if [ -n "$command_file" ]; then

build/build_wasi_jasper

@@ -2,7 +2,7 @@
 
 panic()
 {
-	echo "ERROR: $*" 1>& 2
+	echo "FATAL ERROR: $*" 1>& 2
 	exit 1
 }
 

build/install_wasi_sdk

@@ -2,7 +2,7 @@
 
 panic()
 {
-	echo "ERROR: $*"
+	echo "FATAL ERROR: $*" 1>& 2
 	exit 1
 }
 

build/install_wasmtime

@@ -8,7 +8,7 @@
 
 panic()
 {
-	echo "ERROR: $*"
+	echo "FATAL ERROR: $*" 1>& 2
 	exit 1
 }
 

build/make_dist

@@ -2,7 +2,7 @@
 
 panic()
 {
-	echo "FATAL ERROR: $@"
+	echo "FATAL ERROR: $*" 1>& 2
 	exit 1
 }
 

build/make_release

@@ -4,7 +4,7 @@
 
 panic()
 {
-	echo "ERROR: $*" 1>& 2
+	echo "FATAL ERROR: $*" 1>& 2
 	exit 1
 }
 
@@ -36,7 +36,13 @@ usage()
 
 ################################################################################
 
-self_dir="$(dirname "$0")" || panic
+self_dir="$(dirname "$0")" || \
+  panic "cannot get self directory"
+source "$self_dir/base_utilities" || \
+  panic "cannot load base utilities"
+self_dir="$(real_path "$self_dir")" || \
+  panic "cannot get self directory"
+
 build_wasi_jasper="$self_dir/build_wasi_jasper"
 
 ################################################################################
@@ -83,7 +89,7 @@ if [ -z "$tmp_dir" ]; then
 fi
 
 # Ensure an absolute pathname.
-workspace_dir="$(readlink -f "$workspace_dir")" || \
+workspace_dir="$(real_path "$workspace_dir")" || \
   panic "cannot get absolute pathname"
 
 if [ ! -d "$workspace_dir" ]; then

build/sysinfo

@@ -2,7 +2,7 @@
 
 panic()
 {
-	echo "ERROR: $@" 1>&2
+	echo "FATAL ERROR: $*" 1>& 2
 	exit 1
 }
 

build/wasm_cc

@@ -7,7 +7,7 @@ eecho()
 
 panic()
 {
-	eecho "$*"
+	echo "FATAL ERROR: $*" 1>& 2
 	exit 1
 }
 

test/bin/base_utilities

@@ -0,0 +1 @@
+../../bin/base_utilities

test/bin/jpcod

@@ -14,7 +14,8 @@ init()
 {
 	CMDDIR=$(dirname "$0") || return 1
 	#CMDDIR=$(realpath "$CMDDIR") || return 1
-	CMDDIR=$(readlink -f "$CMDDIR") || return 1
+	#CMDDIR=$(readlink -f "$CMDDIR") || return 1
+	CMDDIR=$(real_path "$CMDDIR") || return 1
 	ABSCMDDIR="$CMDDIR"
 	TMPDIR=$(make_tmp_dir jpcod) || return 1
 #	HOSTNAME=`hostname`

test/bin/jpdec

@@ -7,7 +7,8 @@ if [ "$debug_level" -ge 1 ]; then
 fi
 
 cmd_dir=$(dirname "$0") || exit 1
-source "$cmd_dir/utilities" || exit 1
+source "$cmd_dir/base_utilities" || exit 1
+source "$cmd_dir/test_utilities" || exit 1
 source "$cmd_dir/jpcod" || exit 1
 
 set_source_and_build_dirs || panic "cannot set source and build directories"

test/bin/jpenc

@@ -7,7 +7,8 @@ if [ "$debug_level" -ge 1 ]; then
 fi
 
 cmd_dir=$(dirname "$0") || exit 1
-source "$cmd_dir/utilities" || exit 1
+source "$cmd_dir/base_utilities" || exit 1
+source "$cmd_dir/test_utilities" || exit 1
 source "$cmd_dir/jpcod" || exit 1
 
 set_source_and_build_dirs || panic "cannot set source and build directories"

test/bin/run_codec_test

@@ -2,7 +2,8 @@
 # Copyright (c) 2016 Michael David Adams
 
 cmd_dir=$(dirname "$0") || exit 1
-source "$cmd_dir/utilities" || exit 1
+source "$cmd_dir/base_utilities" || exit 1
+source "$cmd_dir/test_utilities" || exit 1
 source "$cmd_dir/jpcod" || exit 1
 
 debug_level="${JAS_DEBUG_LEVEL:-0}"

test/bin/run_conformance_tests

@@ -11,7 +11,8 @@ if [ "${BASH_VERSINFO[0]}" -lt 4 ]; then
 fi
 
 cmd_dir=$(dirname "$0") || exit 1
-source "$cmd_dir"/utilities || exit 1
+source "$cmd_dir"/base_utilities || exit 1
+source "$cmd_dir"/test_utilities || exit 1
 source "$cmd_dir/jpcod" || exit 1
 
 set_source_and_build_dirs || panic "cannot set source and build directories"

test/bin/run_test_1

@@ -8,7 +8,8 @@
 ################################################################################
 
 cmd_dir=$(dirname "$0") || exit 1
-source "$cmd_dir"/utilities || exit 1
+source "$cmd_dir"/base_utilities || exit 1
+source "$cmd_dir"/test_utilities || exit 1
 
 debug_level="${JAS_DEBUG_LEVEL:-0}"
 if [ "$debug_level" -ge 1 ]; then

test/bin/run_test_2

@@ -3,7 +3,8 @@
 ################################################################################
 
 cmd_dir=$(dirname $0) || exit 1
-source "$cmd_dir/utilities" || exit 1
+source "$cmd_dir/base_utilities" || exit 1
+source "$cmd_dir/test_utilities" || exit 1
 
 debug_level="${JAS_DEBUG_LEVEL:-0}"
 if [ "$debug_level" -ge 1 ]; then

test/bin/run_test_3

@@ -11,7 +11,8 @@ if [ "${BASH_VERSINFO[0]}" -lt 4 ]; then
 fi
 
 cmd_dir=$(dirname "$0") || exit 1
-source "$cmd_dir"/utilities || exit 1
+source "$cmd_dir"/base_utilities || exit 1
+source "$cmd_dir"/test_utilities || exit 1
 top_dir="$cmd_dir/../.."
 sysinfo_program="$top_dir/build/sysinfo"
 

test/bin/run_test_5

@@ -2,7 +2,8 @@
 ################################################################################
 
 cmd_dir=$(dirname "$0") || exit 1
-source "$cmd_dir"/utilities || exit 1
+source "$cmd_dir"/base_utilities || exit 1
+source "$cmd_dir"/test_utilities || exit 1
 
 debug_level="${JAS_DEBUG_LEVEL:-0}"
 if [ "$debug_level" -ge 1 ]; then

test/bin/run_test_imgcmp

@@ -4,7 +4,8 @@
 ################################################################################
 
 cmd_dir=$(dirname "$0") || exit 1
-source "$cmd_dir"/utilities || exit 1
+source "$cmd_dir"/base_utilities || exit 1
+source "$cmd_dir"/test_utilities || exit 1
 
 debug_level="${JAS_DEBUG_LEVEL:-0}"
 if [ "$debug_level" -ge 1 ]; then

test/bin/run_test_imginfo

@@ -4,7 +4,8 @@
 ################################################################################
 
 cmd_dir=$(dirname "$0") || exit 1
-source "$cmd_dir"/utilities || exit 1
+source "$cmd_dir"/base_utilities || exit 1
+source "$cmd_dir"/test_utilities || exit 1
 
 debug_level="${JAS_DEBUG_LEVEL:-0}"
 if [ "$debug_level" -ge 1 ]; then