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
2dfe7acb
Commit
2dfe7acb
authored
Oct 15, 2018
by
Erwan Jahier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some opam fix
parent
ad57bc8e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
4 deletions
+11
-4
Makefile.dev
Makefile.dev
+7
-1
_oasis
_oasis
+1
-1
lutin/src/version.ml
lutin/src/version.ml
+2
-2
opam
opam
+1
-0
No files found.
Makefile.dev
View file @
2dfe7acb
...
...
@@ -107,12 +107,18 @@ opam : $(WWW)/pool/$(PACKNAME).tgz
cd
..
;
opam-admin check
&&
opam-admin make
-g
&&
\
cp
-rf
$(OPAM_DIR)
$(OFFICIAL_OPAM_DIR)
# if the following rule fails, it migth be necessary to do:
# cp opam.diff opam.diff.exp
# The idea is that oasis2opam correctly track dependancies, but
# generate a wrong opam file. Hence, I diff opam.diff.exp and opam.diff
# to make sure that my "manual" opam file does not miss a dep
opam-test
:
$(WWWTEST)/pool/$(PACKNAME).tgz
cd
$(WWWTEST)
/opam-repository/packages
&&
\
oasis2opam
$(HTTPTEST)
/pool/
$(PACKNAME)
.tgz
&&
\
cp
$(OPAM_FILE_TEST)
$(PWD)
/opam.oasis2opam
&&
\
diff
-u
$(PWD)
/opam.oasis2opam
$(PWD)
/opam |
\
grep
-v
opam.oasis2opam
>
$(PWD)
/opam.diff
&&
\
grep
-v
opam.oasis2opam
|
grep
-v
"+++"
>
$(PWD)
/opam.diff
&&
\
diff
$(PWD)
/opam.diff
$(PWD)
/opam.diff.exp
&&
\
cp
$(PWD)
/opam
$(OPAM_FILE_TEST)
||
\
(
echo
"The opam file needs some update"
;
exit
2
)
&&
\
...
...
_oasis
View file @
2dfe7acb
OASISFormat: 0.4
Name: Lutin
Version: 2.6
0
Version: 2.6
1
Authors: Erwan Jahier, Pascal Raymond, Bertrand Jeannnet (polka), Yvan Roux
Maintainers: erwan.jahier@univ-grenoble-alpes.fr
License: CeCILL
...
...
lutin/src/version.ml
View file @
2dfe7acb
let
str
=
"2.6
0
"
let
sha
=
"
f5332350
"
let
str
=
"2.6
1
"
let
sha
=
"
ad57bc8e
"
opam
View file @
2dfe7acb
...
...
@@ -26,6 +26,7 @@ build-test: [
]
build-doc: [ "ocaml" "setup.ml" "-doc" ]
depends: [
"base-bigarray"
"conf-gmp"
"conf-perl" {build}
"base-unix" {build}
...
...
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