Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 2 additions & 30 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,36 +1,8 @@
# general patterns

*.o
*.a
*.so
*.obj
*.lib
*.dll
*.cm[ioxat]
*.cmx[as]
*.cmti
*.annot
*.exe
*.exe.manifest
.depend
.depend.nt
.DS_Store
*.out
*.out.dSYM
/tmp/
/_build

ocamlbuild.install
Makefile.config

/bootstrap/src
/bootstrap/_build*

/src/ocamlbuild_config.ml
/src/lexers.ml
/src/glob_lexer.ml
/ocamlbuild.byte
/ocamlbuild.native

/man/ocamlbuild.1
/man/ocamlbuild.options.1
/man/options_man.byte
.merlin
3 changes: 0 additions & 3 deletions .merlin

This file was deleted.

11 changes: 5 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,22 @@ language: c
os: linux
env:
- OCAML_VERSION=4.03.0
- OCAML_VERSION=4.04.0
- OCAML_VERSION=4.04.2
- OCAML_VERSION=4.05.0
- OCAML_VERSION=4.06.1
install:
- echo "yes" | sudo add-apt-repository ppa:avsm/ocaml42+opam12
- sudo apt-get update -qq
- sudo apt-get install -qq opam
- export OPAMYES=1
- opam init --compiler=${OCAML_VERSION}
- opam install ocamlfind camlp4 menhir
- opam install ocamlfind camlp4 menhir jbuilder cppo
script:
- eval `opam config env`
# First, run our own testsuite. Do this *before* any ocamlbuild is installed globally,
# to check that we don't have a spurious dependency on a global ocamlbuild.
- VERBOSE=1 make test
# Second, bootstrap ourselves using the freshly built binaries, as a more complex
# exercise than the testsuite alone.
- OCAMLBUILD=$(pwd)/ocamlbuild.native make -C bootstrap
# Third, verify that installation works, and a variety of downstream opam packages
# Second, verify that installation works, and a variety of downstream opam packages
# still install.
- make distclean
- opam pin add -n -k path ocamlbuild .
Expand Down
Loading