comparison SCRIPTS/process.sh @ 96:e24202b02c69

Path separator

 hostwrapper=
 hostext=
 valgrind=
 archflags=
 identpattern=
+sep=":"
 
 case "$platform_arg" in
     linux32)
 	platform=linux
 	pluginext=.so

 	toolprefix=i686-w64-mingw32- 
 	pluginext=.dll
 	hostwrapper=wine
 	hostext=.exe
 	identpattern='PE32.*386.*Windows'
+	sep=";"
 	;;
     mingw64)
 	platform=mingw
 	bits=64
 	altbits=32 # We can usually use a mingw32 Makefile if toolprefix is OK
 	toolprefix=x86_64-w64-mingw32- 
 	pluginext=.dll
 	hostwrapper=wine
 	hostext=.exe
 	identpattern='PE32.*x86-64.*Windows'
+	sep=";"
 	;;
     osx32)
 	platform=osx
 	pluginext=.dylib
 	archflags="-arch i386"

 
 find_vampy_plugins_in() {
     local dir="$1"
     local pdir=$(plugin_dir_for "$dir")
     if [ -z "$pdir" ]; then
-	pdir="${mydir}/../${dir}"
+	case "$dir" in
+	    /*) pdir="$dir" ;;
+	    *) pdir="${mydir}/../${dir}";;
+	esac
     fi
     find "$pdir" -name \*.py -print0 | xargs -0 grep -l 'import.*\bvampy\b'
 }
 
 have_vampy_plugins() {

     if have_vampy_plugins "$pdir"; then
 	vampydir="./vampy"
     fi
     # can't use sed to remove \r from DOS line endings -- BSD and GNU
     # vary in how they interpret \r escape -- so we use perl for that...
-    VAMP_PATH="$dir:$pdir:$vampydir" $hostwrapper \
+    VAMP_PATH="$dir$sep$pdir$sep$vampydir" $hostwrapper \
 	vamp-plugin-sdk/host/vamp-simple-host$hostext --list-ids | \
 	grep '^vamp:' | \
 	sed 's/^vamp://' | \
 	perl -p -e 's/\r//g' 
 }

     for id in $ids; do
 	extra=""
 	if is_nondeterministic "$id"; then
 	    extra="-n"
 	fi
-	echo "Running command: VAMP_PATH=\"$dir:$pdir\" $hostwrapper vamp-plugin-tester/vamp-plugin-tester$hostext \"$extra\" \"$id\"" | tee -a "$log"
-	if ( VAMP_PATH="$dir:$pdir:./vampy" $hostwrapper vamp-plugin-tester/vamp-plugin-tester$hostext "$extra" "$id" 2>&1 | tee -a "$log" ; exit ${PIPESTATUS[0]} ) ; then
+	echo "Running command: VAMP_PATH=\"$dir$sep$pdir\" $hostwrapper vamp-plugin-tester/vamp-plugin-tester$hostext \"$extra\" \"$id\"" | tee -a "$log"
+	if ( VAMP_PATH="$dir$sep$pdir$sep./vampy" $hostwrapper vamp-plugin-tester/vamp-plugin-tester$hostext "$extra" "$id" 2>&1 | tee -a "$log" ; exit ${PIPESTATUS[0]} ) ; then
 	    echo "OK" | tee -a "$log"
 	else
 	    if have_vampy_plugins "$pdir"; then # (don't attempt vampy+valgrind)
 		echo | tee -a "$log"
 		echo "Tester failed for id $id (not restarting with valgrind, as this is a VamPy plugin)" | tee -a "$log"
 	    else
 		echo | tee -a "$log"
 		echo "Tester failed for id $id: running again with valgrind (if available) and verbose for a report..." | tee -a "$log"
-		VAMP_PATH="$dir:$pdir:./vampy" $valgrind $hostwrapper vamp-plugin-tester/vamp-plugin-tester$hostext -v "$extra" "$id" 2>&1 | tee -a "$log"
+		VAMP_PATH="$dir$sep$pdir$sep./vampy" $valgrind $hostwrapper vamp-plugin-tester/vamp-plugin-tester$hostext -v "$extra" "$id" 2>&1 | tee -a "$log"
 	    fi
 	    good=no
 	fi
     done
     if [ "$good" != "yes" ]; then

 env_test_stdout() {
     local dir="$1"
     local log=$(logfile_for envtest "$dir")
     local pdir=$(plugin_dir_for "$dir")
     local good=yes
-    local ids=$(VAMP_PATH="$dir:$pdir" $hostwrapper vamp-plugin-sdk/host/vamp-simple-host$hostext --list-ids);
+    local ids=$(VAMP_PATH="$dir$sep$pdir" $hostwrapper vamp-plugin-sdk/host/vamp-simple-host$hostext --list-ids);
     echo 
     echo "Testing for any unwanted output to stdout..."
     for id in $ids; do
 	case "$id" in
 	    vamp:*) ;;