Mercurial > hg > piper-vamp-js-builds
changeset 51:2b8cd2b8cfc0
Update vext; providers -> services
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Wed, 28 Jun 2017 13:27:12 +0100 |
| parents | ec5b5a9adac2 |
| children | ce1f0e2a1f75 |
| files | vext-project.json vext.sml |
| diffstat | 2 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/vext-project.json Wed Jun 28 10:49:26 2017 +0100 +++ b/vext-project.json Wed Jun 28 13:27:12 2017 +0100 @@ -2,7 +2,7 @@ "config": { "extdir": "ext" }, - "providers": { + "services": { "soundsoftware": { "vcs": ["hg", "git"], "anon": "https://code.soundsoftware.ac.uk/{vcs}/{repo}",
--- a/vext.sml Wed Jun 28 10:49:26 2017 +0100 +++ b/vext.sml Wed Jun 28 13:27:12 2017 +0100 @@ -33,7 +33,7 @@ Software without prior written authorization. *) -val vext_version = "0.9.1" +val vext_version = "0.9.2" datatype vcs = @@ -41,8 +41,8 @@ GIT datatype source = - URL of string | - PROVIDER of { + URL_SOURCE of string | + SERVICE_SOURCE of { service : string, owner : string option, repo : string option @@ -986,10 +986,10 @@ } } val loaded = - case lookup_optional json ["providers"] of + case lookup_optional json ["services"] of NONE => [] | SOME (Json.OBJECT pl) => map (fn (k, v) => load v k) pl - | _ => raise Fail "Object expected for providers in config" + | _ => raise Fail "Object expected for services in config" val newly_loaded = List.filter (fn p => not (List.exists (fn pp => #service p = #service pp) @@ -1069,8 +1069,8 @@ fun remote_url (context : context) vcs source libname = case source of - URL u => u - | PROVIDER { service, owner, repo } => + URL_SOURCE u => u + | SERVICE_SOURCE { service, owner, repo } => provider_url { vcs = vcs, service = service, owner = owner, @@ -1387,9 +1387,9 @@ | other => raise Fail ("Unknown version-control system \"" ^ other ^ "\""), source = case (url, service, owner, repo) of - (SOME u, NONE, _, _) => URL u + (SOME u, NONE, _, _) => URL_SOURCE u | (NONE, SOME ss, owner, repo) => - PROVIDER { service = ss, owner = owner, repo = repo } + SERVICE_SOURCE { service = ss, owner = owner, repo = repo } | _ => raise Fail ("Must have exactly one of service " ^ "or url string"), pin = case lock_pin of