Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/xapi-project/ocaml-fd-send-…
Browse files Browse the repository at this point in the history
…recv
  • Loading branch information
djs55 committed Jul 22, 2016
2 parents 65f2e56 + de77414 commit 8457006
Show file tree
Hide file tree
Showing 8 changed files with 1,922 additions and 664 deletions.
5 changes: 5 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
1.0.1 (23-Apr-2013)
* fix the build on Mac OSX

1.0.0 (27-Mar-2013)
* initial public release
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
2 changes: 1 addition & 1 deletion _oasis
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OASISFormat: 0.3
Name: fd-send-recv
Version: 0.1
Version: 1.0.1
Synopsis: Bindings to sendmsg/recvmsg which allow fds to be sent/received
Authors: Jonathan Ludlam <jonathan.ludlam@eu.citrix.com>
License: LGPL-2.1 with OCaml linking exception
Expand Down
23 changes: 12 additions & 11 deletions _tags
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# OASIS_START
# DO NOT EDIT (digest: 7d2c24e0ffcc78f7d52b748e72137b2e)
# 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: 31b466dfab10d97e7109d7a6c9172be1)
# 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 @@ -16,22 +17,22 @@
# Library fd_send_recv
"lib/fd_send_recv.cmxs": use_fd_send_recv
<lib/fd_send_recv.{cma,cmxa}>: use_libfd_send_recv_stubs
<lib/*.ml{,i}>: pkg_unix
<lib/*.ml{,i,y}>: pkg_unix
"lib/fd_send_recv_stubs.c": pkg_unix
# Executable test
<test/test.{native,byte}>: use_fd_send_recv
<test/test.{native,byte}>: pkg_threads
<test/test.{native,byte}>: pkg_unix
<test/*.ml{,i}>: pkg_threads
<test/test.{native,byte}>: use_fd_send_recv
<test/*.ml{,i,y}>: pkg_threads
# Executable test_fork
<test/test_fork.{native,byte}>: use_fd_send_recv
<test/test_fork.{native,byte}>: pkg_unix
<test/test_fork.{native,byte}>: use_fd_send_recv
# Executable test_tuntap
<test/test_tuntap.{native,byte}>: use_fd_send_recv
<test/test_tuntap.{native,byte}>: pkg_tuntap
<test/test_tuntap.{native,byte}>: pkg_unix
<test/*.ml{,i}>: use_fd_send_recv
<test/*.ml{,i}>: pkg_tuntap
<test/*.ml{,i}>: pkg_unix
<test/test_tuntap.{native,byte}>: use_fd_send_recv
<test/*.ml{,i,y}>: pkg_tuntap
<test/*.ml{,i,y}>: pkg_unix
<test/*.ml{,i,y}>: use_fd_send_recv
# OASIS_STOP
<lib>: include
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: 18cd88dd84aee043473789acd18ac8b6)
version = "0.1"
# DO NOT EDIT (digest: 0a469b53195f4c578082ce622a25da7c)
version = "1.0.1"
description =
"Bindings to sendmsg/recvmsg which allow fds to be sent/received"
requires = "unix"
Expand Down

0 comments on commit 8457006

Please sign in to comment.