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
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
Simon Spies
lambda-rust
Commits
7594024f
Commit
7594024f
authored
8 years ago
by
Ralf Jung
Committed by
Jacques-Henri Jourdan
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
update buildsystem
parent
052d9f00
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
+3
-11
3 additions, 11 deletions
Makefile
_CoqProject
+1
-0
1 addition, 0 deletions
_CoqProject
build/opam-pins.sh
+7
-2
7 additions, 2 deletions
build/opam-pins.sh
with
11 additions
and
13 deletions
Makefile
+
3
−
11
View file @
7594024f
...
...
@@ -3,14 +3,6 @@ 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
?=
ifeq
($(COQ_VERSION), 8.6)
COQ_MAKEFILE_FLAGS
+=
-arg
-w
-arg
-notation-overridden
,-redundant-canonical-projection,-several-object-files
endif
# Forward most targets to Coq makefile (with some trick to make this phony)
%
:
Makefile.coq phony
+@make
-f
Makefile.coq
$@
...
...
@@ -32,9 +24,9 @@ Makefile.coq: _CoqProject Makefile awk.Makefile
build-dep
:
build/opam-pins.sh < opam.pins
opam upgrade
$(
YFLAG
)
# it is not nice that we upgrade *all* packages here, but I found no nice way to upgrade only those that we pinned
opam pin add
coq-lambda-rust
"
$$(
pwd
)
#HEAD"
-k
git
-n
-y
opam
install
coq-lambda-rust
--deps-only
$(
YFLAG
)
opam pin remove
coq-lambda-rust
opam pin add
opam-builddep-temp
"
$$(
pwd
)
#HEAD"
-k
git
-n
-y
opam
install
opam-builddep-temp
--deps-only
$(
YFLAG
)
opam pin remove
opam-builddep-temp
# Some files that do *not* need to be forwarded to Makefile.coq
Makefile
:
;
...
...
This diff is collapsed.
Click to expand it.
_CoqProject
+
1
−
0
View file @
7594024f
-Q theories lrust
-arg -w -arg -notation-overridden,-redundant-canonical-projection,-several-object-files
theories/lifetime/model/definitions.v
theories/lifetime/model/faking.v
theories/lifetime/model/creation.v
...
...
This diff is collapsed.
Click to expand it.
build/opam-pins.sh
+
7
−
2
View file @
7594024f
...
...
@@ -4,18 +4,23 @@ set -e
## Usage:
## ./opam-pins.sh < opam.pins
if
!
which curl
;
then
echo
"opam-pins needs curl. Please install curl and try again."
exit
1
fi
# Process stdin
while
read
PACKAGE URL HASH
;
do
if
echo
"
$URL
"
| egrep
'^https://gitlab\.mpi-sws\.org'
>
/dev/null
;
then
echo
"[opam-pins] Recursing into
$URL
"
# an MPI URL -- try doing recursive pin processing
curl
-f
"
$URL
/raw/
$HASH
"
2>
/dev/null |
"
$0
"
curl
-f
"
$URL
/raw/
$HASH
/opam.pins
"
2>/dev/null |
"
$0
"
fi
if
opam pin list | fgrep
"
$PACKAGE
.dev.
$HASH
"
>
/dev/null
;
then
echo
"[opam-pins]
$PACKAGE
already at commit
$HASH
"
else
echo
"[opam-pins] Applying pin:
$PACKAGE
->
$URL
#
$HASH
"
opam pin add
"
$PACKAGE
.dev.
$HASH
"
"
$URL
#
$HASH
"
-k
git
-y
-n
echo
fi
echo
done
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