Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix travis ci build #120

Open
wants to merge 4 commits into
base: next
Choose a base branch
from
Open

fix travis ci build #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b253751
Add seq dep for ocaml < 4.07
Jul 15, 2019
7045bb1
fix travis ci build
Et7f3 Jul 10, 2019
2b8c673
Merge pull request #4 from lefessan/br-2019-07-15-fix-seq-needed-by-re
Et7f3 Jul 16, 2019
db41b2b
Revert "Add seq dep for ocaml < 4.07" (#7)
Et7f3 Jul 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions .travis-ci.sh
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions .travis-install.sh
View file
Open in desktop

This file was deleted.

17 changes: 10 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@ addons:
- ocaml
- opam
- ocaml-native-compilers
install: sh -ex ./autoconf/travis-install.sh
install: sh -ex ./ci/travis-install.sh
cache:
directories:
- ${HOME}/.opam
script: sh -ex ./autoconf/travis-ci.sh
script: sh -ex ./ci/travis-ci.sh && echo true
env:
- OCAML_VERSION=system
- OCAML_VERSION=4.03.0
- OCAML_VERSION=4.04.0
- OCAML_VERSION=4.05.0
- OCAML_VERSION=4.06.1
- OCAML_VERSION=ocaml-system
- OCAML_VERSION=ocaml-base-compiler.4.02.3
- OCAML_VERSION=ocaml-base-compiler.4.03.0
- OCAML_VERSION=ocaml-base-compiler.4.04.0
- OCAML_VERSION=ocaml-base-compiler.4.05.0
- OCAML_VERSION=ocaml-base-compiler.4.06.0
- OCAML_VERSION=ocaml-base-compiler.4.06.1
- OCAML_VERSION=ocaml-base-compiler.4.07.1
5 changes: 1 addition & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ OCPLIB_LANG= $(lang_SRCDIR)/ocpList.ml $(lang_SRCDIR)/ocpString.ml \
$(lang_SRCDIR)/ocpArray.ml \
$(lang_SRCDIR)/ocpDigest.ml $(lang_SRCDIR)/ocpToposort.ml \
$(lang_SRCDIR)/ocamllexer.ml $(lang_SRCDIR)/ocpGenlex.ml \
$(lang_SRCDIR)/ocpSubst.ml $(lang_SRCDIR)/ocpReuse.ml
$(lang_SRCDIR)/ocpSubst.ml $(lang_SRCDIR)/ocpReuse.ml

OCPLIB_UNIX= $(unix_SRCDIR)/minUnix.ml $(unix_SRCDIR)/onlyUnix.ml \
$(unix_SRCDIR)/onlyWin32.ml
Expand Down Expand Up @@ -352,6 +352,3 @@ include autoconf/Makefile.rules
.c$(EXT_OBJ):
$(OCAMLC) -c $(INCLUDES) -ccopt -DOCAML_VERSION=$(OCAMLVERSION_C) $<
mv `basename $*$(EXT_OBJ)` $*$(EXT_OBJ)



1 change: 0 additions & 1 deletion autoconf/travis-ci.sh → ci/travis-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ PREFIX=$HOME/.opam/$OCAML_VERSION
opam pin add my-package .
opam install my-package
opam remove my-package

3 changes: 1 addition & 2 deletions autoconf/travis-install.sh → ci/travis-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ opam --version
opam --git-version

opam init
opam switch $OCAML_VERSION

opam switch create $OCAML_VERSION || true
23 changes: 6 additions & 17 deletions opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@
(* *)
(**************************************************************)

opam-version: "1.2"
opam-version: "2.0"
maintainer: "Fabrice Le Fessant <fabrice.le_fessant@ocamlpro.com>"
synopsis: "Build-system for ocaml"
description: """
Build-system for general use with builtin OCaml rule.
"""
authors: [
"Fabrice Le Fessant <fabrice.le_fessant@ocamlpro.com>"
]
homepage: "http://www.typerex.org/ocp-build.html"
dev-repo: "https://github.com/OCamlPro/ocp-build.git"
dev-repo: "git+https://github.com/OCamlPro/ocp-build.git"
bug-reports: "https://github.com/OCamlPro/ocp-build/issues"
build: [
[ "./configure"
Expand All @@ -24,21 +28,6 @@ build: [
install: [
[ make "install" ]
]
remove: [
[ "rm" "-f" "%{prefix}%/bin/ocp-build" ]
[ "rm" "-f" "%{prefix}%/bin/ocp-pp" ]
[ "rm" "-rf" "%{prefix}%/lib/ocaml/typerex/ocp-build" ]
[ "rm" "-rf" "%{prefix}%/lib/ocaml/typerex/ocplib-compat" ]
[ "rm" "-rf" "%{prefix}%/lib/ocaml/typerex/ocplib-debug" ]
[ "rm" "-rf" "%{prefix}%/lib/ocaml/typerex/ocplib-lang" ]
[ "rm" "-rf" "%{prefix}%/lib/ocaml/typerex/ocplib-subcmd" ]
[ "rm" "-rf" "%{prefix}%/lib/ocaml/typerex/ocplib-system" ]
[ "rm" "-rf" "%{prefix}%/lib/ocaml/typerex/ocplib-unix" ]
[ "rm" "-rf" "%{prefix}%/lib/ocaml/typerex/installed.ocp" ]
[ "rm" "-rf" "%{prefix}%/lib/ocaml/site-ocp2/ocp-build" ]
[ "sh" "-exc" "rmdir %{prefix}%/lib/ocaml/typerex || true" ]
]
available: [ocaml-version >= "4.02.3"]
depends: [
"cmdliner" {>= "1.0" }
"ocamlfind"
Expand Down