opam installation fixes

uwplse · Jan 13, 2017 · 39cbbc1 · 39cbbc1
1 parent ce7d126
commit 39cbbc1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,6 @@ env:
     - COQ_VERSION=8.5.3
     - SSREFLECT_VERSION=1.6
     - VERDI_RAFT_BRANCH=master
-    - STRUCTTACT_BRANCH=master
   matrix:
     - DOWNSTREAM=none
 before_install:

diff --git a/opam b/opam
@@ -11,7 +11,7 @@ build: [
   [ make "-j%{jobs}%" ]
 ]
 install: [ make "install" ]
-remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/Verdi" ]
+remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/Verdi'" ]
 depends: [
   "coq" {>= "8.5" & < "8.6~"}
   "coq-mathcomp-ssreflect" {>= "1.6"}

diff --git a/script/coqproject.sh b/script/coqproject.sh
@@ -24,7 +24,11 @@ function dep_dirs_lines(){
       namespace_var=${namespace_var//-/_}
       namespace_var=${namespace_var//./_}
       namespace=${!namespace_var:=$2}
-      LINE="-Q $1/$dep_dir/ $namespace"
+      if [ $dep_dir = "." ]; then
+        LINE="-Q $1 $namespace"
+      else
+	LINE="-Q $1/$dep_dir $namespace"
+      fi
       echo $LINE >> $COQPROJECT_TMP
   done
 }
@@ -66,7 +70,7 @@ for dir in ${DIRS[@]}; do
     namespace_var=${namespace_var//-/_}
     namespace_var=${namespace_var//./_}
     namespace=${!namespace_var:="\"\""}
-    LINE="-Q $dir/ $namespace"
+    LINE="-Q $dir $namespace"
     echo $LINE >> $COQPROJECT_TMP
 done