Permalink
Browse files

Merge branch 'master' of github.com:OCamlPro/opam

  • Loading branch information...
2 parents d3b14d7 + 8a18c28 commit 4847454cb9929154eb9e3977568c21045de4d6e0 @samoht samoht committed Oct 11, 2012
Showing with 49 additions and 8 deletions.
  1. +35 −1 jenkins/10-opam-prepare.sh
  2. +2 −2 jenkins/30-opam-packages.sh
  3. +2 −2 jenkins/31-opam-mirage-packages.sh
  4. +3 −0 src/opamClient.ml
  5. +4 −1 src/opamPath.ml
  6. +3 −2 src/opamPath.mli
View
@@ -1,2 +1,36 @@
#!/bin/sh
-apt-get -y install ocaml libssl-dev ocaml-compiler-libs
+BASE="ocaml ocaml-compiler-libs"
+
+# alt-ergo
+BASE="${BASE} autoconf"
+# cairo
+BASE="${BASE} libcairo2-dev"
+# dbm
+BASE="${BASE} libgdbm-dev"
+# lablgtk2
+BASE="${BASE} libgtk2.0-dev"
+# lwt-zmq
+BASE="${BASE} libzmq-dev"
+# postgresql-ocaml
+BASE="${BASE} libpq-dev"
+# camlbz2
+BASE="${BASE} libbz2-dev"
+# imagemagick
+BASE="${BASE} libgraphicsmagick1-dev libmagickcore-dev"
+# sqlite3
+BASE="${BASE} libsqlite3-dev"
+# ocaml-glpk
+BASE="${BASE} libglpk-dev"
+# lablgl
+BASE="${BASE} mesa-common-dev"
+# ocamlgsl
+BASE="${BASE} gawk"
+# ocaml-lua
+BASE="${BASE} liblua5.1-0-dev
+# ocurl
+BASE="${BASE} libcurl4-gnutls-dev"
+# planets
+BASE="${BASE} tcl8.5-dev tk8.5-dev"
+# ocaml-mysql
+BASE="${BASE} libmysqlclient-dev"
+sudo apt-get -y install ${BASE}
@@ -1,7 +1,7 @@
#!/bin/sh -ex
PREFIX=$1
OPAM=$HOME/opam-bin/$PREFIX/bin/opam
-ROOT=`echo /b/${JOB_NAME} | sed -e s,=,_,g`
+ROOT=`echo /x/${JOB_NAME} | sed -e "s,=,_,g" -e "s/,/-/g"`
rm -rf ${ROOT}
$OPAM --yes --root $ROOT init $2
if [ "${compiler}" != "system" ]; then
@@ -10,4 +10,4 @@ fi
if [ "${packages}" = "all" ]; then
packages=`$OPAM --root $ROOT list -short`
fi
-$OPAM --yes --root $ROOT install ${packages}
+$OPAM --verbose --yes --root $ROOT install ${packages}
@@ -1,7 +1,7 @@
#!/bin/sh -ex
PREFIX=$1
OPAM=$HOME/opam-bin/$PREFIX/bin/opam
-ROOT=`echo /b/${JOB_NAME} | sed -e s,=,_,g`
+ROOT=`echo /x/${JOB_NAME} | sed -e "s,=,_,g" -e "s/,/-/g"`
rm -rf ${ROOT}
$OPAM --yes --root $ROOT init .
$OPAM --yes --root $ROOT remote -add dev git://github.com/mirage/opam-repo-dev
@@ -11,4 +11,4 @@ fi
if [ "${packages}" = "all" ]; then
packages=`$OPAM --root $ROOT list -short`
fi
-$OPAM --yes --root $ROOT install ${packages}
+$OPAM --verbose --yes --root $ROOT install ${packages}
View
@@ -1033,6 +1033,9 @@ let init_ocaml t quiet alias compiler =
OpamFilename.mkdir (OpamPath.Alias.man_dir t.root alias);
OpamFilename.mkdir (OpamPath.Alias.install_dir t.root alias);
OpamFilename.mkdir (OpamPath.Alias.config_dir t.root alias);
+ List.iter (fun num ->
+ OpamFilename.mkdir (OpamPath.Alias.man_dir ~num t.root alias)
+ ) ["1";"1M";"2";"3";"4";"5";"6";"7";"9"];
let comp = OpamFile.Comp.read comp_f in
begin try
View
@@ -62,7 +62,10 @@ module Alias = struct
let doc_dir t a = root t a / "doc"
- let man_dir t a = root t a / "man"
+ let man_dir ?num t a =
+ match num with
+ | None -> root t a / "man"
+ | Some n -> root t a / "man" / ("man" ^ n)
let doc t a n = doc_dir t a / OpamPackage.Name.to_string n
View
@@ -87,8 +87,9 @@ module Alias: sig
(** Documentation path: {i $opam/$OVERSION/doc/} *)
val doc_dir: t -> alias -> dirname
- (** Man pages path: {i $opam/$OVERSION/man/} *)
- val man_dir: t -> alias -> dirname
+ (** Man pages path: {i $opam/$OVERSION/man/}. The optional
+ [num] argument will add a {i manN } suffix if specified *)
+ val man_dir: ?num:string -> t -> alias -> dirname
(** Installed binaries: {i $opam/$OVERSION/bin} *)
val bin: t -> alias -> dirname

0 comments on commit 4847454

Please sign in to comment.