Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
lutin
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
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
verimag
synchrone
lutin
Commits
a7040a2c
Commit
a7040a2c
authored
May 18, 2018
by
erwan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not generate the opam file with aosis2opam anymore
parent
e85ae639
Pipeline
#7793
passed with stages
in 10 minutes and 57 seconds
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
65 additions
and
49 deletions
+65
-49
.gitlab-ci.yml
.gitlab-ci.yml
+3
-4
Makefile.dev
Makefile.dev
+7
-7
_oasis
_oasis
+1
-1
_opam
_opam
+0
-5
lutin/src/version.ml
lutin/src/version.ml
+2
-2
opam
opam
+52
-0
utils/fixopam_file.ml
utils/fixopam_file.ml
+0
-30
No files found.
.gitlab-ci.yml
View file @
a7040a2c
...
...
@@ -10,10 +10,10 @@ stages:
build
:
stage
:
build
script
:
-
sudo apt-get install -y libgmp-dev libmpfr-dev m4
-
opam repo add opam-ocaml-org "https://opam.ocaml.org"
-
opam repo add verimag-sync-repo "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository"
-
opam repo add verimag-sync-repo "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/
test/
opam-repository"
-
opam update
-
opam depext -y oasis camlidl mlgmpidl rdbg lustre-v6
-
opam install -y oasis camlidl mlgmpidl
-
opam install rdbg lustre-v6
-
make
...
...
@@ -25,6 +25,5 @@ test_opam_test:
-
opam repo add opam-ocaml-org "https://opam.ocaml.org"
-
opam repo add verimag-sync-repo "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/test/opam-repository"
-
opam update
-
opam depext -y mlgmpidl lutin
-
opam install -y lutin
Makefile.dev
View file @
a7040a2c
...
...
@@ -87,7 +87,7 @@ $(WWW)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
$(WWWTEST)/pool/$(PACKNAME).tgz
:
$(PACKNAME).tgz
mv
$^
$@
OPAM_FILE
=
$(
shell
find
$(WWW)
/opam-repository/packages
-name
opam
-cmin
-
1
|
sed
-e
's/^./\U&/'
)
OPAM_FILE
=
$(
shell
find
$(WWW)
/opam-repository/packages
-name
opam
-cmin
-
2
|
sed
-e
's/^./\U&/'
)
OPAM_FILE_TEST
=
$(
shell
find
$(WWWTEST)
/opam-repository/packages
-name
opam
-cmin
-1
|
sed
-e
's/^./\U&/'
)
OPAM_DIR
=
$(
shell
dirname
$(OPAM_FILE)
)
...
...
@@ -96,20 +96,20 @@ OFFICIAL_OPAM_DIR=/home/jahier/local/opam-repository/packages/lutin
opam
:
$(WWW)/pool/$(PACKNAME).tgz
cd
$(WWW)
/opam-repository/packages
&&
\
oasis2opam
$(HTTP)
/pool/
$(PACKNAME)
.tgz
&&
\
echo
"OPAM_FILE=
$(OPAM_FILE)
"
&&
\
cp
~/lurette/opam
$(OPAM_FILE)
&&
\
cd
..
;
opam-admin check
&&
opam-admin make
-g
&&
\
echo
'post-messages: ["A more up-to-date version can be obtained from (opam repo add) http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository/ "]'
>>
$(OPAM_FILE)
&&
\
cp
-rf
$(OPAM_DIR)
$(OFFICIAL_OPAM_DIR)
opam-test
:
$(WWWTEST)/pool/$(PACKNAME).tgz
cd
$(WWWTEST)
/opam-repository/packages
&&
\
oasis2opam
$(HTTPTEST)
/pool/
$(PACKNAME)
.tgz
&&
\
echo
"OPAM_FILE_TEST=
$(OPAM_FILE_TEST)
"
&&
\
cat
$(OPAM_FILE_TEST)
| ocaml
$(PWD)
/utils/fixopam_file.ml
>
$(OPAM_FILE_TEST)
-fixed
&&
\
cp
$(OPAM_FILE_TEST)
$(OPAM_FILE_TEST)
.save
&&
\
cp
$(OPAM_FILE_TEST)
-fixed
$(OPAM_FILE_TEST)
&&
\
cp
~/lurette/opam
$(OPAM_FILE_TEST)
&&
\
cd
..
;
opam-admin check
&&
opam-admin make
-g
opam-pr
:
cp
-rf
$(OPAM_DIR)
/home/jahier/local/opam-repository/packages/lutin/
.PHONY
:
install $(WWW)/pool/$(PACKNAME).tgz $(WWWTEST)/pool/$(PACKNAME).tgz
oi
:
install
or
:
reinstall
...
...
_oasis
View file @
a7040a2c
OASISFormat: 0.4
Name: Lutin
Version: 2.5
4
Version: 2.5
5
Authors: Erwan Jahier, Pascal Raymond, Bertrand Jeannnet (polka), Yvan Roux
Maintainers: erwan.jahier@univ-grenoble-alpes.fr
License: CeCILL
...
...
_opam
deleted
100644 → 0
View file @
e85ae639
depexts: [
[ ["alpine" ] ["perl" "gmp-dev" "mpfr-dev" "m4"] ]
[ ["debian" ] ["perl" "libgmp-dev" "libmpfr-dev" "m4"] ]
[ ["ubuntu" ] ["perl" "libgmp-dev" "libmpfr-dev" "m4"] ]
]
lutin/src/version.ml
View file @
a7040a2c
let
str
=
"2.5
4
"
let
sha
=
"
435841
3"
let
str
=
"2.5
5
"
let
sha
=
"
e85ae6
3"
opam
0 → 100644
View file @
a7040a2c
opam-version: "1.2"
maintainer: "erwan.jahier@univ-grenoble-alpes.fr"
authors: [ "Erwan Jahier"
"Pascal Raymond"
"Bertrand Jeannnet (polka)"
"Yvan Roux" ]
license: "CeCILL"
homepage: "http://www-verimag.imag.fr/Lutin.html"
dev-repo: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutin.git"
bug-reports: "http://www-verimag.imag.fr/Lutin.html"
tags: [ "clib:stdc" "clib:camlidl" ]
build: [
["oasis" "setup"]
["ocaml" "setup.ml" "-configure" "--prefix" prefix]
[make "build"]
]
install: [make "install"]
remove: [
["ocaml" "%{etc}%/Lutin/setup.ml" "-C" "%{etc}%/Lutin" "-uninstall"]
]
build-test: [
["oasis" "setup"]
["ocaml" "setup.ml" "-configure" "--enable-tests"]
["ocaml" "setup.ml" "-build"]
["ocaml" "setup.ml" "-test"]
]
build-doc: [ "ocaml" "setup.ml" "-doc" ]
depends: [
"conf-gmp"
"conf-perl" {build}
"base-unix" {build}
"num"
"camlidl"
"camlp4"
("extlib" {build} | "extlib-compat" {build})
"lustre-v6"
"lutils" {>= "1.9"}
"mlgmpidl"
("oasis" {build & >= "0.4.7"} | "oasis-mirage" {build & >= "0.4.7"})
"ocamlbuild" {build}
"ocamlfind"
"rdbg" {>= "1.170"}
]
available: [ ocaml-version >= "4.02" ]
depexts: [
[ ["alpine" ] ["perl" "gmp-dev" "mpfr-dev" "m4"] ]
[ ["centos" ] ["perl" "gmp-devel" "mpfr-devel" "m4"] ]
[ ["debian" ] ["perl" "libgmp-dev" "libmpfr-dev" "m4"] ]
[ ["ubuntu" ] ["perl" "libgmp-dev" "libmpfr-dev" "m4"] ]
]
post-messages: ["The last version can be obtained via (opam repo add) http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository/ "]
utils/fixopam_file.ml
deleted
100755 → 0
View file @
e85ae639
(* Time-stamp: <modified the 16/05/2018 (at 17:39) by Erwan Jahier> *)
(* Replace
build: [ * ]
by
build: [ ["make"] ]
*)
let
removing
=
ref
false
let
_
=
try
while
true
do
let
line
=
read_line
()
in
if
String
.
length
line
>
7
&&
String
.
sub
line
0
8
=
"install:"
then
print_string
"install: [
\"
make
\"
\"
install
\"
]
\n
"
else
if
!
removing
then
()
else
print_string
(
line
^
"
\n
"
);
if
String
.
length
line
>
5
&&
String
.
sub
line
0
6
=
"build:"
then
removing
:=
true
;
if
!
removing
&&
line
.
[
0
]
=
'
]
'
then
(
removing
:=
false
;
print_string
"
[
\"
opam
\"
\"
depext
\"
\"
-y
\"
\"
lutin
\"
]
[
\"
oasis
\"
\"
setup
\"
]
[
\"
ocaml
\"
\"
setup.ml
\"
\"
-configure
\"
\"
--prefix
\"
prefix]
[make
\"
build
\"
]
]
"
);
done
with
End_of_file
->
flush
stdout
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