Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lustre-v6
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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
verimag
synchrone
lustre-v6
Commits
15ee22b5
Commit
15ee22b5
authored
9 years ago
by
Erwan Jahier
Browse files
Options
Downloads
Patches
Plain Diff
Better msgs if the workflow described in "Makefile.dev" is violated.
parent
11223b59
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.dev
+13
-5
13 additions, 5 deletions
Makefile.dev
_oasis
+1
-1
1 addition, 1 deletion
_oasis
src/lv6version.ml
+2
-2
2 additions, 2 deletions
src/lv6version.ml
with
16 additions
and
8 deletions
Makefile.dev
+
13
−
5
View file @
15ee22b5
...
...
@@ -29,6 +29,7 @@ test:
# 1 -U-> 0
# to implement such a workflow, C puts a lock (state 1) and U removes it (state 0)
uv
:
update_version
update_version
:
rm
-f
src/lv6version.ml
make src/lv6version.ml
...
...
@@ -38,10 +39,14 @@ update_version:
make clean
&&
make
cia
:
test
-f
committed
||
(
git commit
-a
-F
log
&&
touch
committed
)
test
-f
committed
&&
\
echo
"*** I won't commit!
\n
*** until you 'make update_version'!"
\
||
(
git commit
-a
-F
log
&&
touch
committed
)
ci
:
test
-f
committed
||
(
git commit
-F
log
&&
touch
committed
)
test
-f
committed
&&
\
echo
"*** I won't commit!
\n
*** until you 'make update_version'!"
\
||
(
git commit
-F
log
&&
touch
committed
)
amend
:
test
-f
committed
&&
git commit
-a
-F
log
--amend
...
...
@@ -71,8 +76,11 @@ $(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
mv
$^
$@
opam
:
$(WWW)/pool/$(PACKNAME).tgz
cd
$(
WWW
)
/opam-repository/packages
&&
\
oasis2opam
$(
HTTP
)
/pool/
$(
PACKNAME
)
.tgz
&&
\
cd
..
;
opam-admin check
&&
opam-admin make
-g
test
-f
committed
&&
(
\
cd
$(
WWW
)
/opam-repository/packages
&&
\
oasis2opam
$(
HTTP
)
/pool/
$(
PACKNAME
)
.tgz
&&
\
cd
..
;
opam-admin check
&&
opam-admin make
-g
\
)
||
echo
"*** I won't make an opam package
\n
*** until you commit something!"
This diff is collapsed.
Click to expand it.
_oasis
+
1
−
1
View file @
15ee22b5
OASISFormat: 0.4
Name: lustre-v6
Version: 1.63
2
Version: 1.63
3
Synopsis: The Lustre V6 Verimag compiler
Description: This package contains:
- lus2lic: the (current) name of the compiler (and interpreter via -exec).
...
...
This diff is collapsed.
Click to expand it.
src/lv6version.ml
+
2
−
2
View file @
15ee22b5
(** Automatically generated from Makefile *)
let
tool
=
"lus2lic"
let
branch
=
"master"
let
commit
=
"63
2
"
let
sha_1
=
"
ebeb303ab2867235869666e671600c955c8d887f
"
let
commit
=
"63
3
"
let
sha_1
=
"
11223b59a86e6a35ef5c04f33a1b7d1710eb8bd8
"
let
str
=
(
branch
^
"."
^
commit
^
" ("
^
sha_1
^
")"
)
let
maintainer
=
"jahier@imag.fr"
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