Mercurial > hg > sonic-visualiser
changeset 1719:1f4fb4a0f62a vext
Merge from branch output-type-uri
author | Chris Cannam |
---|---|
date | Tue, 27 Jun 2017 11:30:50 +0100 (2017-06-27) |
parents | e64981b88943 (current diff) 434be2f0509e (diff) |
children | 3505d9536367 |
files | |
diffstat | 3 files changed, 20 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/vext Tue Jun 20 11:44:32 2017 +0100 +++ b/vext Tue Jun 27 11:30:50 2017 +0100 @@ -16,13 +16,13 @@ # preference is based on startup speed. if [ -z "$sml" ]; then + if sml -h 2>&1 | grep -q 'Standard ML of New Jersey'; then + sml="smlnj" # I think there may be a race condition in the poly interpreter's # tests for open or closed I/O streams - without the "echo" here, # or with stderr redirection, this pipeline will sometimes hang - if echo | poly -v 2>/dev/null | grep -q 'Poly/ML'; then + elif echo | poly -v 2>/dev/null | grep -q 'Poly/ML'; then sml="poly" - elif sml -h 2>&1 | grep -q 'Standard ML of New Jersey'; then - sml="smlnj" elif mlton 2>&1 | grep -q 'MLton'; then sml="mlton" else cat 1>&2 <<EOF @@ -35,17 +35,16 @@ compiler or interpreter to run. Please ensure you have one of the following SML implementations - installed and present in your PATH, and try again. These are listed - approximately in order of preference for this task. + installed and present in your PATH, and try again. - 1. Poly/ML + 1. Standard ML of New Jersey + - often found in a distribution package called: smlnj + - executable name: sml + + 2. Poly/ML - often found in a distribution package called: polyml - executable name: poly - 2. Standard ML of New Jersey - - often found in a distribution package called: smlnj - - executable name: sml - 3. MLton - often found in a distribution package called: mlton - executable name: mlton
--- a/vext-lock.json Tue Jun 20 11:44:32 2017 +0100 +++ b/vext-lock.json Tue Jun 27 11:30:50 2017 +0100 @@ -16,22 +16,22 @@ "pin": "cf18645ff411" }, "piper-cpp": { - "pin": "adb1f9a4b8b849e418c12038abc294f92bcd18a7" + "pin": "878fec0491e31f37e02438c1e152df30e61c7fc4" }, "dataquay": { - "pin": "3768bdde6fdf" + "pin": "807b55408d9e" }, "bqvec": { - "pin": "ddbf6d836efb" + "pin": "e345a5e32c53" }, "bqfft": { - "pin": "fb508f7cdcdc" + "pin": "81b50ec12d9a" }, "bqresample": { - "pin": "a867fff0963d" + "pin": "39a30cdbb421" }, "bqaudioio": { - "pin": "692c02f29c99" + "pin": "d90244c003be" }, "sv-dependency-builds": { "pin": "eccd51b72864"
--- a/vext.sml Tue Jun 20 11:44:32 2017 +0100 +++ b/vext.sml Tue Jun 27 11:30:50 2017 +0100 @@ -33,7 +33,7 @@ Software without prior written authorization. *) -val vext_version = "0.9.0" +val vext_version = "0.9.1" datatype vcs = @@ -1271,10 +1271,10 @@ else case git_command_output context libname ["rev-list", "-1", id_or_tag] of - ERROR e => ERROR e - | OK tid => - OK (tid = id andalso - tid <> id_or_tag) (* else id_or_tag was id not tag *) + ERROR e => OK false (* id_or_tag is not an id or tag, but + that could just mean it hasn't been + fetched *) + | OK tid => OK (tid = id) fun branch_tip context (libname, branch) = git_command_output context libname