Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Actris
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
tlsomers
Actris
Commits
6ed47dfe
Commit
6ed47dfe
authored
3 years ago
by
Ralf Jung
Browse files
Options
Downloads
Patches
Plain Diff
update makefile and iris
parent
3cc498a6
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+1
-1
1 addition, 1 deletion
.gitignore
Makefile
+39
-26
39 additions, 26 deletions
Makefile
coq-actris.opam
+7
-7
7 additions, 7 deletions
coq-actris.opam
with
47 additions
and
34 deletions
.gitignore
+
1
−
1
View file @
6ed47dfe
...
...
@@ -13,7 +13,7 @@
*.bak
.coqdeps.d
.coq-native/
build
-
dep/
builddep/
Makefile.coq
Makefile.coq.conf
.Makefile.coq.d
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
39
−
26
View file @
6ed47dfe
# Forward most targets to Coq makefile (with some trick to make this phony)
%
:
Makefile.coq phony
+@make
-f
Makefile.coq
$@
# Default target
all
:
Makefile.coq
+@
make
-f
Makefile.coq all
+@
$(
MAKE
)
-f
Makefile.coq all
.PHONY
:
all
# Permit local customization
-include
Makefile.local
# Forward most targets to Coq makefile (with some trick to make this phony)
%
:
Makefile.coq phony
@
#echo "Forwarding $@"
+@
$(
MAKE
)
-f
Makefile.coq
$@
phony
:
;
.PHONY
:
phony
clean
:
Makefile.coq
+@make
-f
Makefile.coq clean
find theories tests
\(
-name
"*.d"
-o
-name
"*.vo"
-o
-name
"*.aux"
-o
-name
"*.cache"
-o
-name
"*.glob"
-o
-name
"*.vio"
\)
-print
-delete
||
true
rm
-f
Makefile.coq .lia.cache
+@
$(
MAKE
)
-f
Makefile.coq clean
@
# Make sure not to enter the `_opam` folder.
find
[
a-z]
*
/
\(
-name
"*.d"
-o
-name
"*.vo"
-o
-name
"*.vo[sk]"
-o
-name
"*.aux"
-o
-name
"*.cache"
-o
-name
"*.glob"
-o
-name
"*.vio"
\)
-print
-delete
||
true
rm
-f
Makefile.coq .lia.cache builddep/
*
.PHONY
:
clean
# Create Coq Makefile.
Makefile.coq
:
_CoqProject Makefile
"
$(
COQBIN
)
coq_makefile"
-f
_CoqProject
-o
Makefile.coq
"
$(
COQBIN
)
coq_makefile"
-f
_CoqProject
-o
Makefile.coq
$(
EXTRA_COQFILES
)
# Install build-dependencies
build-dep/opam
:
opam Makefile
@
echo
"# Creating build-dep package."
@
mkdir
-p
build-dep
@
sed
<opam
-E
's/^(build|install|remove):.*/\1: []/; s/^name: *"(.*)" */name: "\1-builddep"/'
>
build-dep/opam
@
fgrep builddep build-dep/opam
>
/dev/null
||
(
echo
"sed failed to fix the package name"
&&
exit
1
)
# sanity check
build-dep
:
build-dep/opam phony
@
# We want opam to not just instal the build-deps now, but to also keep satisfying these
OPAMFILES
=
$(
wildcard
*
.opam
)
BUILDDEPFILES
=
$(
addsuffix
-builddep
.opam,
$(
addprefix builddep/,
$(
basename
$(
OPAMFILES
))))
builddep/%-builddep.opam
:
%.opam Makefile
@
echo
"# Creating builddep package for
$<
."
@
mkdir
-p
builddep
@
sed
<
$<
-E
's/^(build|install|remove):.*/\1: []/; s/"(.*)"(.*= *version.*)$$/"\1-builddep"\2/;'
>
$@
builddep-opamfiles
:
$(BUILDDEPFILES)
.PHONY
:
builddep-opamfiles
builddep
:
builddep-opamfiles
@
# We want opam to not just install the build-deps now, but to also keep satisfying these
@
# constraints. Otherwise, `opam upgrade` may well update some packages to versions
@
# 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
"# Installing build-dep package."
@
opam
install
$(
OPAMFLAGS
)
build-dep/
@
echo
"# Installing builddep packages."
@
opam
install
$(
OPAMFLAGS
)
$(
BUILDDEPFILES
)
.PHONY
:
builddep
# Some files that do *not* need to be forwarded to Makefile.coq
Makefile
:
;
_CoqProject
:
;
opam
:
;
# Backwards compatibility target
build-dep
:
builddep
.PHONY
:
build-dep
#
Phony wildcard targets
phony
:
;
.PHONY
:
phony
#
Some files that do *not* need to be forwarded to Makefile.coq.
# ("::" lets Makefile.local overwrite this.)
Makefile Makefile.local _CoqProject $(OPAMFILES)
::
;
This diff is collapsed.
Click to expand it.
opam
→
coq-actris.
opam
+
7
−
7
View file @
6ed47dfe
opam-version: "1.2"
name: "coq-actris"
opam-version: "2.0"
maintainer: "Robbert Krebbers"
authors: "Jonas Kastberg Hinrichsen, Daniël Louwrink, Jesper Bengtson, Robbert Krebbers"
license: "BSD"
bug-reports: "https://gitlab.mpi-sws.org/iris/actris/issues"
dev-repo: "https://gitlab.mpi-sws.org/iris/actris.git"
build: [make "-j%{jobs}%"]
install: [make "install"]
remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/actris" ]
dev-repo: "git+https://gitlab.mpi-sws.org/iris/actris.git"
depends: [
"coq-iris-heap-lang" { (= "dev.2021-12-0
8
.1.
8699ad5
a") | (= "dev") }
"coq-iris-heap-lang" { (= "dev.2021-12-0
9
.1.
f52f9f6
a") | (= "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