Mercurial > hg > vamp-build-and-test

changeset 91:e2e7672ea759

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some absolute paths
author Chris Cannam
date Tue, 14 Apr 2015 11:32:55 +0100
parents 1710ac3f246f
children 1abd36a8d5b8
files SCRIPTS/process.sh
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/SCRIPTS/process.sh	Tue Apr 14 11:18:54 2015 +0100
+++ b/SCRIPTS/process.sh	Tue Apr 14 11:32:55 2015 +0100
@@ -146,6 +146,8 @@
     shift
 fi
 
+metadir="$mydir"/../METADATA
+
 depincdir="$mydir"/../DEPENDENCIES/$platform$bits/include
 deplibdir="$mydir"/../DEPENDENCIES/$platform$bits/lib
 depincdir_generic="$mydir"/../DEPENDENCIES/generic/include
@@ -184,15 +186,15 @@
 
 target_for() {
     local dir="$1"
-    if grep -q "^$dir: " METADATA/maketarget.txt ; then
-	grep "^$dir: " METADATA/maketarget.txt | head -1 | sed 's/^[^:]*: //'
+    if grep -q "^$dir: " ${metadir}/maketarget.txt ; then
+	grep "^$dir: " ${metadir}/maketarget.txt | head -1 | sed 's/^[^:]*: //'
     fi
 }
 
 plugin_dir_for() {
     local dir="$1"
-    if grep -q "^$dir: " METADATA/plugindir.txt ; then
-	echo "$dir"/$(grep "^$dir: " METADATA/plugindir.txt | head -1 | sed 's/^[^:]*: //')
+    if grep -q "^$dir: " ${metadir}/plugindir.txt ; then
+	echo "${mydir}/../${dir}"/$(grep "^$dir: " ${metadir}/plugindir.txt | head -1 | sed 's/^[^:]*: //')
     fi
 }
 
@@ -340,7 +342,7 @@
 
 is_nondeterministic() {
     plugin_id="$1"
-    grep -q "^$id\$" METADATA/nondeterministic.txt
+    grep -q "^$id\$" ${metadir}/nondeterministic.txt
 }
 
 plugin_ids_in() {