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.

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

bump to 1.4.0 and use centralised Travis CI scripts #15

Merged
merged 1 commit into from
Mar 9, 2015
Merged
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
31 changes: 0 additions & 31 deletions .travis-ci.sh

This file was deleted.

7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: c
script: bash -ex .travis-ci.sh
install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
script: bash -ex .travis-opam.sh
env:
- OCAML_VERSION=4.01.0 OPAM_VERSION=1.1.0
- OCAML_VERSION=4.00.1 OPAM_VERSION=1.1.0
- OCAML_VERSION=4.01 PACKAGE=crunch
- OCAML_VERSION=latest PACKAGE=crunch
4 changes: 4 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
1.4.0 (2015-03-09):
* Add an explicit `connect` function to the signature of generated code. (#13)
* Use centralised Travis CI scripts.

1.3.0 (2014-03-08):
* Deduplicate file chunks so that only one copy of each
sector is allocated in the static module.
Expand Down
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: bc1e05bfc8b39b664f29dae8dbd3ebbb)
# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)

SETUP = ocaml setup.ml

Expand All @@ -12,7 +12,7 @@ doc: setup.data build
test: setup.data build
$(SETUP) -test $(TESTFLAGS)

all:
all:
$(SETUP) -all $(ALLFLAGS)

install: setup.data
Expand All @@ -24,15 +24,18 @@ uninstall: setup.data
reinstall: setup.data
$(SETUP) -reinstall $(REINSTALLFLAGS)

clean:
clean:
$(SETUP) -clean $(CLEANFLAGS)

distclean:
distclean:
$(SETUP) -distclean $(DISTCLEANFLAGS)

setup.data:
$(SETUP) -configure $(CONFIGUREFLAGS)

configure:
$(SETUP) -configure $(CONFIGUREFLAGS)

.PHONY: build doc test all install uninstall reinstall clean distclean configure

# OASIS_STOP
6 changes: 3 additions & 3 deletions _oasis
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
OASISFormat: 0.3
OASISFormat: 0.4
Name: crunch
Version: 1.1.0
Version: 1.4.0
Synopsis: Compile static files into a static filesystem
Authors: Anil Madhavapeddy, Thomas Gazagnaire
License: ISC
Plugins: META (0.3), DevFiles (0.3)
Plugins: META (0.4), DevFiles (0.4)
BuildTools: ocamlbuild

Library crunch
Expand Down
21 changes: 11 additions & 10 deletions _tags
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# OASIS_START
# DO NOT EDIT (digest: c01efe0e0f311a888fada032bdf52869)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# DO NOT EDIT (digest: 551bbb004e68ab6fb7dc279093de0e6e)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
true: annot, bin_annot
<**/.svn>: -traverse
<**/.svn>: not_hygienic
".bzr": -traverse
Expand All @@ -17,14 +18,14 @@
"lib/crunch.cmxs": use_crunch
# Executable ocaml-crunch
<lib/main.{native,byte}>: use_libocaml-crunch_stubs
<lib/main.{native,byte}>: use_crunch
<lib/main.{native,byte}>: pkg_unix
<lib/main.{native,byte}>: pkg_cmdliner
<lib/*.ml{,i}>: use_crunch
<lib/*.ml{,i}>: pkg_unix
<lib/*.ml{,i}>: pkg_cmdliner
"lib/custom_unix_stubs.c": use_crunch
"lib/custom_unix_stubs.c": pkg_unix
<lib/main.{native,byte}>: pkg_unix
<lib/main.{native,byte}>: use_crunch
<lib/*.ml{,i,y}>: pkg_cmdliner
<lib/*.ml{,i,y}>: pkg_unix
<lib/*.ml{,i,y}>: use_crunch
"lib/custom_unix_stubs.c": pkg_cmdliner
"lib/custom_unix_stubs.c": pkg_unix
"lib/custom_unix_stubs.c": use_crunch
<lib/main.{native,byte}>: custom
# OASIS_STOP
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/sh

# OASIS_START
# DO NOT EDIT (digest: 425187ed8bfdbdd207fd76392dd243a7)
# DO NOT EDIT (digest: dc86c2ad450f91ca10c931b6045d0499)
set -e

FST=true
for i in "$@"; do
for i in "$@"; do
if $FST; then
set --
FST=false
Expand Down
4 changes: 2 additions & 2 deletions lib/META
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OASIS_START
# DO NOT EDIT (digest: 9e2db0b50b9acd5200b6901a404b96d3)
version = "1.1.0"
# DO NOT EDIT (digest: 95391c988fec8557bfb084ec87d91e02)
version = "1.4.0"
description = "Compile static files into a static filesystem"
requires = "unix"
archive(byte) = "crunch.cma"
Expand Down
4 changes: 4 additions & 0 deletions lib/crunch.mldylib
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: c8f895a601026f69488fa9ed7f072d4c)
Crunch
# OASIS_STOP
2 changes: 1 addition & 1 deletion lib/main.ml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@ let () =
let info =
let doc = "Convert a directory structure into a standalone OCaml module that can serve the file contents without requiring an external filesystem to be present." in
let man = [ `S "BUGS"; `P "Email bug reports to <mirage-devel@lists.xenproject.org>."] in
Term.info "ocaml-crunch" ~version:"1.3.0" ~doc ~man
Term.info "ocaml-crunch" ~version:"1.4.0" ~doc ~man
in
match Term.eval (cmd_t, info) with `Ok x -> x | _ -> exit 1
Loading