Skip to content

Commit

Permalink
remove mirage and print sublibraries; port to topkg
Browse files Browse the repository at this point in the history
  • Loading branch information
hannesm committed Jan 28, 2017
1 parent 2335a2a commit 50a0b21
Show file tree
Hide file tree
Showing 26 changed files with 92 additions and 8,483 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,3 +1,4 @@
_build
.*.swp
test.native
pcap-format.install
8 changes: 6 additions & 2 deletions .travis.yml
Expand Up @@ -2,5 +2,9 @@ language: c
install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
script: bash -ex .travis-opam.sh
env:
- OCAML_VERSION=4.03 PACKAGE="pcap-format"
- OCAML_VERSION=4.02 PACKAGE="pcap-format"
global:
- PACKAGE="pcap-format"
matrix:
- OCAML_VERSION=4.04
- OCAML_VERSION=4.03
- OCAML_VERSION=4.02
14 changes: 11 additions & 3 deletions CHANGES → CHANGES.md
@@ -1,14 +1,22 @@
0.4.0 (30-Apr-2016):
## ?? (??)

* removed mirage and print sublibrary
* converted build system to topkg

## 0.4.0 (2016-04-30)

* add an opam file
* replace camlp4 with ppx
* add windows support

0.3.3 (25-Jul-2013):
## 0.3.3 (2013-07-25)

* Add Lwt_bounded implementation to constrain size of packet captures.
* Update package name to pcap-format
* Update to new Cstruct (>= 0.6.0) and Mirage

0.3.1 (Sep 2012):
## 0.3.1 (2012-09-18)

* Support dumping a pcap trace to a block device.
* Use `cstruct` signature generators to tidy up pcap interface.
* Initial public release.
File renamed without changes.
45 changes: 0 additions & 45 deletions Makefile

This file was deleted.

1 change: 0 additions & 1 deletion Makefile.config

This file was deleted.

11 changes: 0 additions & 11 deletions Makefile.user

This file was deleted.

24 changes: 20 additions & 4 deletions README.md
@@ -1,6 +1,22 @@
ocaml-pcap
==========
## pcap-format -- decode and encode PCAP (packet capture) files

OCaml code for generating and analysing PCAP (packet capture) files.
pcap-format provides an interface to encode and decode pcap files, dealing with
both endianess, including endianess detection.

This is based on Anil Madhavapeddy's "cstruct" example code.
## Installation

`pcap-format` can be installed with `opam`:

opam install pcap-format

If you don't use `opam` consult the [`opam`](opam) file for build
instructions.

### Documentation

[![Build Status](https://travis-ci.org/mirage/ocaml-pcap.svg?branch=master)](https://travis-ci.org/mirage/ocaml-pcap)

The documentation and API reference is automatically generated by
`ocamldoc` from the interfaces. It can be consulted [online][2].

[2]: https://mirage.github.io/ocaml-pcap/Pcap.html
59 changes: 7 additions & 52 deletions _tags
@@ -1,52 +1,7 @@
# OASIS_START
# DO NOT EDIT (digest: 62ecd45f4b52a29065996d7bad3458cd)
# 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
".bzr": not_hygienic
".hg": -traverse
".hg": not_hygienic
".git": -traverse
".git": not_hygienic
"_darcs": -traverse
"_darcs": not_hygienic
# Library pcap
"lib/pcap.cmxs": use_pcap
<lib/*.ml{,i,y}>: pkg_cstruct
<lib/*.ml{,i,y}>: pkg_cstruct.ppx
# Library mirage
"mirage/mirage.cmxs": use_mirage
<mirage/*.ml{,i,y}>: pkg_cstruct
<mirage/*.ml{,i,y}>: pkg_cstruct.ppx
<mirage/*.ml{,i,y}>: pkg_lwt
<mirage/*.ml{,i,y}>: use_pcap
# Executable print
<print/print.{native,byte}>: pkg_cstruct
<print/print.{native,byte}>: pkg_cstruct.ppx
<print/print.{native,byte}>: pkg_lwt
<print/print.{native,byte}>: pkg_lwt.unix
<print/print.{native,byte}>: use_pcap
<print/*.ml{,i,y}>: pkg_cstruct
<print/*.ml{,i,y}>: pkg_cstruct.ppx
<print/*.ml{,i,y}>: pkg_lwt
<print/*.ml{,i,y}>: pkg_lwt.unix
<print/*.ml{,i,y}>: use_pcap
<print/print.{native,byte}>: custom
# Executable test
<lib_test/test.{native,byte}>: pkg_cstruct
<lib_test/test.{native,byte}>: pkg_cstruct.ppx
<lib_test/test.{native,byte}>: pkg_lwt
<lib_test/test.{native,byte}>: pkg_lwt.unix
<lib_test/test.{native,byte}>: pkg_oUnit
<lib_test/test.{native,byte}>: use_pcap
<lib_test/*.ml{,i,y}>: pkg_cstruct
<lib_test/*.ml{,i,y}>: pkg_cstruct.ppx
<lib_test/*.ml{,i,y}>: pkg_lwt
<lib_test/*.ml{,i,y}>: pkg_lwt.unix
<lib_test/*.ml{,i,y}>: pkg_oUnit
<lib_test/*.ml{,i,y}>: use_pcap
# OASIS_STOP
true : color(always), bin_annot, safe_string, principal
true : warn(+A)
true : package(cstruct)
"lib" : include

<lib/pcap.{ml,mli}>: package(cstruct.ppx)
<lib_test/test.{ml,native}>: package(oUnit)
27 changes: 0 additions & 27 deletions configure

This file was deleted.

1 change: 1 addition & 0 deletions doc/api.odocl
@@ -0,0 +1 @@
Pcap
22 changes: 0 additions & 22 deletions lib/META

This file was deleted.

4 changes: 0 additions & 4 deletions lib/pcap.mldylib

This file was deleted.

5 changes: 5 additions & 0 deletions lib/pcap.mli
Expand Up @@ -16,6 +16,11 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*)

(** PCAP encoding and encoding
{e %%VERSION%% - {{:%%PKG_HOMEPAGE%% }homepage}}
*)

val major_version: int
(** Major version of the pcap format which we understand *)

Expand Down
3 changes: 0 additions & 3 deletions lib/pcap.mllib
@@ -1,4 +1 @@
# OASIS_START
# DO NOT EDIT (digest: 34a456d1e2a30c2e3624943740446bde)
Pcap
# OASIS_STOP
63 changes: 0 additions & 63 deletions mirage/lwt_bounded_stream.ml

This file was deleted.

33 changes: 0 additions & 33 deletions mirage/lwt_bounded_stream.mli

This file was deleted.

5 changes: 0 additions & 5 deletions mirage/mirage.mldylib

This file was deleted.

5 changes: 0 additions & 5 deletions mirage/mirage.mllib

This file was deleted.

0 comments on commit 50a0b21

Please sign in to comment.