Skip to content

Commit

Permalink
Merge pull request #7 from avsm/release-0.3
Browse files Browse the repository at this point in the history
release 0.3, modernise Travis to OPAM 1.2 workflow
  • Loading branch information
avsm committed Apr 28, 2015
2 parents d68638f + f69893b commit fcc1a96
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 57 deletions.
35 changes: 0 additions & 35 deletions .travis-ci.sh

This file was deleted.

6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +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
- PACKAGE="tar-format" OCAML_VERSION=4.01 REVDEPS=true
- PACKAGE="tar-format" OCAML_VERSION=latest REVDEPS=true
3 changes: 2 additions & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
0.3.0 (unreleased)
0.3.0 (2014-04-06)
- add Tar.Make functor which allows easier integration with
camlzip
- always initialise tar header unused bytes to 0 (previously
would use uninitialised data)
- modernise Travis CI scripts to use OPAM 1.2 workflow.

0.2.1 (2013-11-15)
- Re-add some old deprecated functions
Expand Down
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: tar
Version: 0.3
Version: 0.3.0
Synopsis: Pure OCaml library to read and write tar files
Authors: Dave Scott, Thomas Gazagnaire, David Allsopp
License: ISC
Plugins: META (0.3), DevFiles (0.3)
Plugins: META (0.4)

Flag lwtunix
Default: true
Expand Down
8 changes: 4 additions & 4 deletions lib/META
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OASIS_START
# DO NOT EDIT (digest: 37ea44f67a9adba46b28fde7815891a6)
version = "0.3"
# DO NOT EDIT (digest: 9f93a08b0c8f5f6ba2ba581ed242a9f1)
version = "0.3.0"
description = "Pure OCaml library to read and write tar files"
requires = "cstruct re.str"
archive(byte) = "tar.cma"
Expand All @@ -9,7 +9,7 @@ archive(native) = "tar.cmxa"
archive(native, plugin) = "tar.cmxs"
exists_if = "tar.cma"
package "unix" (
version = "0.3"
version = "0.3.0"
description = "Pure OCaml library to read and write tar files"
requires = "tar"
archive(byte) = "tar_unix.cma"
Expand All @@ -20,7 +20,7 @@ package "unix" (
)

package "lwt" (
version = "0.3"
version = "0.3.0"
description = "Pure OCaml library to read and write tar files"
requires = "tar lwt lwt.unix"
archive(byte) = "tar_lwt_unix.cma"
Expand Down
4 changes: 4 additions & 0 deletions lib/tar.mldylib
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: d9056ecb9178b326e670a8a13cdcfe60)
Tar
# OASIS_STOP
4 changes: 4 additions & 0 deletions lib/tar_lwt_unix.mldylib
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: db438ed034da16b36b2483bc3195d877)
Tar_lwt_unix
# OASIS_STOP
4 changes: 4 additions & 0 deletions lib/tar_unix.mldylib
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: fcddcc1872a1bc5ffee9b8249c0457a7)
Tar_unix
# OASIS_STOP
20 changes: 15 additions & 5 deletions opam
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
opam-version: "1"
opam-version: "1.2"
name: "tar-format"
version: "0.3.0"
maintainer: "[email protected]"
tags: ["org:xapi-project"]
authors: [ "Dave Scott" "Thomas Gazagnaire" "David Allsopp" ]
tags: ["org:xapi-project" "org:mirage"]
homepage: "https://github.com/mirage/ocaml-tar"
bug-reports: "https://github.com/mirage/ocaml-tar/issues"
dev-repo: "https://github.com/mirage/ocaml-tar.git"
build: [
[make]
[make "install"]
["ocaml" "setup.ml" "-configure" "--prefix" prefix "--%{lwt:enable}%-lwtunix" ]
["ocaml" "setup.ml" "-build"]
]
install: [
["ocaml" "setup.ml" "-install"]
]
remove: [["ocamlfind" "remove" "tar"]]
depends: [
"ocamlfind"
"cstruct" {>= "0.6.0"}
"re"
"ounit"
"cmdliner"
"ounit" {test}
]
depopts: ["lwt"]
available: [ ocaml-version >= "4.01.0" ]
13 changes: 6 additions & 7 deletions setup.ml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.3.0 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: bd11f1467d64e324289e7468e252f216) *)
(* DO NOT EDIT (digest: e1a5b36cba9e2f54033140c3ef594803) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6845,13 +6845,13 @@ let setup_t =
distclean_doc = [];
package =
{
oasis_version = "0.3";
oasis_version = "0.4";
ocaml_version = None;
findlib_version = None;
alpha_features = [];
beta_features = [];
name = "tar";
version = "0.3";
version = "0.3.0";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
Expand Down Expand Up @@ -7075,22 +7075,21 @@ let setup_t =
test_tools = []
})
];
plugins =
[(`Extra, "META", Some "0.3"); (`Extra, "DevFiles", Some "0.3")];
plugins = [(`Extra, "META", Some "0.4")];
disable_oasis_section = [];
schema_data = PropList.Data.create ();
plugin_data = []
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest = Some "\152 \022\196\233\137[=@\219\173\189\020\230\156;";
oasis_digest = Some "W§f\012jÞ;z\023c!\128!6°_";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
};;

let setup () = BaseSetup.setup setup_t;;

# 7095 "setup.ml"
# 7094 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;

0 comments on commit fcc1a96

Please sign in to comment.