Merge branch 'master' of https://github.com/GrammaticalFramework/gf-core

11 files changed, 26 insertions, 67 deletions

diff --git a/.gitignore b/.gitignore
index 6025f5a4b..0ee62cfb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,8 @@ cabal.sandbox.config
 .stack-work
 DATA_DIR
 
+stack*.yaml.lock
+
 # Generated documentation (not exhaustive)
 demos/index-numbers.html
 demos/resourcegrammars.html
diff --git a/src/www/minibar/minibar.js b/src/www/minibar/minibar.js
index 6822e7926..944d4d93b 100644
--- a/src/www/minibar/minibar.js
+++ b/src/www/minibar/minibar.js
@@ -220,7 +220,7 @@ Minibar.prototype.get_pgf_info=function() {
 Minibar.prototype.show_pgf_info=function(info) {
     var t=this;
     var cnt=0;
-    console.log(info)
+    //console.log(info)
     info=info.split("\n");
     for(var i=0;i<info.length;i++) {
 	if(info[i]=="") info[i]="<p>"
@@ -270,6 +270,12 @@ Minibar.prototype.show_grammarinfo=function() {
     
     var info=empty("div")
     if(t.pgf_info) info.innerHTML=t.pgf_info
+    if(true || /^\/(tmp|grammars)\//.test(server.grammars_url)) {
+	var q="?"+server.grammars_url+" "+server.current_grammar_url
+	var link=node("a",{href:q})
+	link.appendChild(text(link.href));
+	info.appendChild(wrap("p",[text("Link directly to this grammar: "),link]))
+    }
 
     clear(t.translations.main)
     var hdr=[text(g.name)]
diff --git a/src/www/minibar/minibar_online.js b/src/www/minibar/minibar_online.js
index 8ff10f7fb..0d7792e9d 100644
--- a/src/www/minibar/minibar_online.js
+++ b/src/www/minibar/minibar_online.js
@@ -21,7 +21,7 @@ var minibar_options= {
     try_google: true
 }
 
-if(/^\?\/tmp\//.test(location.search)) {
+if(/^\?\/(tmp|grammars)\//.test(location.search)) {
     var args=decodeURIComponent(location.search.substr(1)).split(" ")
     if(args[0]) online_options.grammars_url=args[0];
     if(args[1]) minibar_options.initial_grammar=args[1];
diff --git a/stack-ghc7.10.3.yaml b/stack-ghc7.10.3.yaml
index b374243e5..a64e4e614 100644
--- a/stack-ghc7.10.3.yaml
+++ b/stack-ghc7.10.3.yaml
@@ -1,11 +1 @@
 resolver: lts-6.35 # ghc 7.10.3
-
-packages:
-- . # GF, PGF
-- src/runtime/haskell-bind # PGF2 (requires C runtime to be installed)
-
-extra-deps:
-
-flags:
-  gf:
-    server: true
diff --git a/stack-ghc8.0.2.yaml b/stack-ghc8.0.2.yaml
index ee8bd7414..af08206d9 100644
--- a/stack-ghc8.0.2.yaml
+++ b/stack-ghc8.0.2.yaml
@@ -1,11 +1 @@
 resolver: lts-9.21 # ghc 8.0.2
-
-packages:
-- . # GF, PGF
-- src/runtime/haskell-bind # PGF2 (requires C runtime to be installed)
-
-extra-deps:
-
-flags:
-  gf:
-    server: true
diff --git a/stack-ghc8.2.2.yaml b/stack-ghc8.2.2.yaml
index 5b8546ae4..c33c53b33 100644
--- a/stack-ghc8.2.2.yaml
+++ b/stack-ghc8.2.2.yaml
@@ -1,14 +1,6 @@
 resolver: lts-11.22 # ghc 8.2.2
 
-packages:
-- . # GF, PGF
-- src/runtime/haskell-bind # PGF2 (requires C runtime to be installed)
-
 extra-deps:
-- cgi-3001.3.0.2
+- cgi-3001.3.0.3
 - httpd-shed-0.4.0.3
-- time-1.6.0.1 # cgi-3001.3.0.2: time-1.8.0.2 from stack configuration does not match >=1.5 && <1.7
-
-flags:
-  gf:
-    server: true
+- exceptions-0.10.2
diff --git a/stack-ghc8.4.3.yaml b/stack-ghc8.4.3.yaml
deleted file mode 100644
index 07be023df..000000000
--- a/stack-ghc8.4.3.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-resolver: lts-12.14 # ghc 8.4.3
-
-packages:
-- . # GF, PGF
-- src/runtime/haskell-bind # PGF2 (requires C runtime to be installed)
-
-extra-deps:
-- cgi-3001.3.0.3
-
-flags:
-  gf:
-    server: true
diff --git a/stack-ghc8.4.4.yaml b/stack-ghc8.4.4.yaml
new file mode 100644
index 000000000..c1a68e2d5
--- /dev/null
+++ b/stack-ghc8.4.4.yaml
@@ -0,0 +1,4 @@
+resolver: lts-12.26 # ghc 8.4.4
+
+extra-deps:
+- cgi-3001.3.0.3
diff --git a/stack-ghc8.6.2.yaml b/stack-ghc8.6.2.yaml
deleted file mode 100644
index 12eebe0d9..000000000
--- a/stack-ghc8.6.2.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-resolver: nightly-2018-12-04 # ghc 8.6.2
-
-packages:
-- . # GF, PGF
-- src/runtime/haskell-bind # PGF2 (requires C runtime to be installed)
-
-extra-deps:
-- json-0.9.2
-- network-2.6.3.6
-
-flags:
-  gf:
-    server: true
diff --git a/stack-ghc8.6.5.yaml b/stack-ghc8.6.5.yaml
new file mode 100644
index 000000000..0f98f8dfc
--- /dev/null
+++ b/stack-ghc8.6.5.yaml
@@ -0,0 +1,5 @@
+resolver: lts-14.3 # ghc 8.6.5
+
+extra-deps:
+- network-2.6.3.6
+- httpd-shed-0.4.0.3
diff --git a/stack.yaml b/stack.yaml
index 5b8546ae4..59e36c4fa 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,14 +1,9 @@
-resolver: lts-11.22 # ghc 8.2.2
+# This default stack file is a copy of stack-ghc8.2.2.yaml
+# But committing a symlink is probably a bad idea, so it's a real copy
 
-packages:
-- . # GF, PGF
-- src/runtime/haskell-bind # PGF2 (requires C runtime to be installed)
+resolver: lts-11.22 # ghc 8.2.2
 
 extra-deps:
-- cgi-3001.3.0.2
+- cgi-3001.3.0.3
 - httpd-shed-0.4.0.3
-- time-1.6.0.1 # cgi-3001.3.0.2: time-1.8.0.2 from stack configuration does not match >=1.5 && <1.7
-
-flags:
-  gf:
-    server: true
+- exceptions-0.10.2