Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Iris
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Roux
Iris
Commits
4fc1ca8b
Commit
4fc1ca8b
authored
5 years ago
by
Ralf Jung
Browse files
Options
Downloads
Patches
Plain Diff
upgrade opam file to opam 2
parent
1d977b49
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+2
-8
2 additions, 8 deletions
Makefile
descr
+0
-1
0 additions, 1 deletion
descr
opam
+8
-6
8 additions, 6 deletions
opam
with
10 additions
and
15 deletions
Makefile
+
2
−
8
View file @
4fc1ca8b
...
...
@@ -29,14 +29,8 @@ build-dep: build-dep/opam phony
@
# that are incompatible with our build requirements.
@
# To achieve this, we create a fake opam package that has our build-dependencies as
@
# dependencies, but does not actually install anything itself.
@
echo
"# Pinning build-dep package."
&&
\
if
opam
--version
|
grep
"^1
\.
"
-q
;
then
\
BUILD_DEP_PACKAGE
=
"
$$(
egrep "
^name:
" build-dep/opam | sed 's/^name: *"
\(
.
*
\)
" */
\1
/'
)
"
&&
\
opam pin add
-k
path
$(
OPAMFLAGS
)
"
$$
BUILD_DEP_PACKAGE"
.dev build-dep
&&
\
opam reinstall
$(
OPAMFLAGS
)
"
$$
BUILD_DEP_PACKAGE"
;
\
else
\
opam
install
$(
OPAMFLAGS
)
build-dep/
;
\
fi
@
echo
"# Installing build-dep package."
@
opam
install
$(
OPAMFLAGS
)
build-dep/
# Some files that do *not* need to be forwarded to Makefile.coq
Makefile
:
;
...
...
This diff is collapsed.
Click to expand it.
descr
deleted
100644 → 0
+
0
−
1
View file @
1d977b49
This is the Coq development of the Iris Project.
This diff is collapsed.
Click to expand it.
opam
+
8
−
6
View file @
4fc1ca8b
opam-version: "
1.2
"
opam-version: "
2.0
"
name: "coq-iris"
synopsis: "This is the Coq development of the Iris Project"
maintainer: "Ralf Jung <jung@mpi-sws.org>"
authors: "The Iris Team"
homepage: "http://iris-project.org/"
bug-reports: "https://gitlab.mpi-sws.org/iris/iris/issues"
dev-repo: "git+https://gitlab.mpi-sws.org/iris/iris.git"
license: "BSD"
dev-repo: "https://gitlab.mpi-sws.org/iris/iris.git"
build: [make "-j%{jobs}%"]
install: [make "install"]
remove: ["rm" "-rf" "%{lib}%/coq/user-contrib/iris"]
synopsis: "This is the Coq development of the Iris Project"
depends: [
"ocaml"
"coq" { (= "8.8.2") | (>= "8.9.1" & < "8.12~") | (= "dev") }
"coq-stdpp" { (= "dev.2019-11-22.2.16eb222f") | (= "dev") }
]
build: [make "-j%{jobs}%"]
install: [make "install"]
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment