Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
string-ident
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
Iris
string-ident
Commits
98988655
Commit
98988655
authored
5 years ago
by
Ralf Jung
Browse files
Options
Downloads
Patches
Plain Diff
adjust Makefile and opam file for consistency with other projects
parent
4410c1d3
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+35
-9
35 additions, 9 deletions
Makefile
opam
+3
-3
3 additions, 3 deletions
opam
with
38 additions
and
12 deletions
Makefile
+
35
−
9
View file @
98988655
# Forward most targets to Coq makefile (with some trick to make this phony)
%
:
Makefile.coq phony
+@make
-f
Makefile.coq
$@
all
:
Makefile.coq
@
+
$(
MAKE
)
-f
Makefile.coq all
+@make
-f
Makefile.coq all
.PHONY
:
all
clean
:
Makefile.coq
@
+
$(
MAKE
)
-f
Makefile.coq cleanall
@
rm
-f
Makefile.coq Makefile.coq.conf
+@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
.PHONY
:
clean
# Create Coq Makefile.
Makefile.coq
:
_CoqProject Makefile
"
$(
COQBIN
)
coq_makefile"
-f
_CoqProject
-o
Makefile.coq
Makefile.coq
:
_CoqProject
$(
COQBIN
)
coq_makefile
-f
_CoqProject
-o
Makefile.coq
# 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
force _CoqProject Makefile
:
;
build-dep
:
build-dep/opam phony
@
# We want opam to not just instal 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/
%
:
Makefile.coq force
@
+
$(
MAKE
)
-f
Makefile.coq
$@
# Some files that do *not* need to be forwarded to Makefile.coq
Makefile
:
;
_CoqProject
:
;
opam
:
;
.PHONY
:
all clean force
\ No newline at end of file
# Phony wildcard targets
phony
:
;
.PHONY
:
phony
This diff is collapsed.
Click to expand it.
opam
+
3
−
3
View file @
98988655
...
...
@@ -10,12 +10,12 @@ version: "dev"
synopsis: "Add support for Gallina names in intro patterns to the Iris Proof Mode"
description: """
This package implements string_to_ident in Ltac2, enabling support for Gallina names in Iris intro patterns (within strings)."""
This package implements string_to_ident in Ltac2, enabling support for Gallina names in Iris intro patterns (within strings).
"""
depends: [
"ocaml" {>= "4.05.0"}
"coq" {>= "8.11"}
"coq-iris"
{ (= "dev.2020-03-23.0.3a0d7152") | (= "dev") }
"coq-iris"
]
build: [make "-j%{jobs}%"]
...
...
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