Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lambda-rust
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
Daniël Louwrink
lambda-rust
Commits
cad70685
Commit
cad70685
authored
8 years ago
by
Jacques-Henri Jourdan
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of gitlab.mpi-sws.org:FP/LambdaRust-coq
parents
6487f788
44116b68
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
+12
-2
12 additions, 2 deletions
Makefile
build/opam-ci.sh
+1
-1
1 addition, 1 deletion
build/opam-ci.sh
with
13 additions
and
3 deletions
Makefile
+
12
−
2
View file @
cad70685
# Process flags
ifeq
($(Y), 1)
YFLAG
=
-y
endif
# Determine Coq version
COQ_VERSION
=
$(
shell coqc
--version
| egrep
-o
'version 8.[0-9]'
| egrep
-o
'8.[0-9]'
)
COQ_MAKEFILE_FLAGS
?=
...
...
@@ -28,8 +33,13 @@ Makefile.coq: _CoqProject Makefile
# Install build-dependencies
build-dep
:
cat
opam.pins | build/opam-pins.sh
opam pin add coq-lambda-rust
"
$$(
pwd
)
#HEAD"
-k
git
-y
-n
opam
install
coq-lambda-rust
--deps-only
-y
opam upgrade
$(
YFLAG
)
opam pin add coq-lambda-rust
"
$$(
pwd
)
#HEAD"
-k
git
-n
-y
opam
install
coq-lambda-rust
--deps-only
$(
YFLAG
)
# some fiels that do *not* need to be forwarded to Makefile.coq
Makefile
:
;
_CoqProject
:
;
# Phony targets (i.e. targets that should be run no matter the timestamps of the involved files)
phony
:
;
...
...
This diff is collapsed.
Click to expand it.
build/opam-ci.sh
+
1
−
1
View file @
cad70685
...
...
@@ -27,7 +27,7 @@ done
# Install/upgrade build-dependencies
echo
opam upgrade
-y
make build-dep
make build-dep
Y
=
1
# done
echo
...
...
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