Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
examples
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Iris
examples
Commits
92a20eb0
Commit
92a20eb0
authored
Sep 27, 2017
by
Ralf Jung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update build system; support Coq 8.7
parent
64ec23fe
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
11 deletions
+16
-11
.gitlab-ci.yml
.gitlab-ci.yml
+9
-3
awk.Makefile
awk.Makefile
+5
-6
opam
opam
+1
-1
theories/peritem.v
theories/peritem.v
+1
-1
No files found.
.gitlab-ci.yml
View file @
92a20eb0
...
...
@@ -13,7 +13,7 @@ variables:
# build
-
'
time
make
-k
-j$CPU_CORES
TIMED=y
2>&1
|
tee
build-log.txt'
-
'
if
fgrep
Axiom
build-log.txt
>/dev/null;
then
exit
1;
fi'
-
'
cat
build-log.txt
|
egrep
"[a-zA-Z0-9_/-]+
\(
user
:
[0-9]"
|
tee
build-time.txt'
-
'
cat
build-log.txt
|
egrep
"[a-zA-Z0-9_/-]+
\(
(real|user)
:
[0-9]"
|
tee
build-time.txt'
-
'
if
test
-n
"$VALIDATE"
&&
((
RANDOM
%
10
==
0
));
then
make
validate;
fi'
cache
:
key
:
"
coq.$COQ_VERSION-ssr.$SSR_VERSION"
...
...
@@ -23,12 +23,18 @@ variables:
-
master
-
/^ci/
iratomic-coq8.6.1
:
build-coq8.7
:
<<
:
*template
variables
:
COQ_VERSION
:
"
8.7.dev"
SSR_VERSION
:
"
dev"
build-coq8.6.1
:
<<
:
*template
variables
:
COQ_VERSION
:
"
8.6.1"
SSR_VERSION
:
"
1.6.1"
VALIDATE
:
1
VALIDATE
:
"
1"
artifacts
:
paths
:
-
build-time.txt
...
...
awk.Makefile
View file @
92a20eb0
...
...
@@ -19,17 +19,16 @@
next
}
#
Patch vio
2vo to (a) run "make quick" with the same number of jobs, ensuring
#
Add new target quick
2vo to (a) run "make quick" with the same number of jobs, ensuring
# that the .vio files are up-to-date, and (b) only schedule vio2vo for those
# files where the .vo is *older* than the .vio.
/^vio2vo:/ {
print "
vio
2vo:";
print "
quick
2vo:";
print "\t@make -j $(J) quick"
print "\t@VIOFILES=$$(for
file in $(VOFILES:%.vo=%.vio); do vofile=\"$$(echo \"$$file\" | sed \"s/\\.vio/.vo/\")\"; if [ \"$$vofile\" -ot \"$$file\" -o ! -e \"$$vofile\" ]; then echo -n \"$$
file \"; fi; done); \\"
print "\t@VIOFILES=$$(for
vofile in $(VOFILES); do viofile=\"$$(echo \"$$vofile\" | sed \"s/\\.vo/.vio/\")\"; if [ \"$$vofile\" -ot \"$$viofile\" -o ! -e \"$$vofile\" ]; then echo -n \"$$vio
file \"; fi; done); \\"
print "\t echo \"VIO2VO: $$VIOFILES\"; \\"
print "\t if [ -n \"$$VIOFILES\" ]; then $(COQC) $(COQDEBUG) $(COQFLAGS) -schedule-vio2vo $(J) $$VIOFILES; fi"
getline;
next
print "\t if [ -n \"$$VIOFILES\" ]; then $(TIMER) $(COQC) $(COQDEBUG) $(COQFLAGS) -schedule-vio2vo $(J) $$VIOFILES; fi"
print ".PHONY: quick2vo"
}
# This forwards all unchanged lines
...
...
opam
View file @
92a20eb0
...
...
@@ -9,5 +9,5 @@ build: [make "-j%{jobs}%"]
install: [make "install"]
remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/iris_atomic" ]
depends: [
"coq-iris" { (= "dev.2017-09-2
1.3
") | (= "dev") }
"coq-iris" { (= "dev.2017-09-2
7.1
") | (= "dev") }
]
theories/peritem.v
View file @
92a20eb0
...
...
@@ -47,7 +47,7 @@ Section proofs.
Lemma
new_bag_spec
:
{{{
True
}}}
new_stack
#()
{{{
s
,
RET
#
s
;
bag_inv
s
}}}.
Proof
.
iIntros
(
Φ
)
"HΦ"
.
iApply
wp_fupd
.
iIntros
(
Φ
)
"
_
HΦ"
.
iApply
wp_fupd
.
wp_seq
.
wp_bind
(
ref
NONE
)%
E
.
wp_alloc
l
as
"Hl"
.
wp_alloc
s
as
"Hs"
.
iAssert
((
∃
xs
,
is_bag_R
N
R
xs
s
))%
I
with
"[-HΦ]"
as
"Hxs"
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment