Skip to content

Update external dependencies to dose 3.2-rc1 and ocamlgraph 1.8.5#1336

Merged
AltGr merged 12 commits intoocaml:masterfrom
rdicosmo:dose-trunk
May 6, 2014
Merged

Update external dependencies to dose 3.2-rc1 and ocamlgraph 1.8.5#1336
AltGr merged 12 commits intoocaml:masterfrom
rdicosmo:dose-trunk

Conversation

@rdicosmo
Copy link
Copy Markdown
Contributor

*** DO NOT MERGE THIS PR YET *** *** DO NOT MERGE THIS PR YET ***

Update external dependencies, moving to recent version of Dose+Cudf+Ocamlgraph, in preparation for the new release of Dose 3.2 and Cudf 0.7 that are impending.

Before merging, changes will need to be made to the Travis test environment, once the new version of the dose and cudf package will be on opam-repository.

To ensure a smooth transition, I want to collect feedback from the Travis output here, even if surely polluted by errors coming from unaligned versions of dose+cudf+ocamlgraph in the test environment.

@rdicosmo
Copy link
Copy Markdown
Contributor Author

Build #569.1 is irrelevant, as opam is compiled with old opam/cudf/ocamlgraph up to now :-(

@AltGr
Copy link
Copy Markdown
Member

AltGr commented Apr 16, 2014

I have just created a small repository corresponding to these packages with your patches, to help with testing. It's at https://github.com/OCamlPro/opam-repository-dose

It's the easiest way to get opam-rt to build & run with the right versions.

@rdicosmo
Copy link
Copy Markdown
Contributor Author

Cool! Crossing my fingers waiting for your results : I'd love to see
all this pass all of opam-rt tests in one go, even if I know that
reality may be different :-)

On Wed, Apr 16, 2014 at 02:31:57AM -0700, Louis Gesbert wrote:

I have just created a small repository corresponding to these packages with
your patches, to help with testing. It's at https://github.com/OCamlPro/
opam-repository-dose

It's the easiest way to get opam-rt to build & run with the right versions.


Reply to this email directly or view it on GitHub.*

Roberto Di Cosmo


Professeur En delegation a l'INRIA
PPS E-mail: roberto@dicosmo.org
Universite Paris Diderot WWW : http://www.dicosmo.org
Case 7014 Tel : ++33-(0)1-57 27 92 20
5, Rue Thomas Mann
F-75205 Paris Cedex 13 Identica: http://identi.ca/rdicosmo

FRANCE. Twitter: http://twitter.com/rdicosmo

Attachments:
MIME accepted, Word deprecated

http://www.gnu.org/philosophy/no-word-attachments.html

Office location:

Bureau 3020 (3rd floor)
Batiment Sophie Germain
Avenue de France

Metro Bibliotheque Francois Mitterrand, ligne 14/RER C

GPG fingerprint 2931 20CE 3A5A 5390 98EC 8BFC FCCA C3BE 39CB 12D3

@AltGr
Copy link
Copy Markdown
Member

AltGr commented Apr 16, 2014

... and with that I can confirm that all tests pass with the new versions. (I tested with NOASPCUD too)

@rdicosmo
Copy link
Copy Markdown
Contributor Author

WOW :-) That's great, thanks!!!!

2014-04-16 11:40 GMT+02:00 Louis Gesbert notifications@github.com:

... and with that I can confirm that all tests pass with the new versions.
(I tested with NOASPCUD too)


Reply to this email directly or view it on GitHubhttps://github.com//pull/1336#issuecomment-40580808
.

Roberto Di Cosmo


Professeur En delegation a l'INRIA
PPS E-mail: roberto@dicosmo.org
Universite Paris Diderot WWW : http://www.dicosmo.org
Case 7014 Tel : ++33-(0)1-57 27 92 20
5, Rue Thomas Mann
F-75205 Paris Cedex 13 Identica: http://identi.ca/rdicosmo

FRANCE. Twitter: http://twitter.com/rdicosmo

Attachments:
MIME accepted, Word deprecated

http://www.gnu.org/philosophy/no-word-attachments.html

Office location:

Bureau 320 (3rd floor)
Batiment Sophie Germain
Avenue de France

Metro Bibliotheque Francois Mitterrand, ligne 14/RER C

GPG fingerprint 2931 20CE 3A5A 5390 98EC 8BFC FCCA C3BE 39CB 12D3

@rdicosmo
Copy link
Copy Markdown
Contributor Author

Updated for cudf-0.7

@samoht
Copy link
Copy Markdown
Member

samoht commented Apr 30, 2014

===== ERROR while installing dose.3.1.2 =====
# opam-version 1.1.1
# os           linux
# command      ocp-build -scan -init dose -v 0
# path         /home/travis/.opam/system/build/dose.3.1.2
# compiler     system (4.01.0)
# exit-code    2
# env-file     /home/travis/.opam/system/build/dose.3.1.2/dose-15944-629056.env
# stdout-file  /home/travis/.opam/system/build/dose.3.1.2/dose-15944-629056.out
# stderr-file  /home/travis/.opam/system/build/dose.3.1.2/dose-15944-629056.err
### stderr ###
# ...[truncated]
# Error:
# [54.1] '/usr/bin/ocamlc.opt' '-bin-annot' '-c' '-o' '_obuild/54/cudfSolver.cmo' '-for-pack' 'Common' '-I' './_obuild/dose/Common' '-I' './_obuild/dose' '-I' '.' '-I' '/home/travis/.opam/system/lib/cudf' '-I' '/home/travis/.opam/system/lib/extlib' '-I' '/home/travis/.opam/system/lib/ocamlgraph' '-I' '/home/travis/.opam/system/lib/ocaml' '-I' '/home/travis/.opam/system/lib/re' 'common/cudfSolver.ml'
# 
# File "common/cudfSolver.ml", line 101, characters 2-22:
# Error: Unbound module Cudf_printer
# 
# Error:
# Target _obuild/dose/Common/cudfSolver.cmi not built
# Error:
# Target _obuild/dose/Common/cudfSolver.cmo not built

@rdicosmo
Copy link
Copy Markdown
Contributor Author

rdicosmo commented May 1, 2014

Hmm... the new Makefile requires that I adapt this PR... working on labour day, oh my! :-)

@rdicosmo
Copy link
Copy Markdown
Contributor Author

rdicosmo commented May 1, 2014

No surprise here, this is a PR that requires moving to dose 3.2, and does
not work with dose 3.1 (that's why there is a big *** do not merge ***
disclaimer at the top).

We need cudf 0.7 (done) and dose 3.2 (in the works) in the repo, plus an update
to the travis scripts for this to go through.

On Wed, Apr 30, 2014 at 03:23:35PM -0700, Thomas Gazagnaire wrote:

===== ERROR while installing dose.3.1.2 =====

opam-version 1.1.1

os linux

command ocp-build -scan -init dose -v 0

path /home/travis/.opam/system/build/dose.3.1.2

compiler system (4.01.0)

exit-code 2

env-file /home/travis/.opam/system/build/dose.3.1.2/dose-15944-629056.env

stdout-file /home/travis/.opam/system/build/dose.3.1.2/dose-15944-629056.out

stderr-file /home/travis/.opam/system/build/dose.3.1.2/dose-15944-629056.err

stderr

...[truncated]

Error:

[54.1] '/usr/bin/ocamlc.opt' '-bin-annot' '-c' '-o' '_obuild/54/cudfSolver.cmo' '-for-pack' 'Common' '-I' './_obuild/dose/Common' '-I' './_obuild/dose' '-I' '.' '-I' '/home/travis/.opam/system/lib/cudf' '-I' '/home/travis/.opam/system/lib/extlib' '-I' '/home/travis/.opam/system/lib/ocamlgraph' '-I' '/home/travis/.opam/system/lib/ocaml' '-I' '/home/travis/.opam/system/lib/re' 'common/cudfSolver.ml'

File "common/cudfSolver.ml", line 101, characters 2-22:

Error: Unbound module Cudf_printer

Error:

Target _obuild/dose/Common/cudfSolver.cmi not built

Error:

Target _obuild/dose/Common/cudfSolver.cmo not built


Reply to this email directly or view it on GitHub.*

Roberto Di Cosmo


Professeur En delegation a l'INRIA
PPS E-mail: roberto@dicosmo.org
Universite Paris Diderot WWW : http://www.dicosmo.org
Case 7014 Tel : ++33-(0)1-57 27 92 20
5, Rue Thomas Mann
F-75205 Paris Cedex 13 Identica: http://identi.ca/rdicosmo

FRANCE. Twitter: http://twitter.com/rdicosmo

Attachments:
MIME accepted, Word deprecated

http://www.gnu.org/philosophy/no-word-attachments.html

Office location:

Bureau 3020 (3rd floor)
Batiment Sophie Germain
Avenue de France

Metro Bibliotheque Francois Mitterrand, ligne 14/RER C

GPG fingerprint 2931 20CE 3A5A 5390 98EC 8BFC FCCA C3BE 39CB 12D3

@rdicosmo
Copy link
Copy Markdown
Contributor Author

rdicosmo commented May 1, 2014

Ok, everything goes through when using lib-ext. Of course, the first Travis build fails, as it still uses dose-3.1 instead of 3.2.
We are getting there!

@rdicosmo
Copy link
Copy Markdown
Contributor Author

rdicosmo commented May 4, 2014

Ok... need to wait for dose 3.2-rc2 to get to the repo index befor this can work.

@rdicosmo
Copy link
Copy Markdown
Contributor Author

rdicosmo commented May 5, 2014

Finally, with b4af77a everything goes through and we are ready for moving to cudf 0.7 + dose 3.2 ... \o/ This PR can be merged now!

@AltGr
Copy link
Copy Markdown
Member

AltGr commented May 6, 2014

Great, thanks for taking care of this ! I'd remove altogether the two Added... and Revert "Added..." patches, but looks otherwise perfect.

@rdicosmo
Copy link
Copy Markdown
Contributor Author

rdicosmo commented May 6, 2014

Sorry for the reverted patch... I had removed it, but popped
up again after the last rebase: if you can clean up and merge, I'd be very grateful :-)

On Tue, May 06, 2014 at 02:28:34AM -0700, Louis Gesbert wrote:

Great, thanks for taking care of this ! I'd remove altogether the two Added...
and Revert "Added..." patches, but looks otherwise perfect.


Reply to this email directly or view it on GitHub.*

Roberto Di Cosmo


Professeur En delegation a l'INRIA
PPS E-mail: roberto@dicosmo.org
Universite Paris Diderot WWW : http://www.dicosmo.org
Case 7014 Tel : ++33-(0)1-57 27 92 20
5, Rue Thomas Mann
F-75205 Paris Cedex 13 Identica: http://identi.ca/rdicosmo

FRANCE. Twitter: http://twitter.com/rdicosmo

Attachments:
MIME accepted, Word deprecated

http://www.gnu.org/philosophy/no-word-attachments.html

Office location:

Bureau 3020 (3rd floor)
Batiment Sophie Germain
Avenue de France

Metro Bibliotheque Francois Mitterrand, ligne 14/RER C

GPG fingerprint 2931 20CE 3A5A 5390 98EC 8BFC FCCA C3BE 39CB 12D3

@rdicosmo
Copy link
Copy Markdown
Contributor Author

rdicosmo commented May 6, 2014

Just cleaned up... and pushed again. Let's see if Travis is happy

@rdicosmo
Copy link
Copy Markdown
Contributor Author

rdicosmo commented May 6, 2014

Ok, commit history clean, and incorporated fix by @AltGr ... can be merged now.

AltGr added a commit that referenced this pull request May 6, 2014
Update external dependencies to dose 3.2-rc1 and ocamlgraph 1.8.5
@AltGr AltGr merged commit 6cb0788 into ocaml:master May 6, 2014
@AltGr
Copy link
Copy Markdown
Member

AltGr commented May 6, 2014

Thanks !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants