Build opam, rather than installing it
Signed-off-by: David Allsopp <david.allsopp@metastack.com>
This commit is contained in:
parent
51d6421ae4
commit
26b2c40606
|
@ -17,19 +17,28 @@ case "$TARGET" in
|
||||||
./configure -prefix ~/ocaml
|
./configure -prefix ~/ocaml
|
||||||
make world.opt
|
make world.opt
|
||||||
make install
|
make install
|
||||||
cd ..
|
cd ../..
|
||||||
rm -rf src
|
rm -rf src
|
||||||
echo "$OCAML_VERSION.$OCAML_RELEASE" > ~/ocaml/cached-version
|
echo "$OCAML_VERSION.$OCAML_RELEASE" > ~/ocaml/cached-version
|
||||||
fi
|
fi
|
||||||
echo -en "travis_fold:end:ocaml\r"
|
echo -en "travis_fold:end:ocaml\r"
|
||||||
if [ $WITH_OPAM -eq 1 ] ; then
|
if [ $WITH_OPAM -eq 1 ] ; then
|
||||||
echo -en "travis_fold:start:opam.init\r"
|
echo -en "travis_fold:start:opam.init\r"
|
||||||
sudo add-apt-repository --yes ppa:avsm/ocaml42+opam12
|
if [ ! -e ~/ocaml/bin/opam -o ! -e ~/.opam/lock -o "$OPAM_RESET" = "1" ] ; then
|
||||||
sudo apt-get update -qq
|
mkdir ~/ocaml/src
|
||||||
sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install opam
|
cd ~/ocaml/src
|
||||||
if [ ! -e ~/.opam/lock -o "$OPAM_RESET" = "1" ] ; then
|
wget https://github.com/ocaml/opam/releases/download/1.2.2/opam-full-1.2.2.tar.gz
|
||||||
|
tar -xzf opam-full-1.2.2.tar.gz
|
||||||
|
cd opam-full-1.2.2
|
||||||
|
./configure --prefix=/home/travis/ocaml
|
||||||
|
make lib-ext
|
||||||
|
make all
|
||||||
|
make install
|
||||||
|
cd ../..
|
||||||
|
rm -rf src
|
||||||
rm -rf ~/.opam
|
rm -rf ~/.opam
|
||||||
opam init --yes
|
opam init --yes
|
||||||
|
eval $(opam config env)
|
||||||
opam install menhir ocaml-migrate-parsetree js_of_ocaml-ppx --yes
|
opam install menhir ocaml-migrate-parsetree js_of_ocaml-ppx --yes
|
||||||
opam remove jbuilder `opam list --depends-on jbuilder --installed --short` --yes
|
opam remove jbuilder `opam list --depends-on jbuilder --installed --short` --yes
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -38,4 +38,7 @@ matrix:
|
||||||
- os: linux
|
- os: linux
|
||||||
env: OCAML_VERSION=4.05 OCAML_RELEASE=0 WITH_OPAM=1
|
env: OCAML_VERSION=4.05 OCAML_RELEASE=0 WITH_OPAM=1
|
||||||
stage: Test
|
stage: Test
|
||||||
sudo: required
|
addons:
|
||||||
|
apt:
|
||||||
|
packages:
|
||||||
|
- aspcud
|
||||||
|
|
Loading…
Reference in New Issue