Skip to content

Commit

Permalink
Merge pull request #1 from tmcgilchrist/opam_package
Browse files Browse the repository at this point in the history
Setup for opam packaging.
  • Loading branch information
ivg committed Jun 11, 2015
2 parents 5992537 + 529b3bb commit 8903549
Show file tree
Hide file tree
Showing 14 changed files with 1,907 additions and 643 deletions.
9 changes: 6 additions & 3 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(* OASIS_START *)
(* DO NOT EDIT (digest: e50db38d140321f4b931ed21db6d1923) *)
Authors of parallel
Ivan Gotovchits <[email protected]>
(* DO NOT EDIT (digest: ec50cd6052c5c7edabafe97758cc8e91) *)

Authors of lwt_parallel:

* Ivan Gotovchits <[email protected]>

(* OASIS_STOP *)
13 changes: 7 additions & 6 deletions INSTALL.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
(* OASIS_START *)
(* DO NOT EDIT (digest: 4c4c0fe9898100dc3be0529f78d78db4) *)
This is the INSTALL file for the parallel distribution.
(* DO NOT EDIT (digest: a51a7562576d46e1b5e75ff0a0b1f62c) *)

This is the INSTALL file for the lwt_parallel distribution.

This package uses OASIS to generate its build system. See section OASIS for
full information.
full information.

Dependencies
============

In order to compile this package, you will need:

* ocaml
* findlib
* lwt for library parallel
* fileutils for library parallel
* lwt for library lwt_parallel

Installing
==========
Expand All @@ -25,7 +26,7 @@ Installing
Uninstalling
============

1. Go to the root of the package
1. Go to the root of the package
2. Run 'ocaml setup.ml -uninstall'

OASIS
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
13 changes: 9 additions & 4 deletions README.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
(* OASIS_START *)
(* DO NOT EDIT (digest: bf5f04e07e3e3a11a911289dc6658d59) *)
This is the README file for the parallel distribution.
(* DO NOT EDIT (digest: 26ab0dc91868743ee758ecb45b268d43) *)

Lwt-enabled parallel computing library
lwt_parallel - Lwt-enabled parallel computing library
=====================================================

See the files INSTALL.txt for building and installation instructions.
See the file [INSTALL.txt](INSTALL.txt) for building and installation
instructions.

Copyright and license
---------------------

lwt_parallel is distributed under the terms of the MIT License.

(* OASIS_STOP *)
9 changes: 4 additions & 5 deletions _oasis
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
OASISFormat: 0.3
Name: parallel
Name: lwt_parallel
Version: 0.1.0
Synopsis: Lwt-enabled parallel computing library
Authors: Ivan Gotovchits <[email protected]>
License: MIT
Plugins: META (0.3), StdFiles (0.3), DevFiles (0.3)

Library parallel
Library lwt_parallel
Path: lib
BuildTools: ocamlbuild
BuildDepends: lwt, lwt.unix, lwt.syntax
Modules: Parallel

Executable run_tests
Path: lib_test
Install: false
BuildTools: ocamlbuild
BuildDepends: parallel
BuildDepends: lwt_parallel
MainIs: run_tests.ml

32 changes: 15 additions & 17 deletions _tags
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# OASIS_START
# DO NOT EDIT (digest: d7fb979fb34ae6a22a233304d6f1ba4b)
# 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: 6ae27acb439a9d847880e98c9f93331b)
# 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 @@ -13,23 +14,20 @@
".git": not_hygienic
"_darcs": -traverse
"_darcs": not_hygienic
# Library parallel
"lib/parallel.cmxs": use_parallel
<lib/*.ml{,i}>: pkg_lwt
<lib/*.ml{,i}>: pkg_lwt.unix
<lib/*.ml{,i}>: pkg_lwt.syntax
<lib/*.ml{,i}>: pkg_fileutils
# Library lwt_parallel
"lib/lwt_parallel.cmxs": use_lwt_parallel
<lib/*.ml{,i,y}>: pkg_lwt
<lib/*.ml{,i,y}>: pkg_lwt.syntax
<lib/*.ml{,i,y}>: pkg_lwt.unix
# Executable run_tests
"lib_test/run_tests.byte": use_parallel
"lib_test/run_tests.byte": pkg_lwt
"lib_test/run_tests.byte": pkg_lwt.unix
"lib_test/run_tests.byte": pkg_lwt.syntax
"lib_test/run_tests.byte": pkg_fileutils
<lib_test/*.ml{,i}>: use_parallel
<lib_test/*.ml{,i}>: pkg_lwt
<lib_test/*.ml{,i}>: pkg_lwt.unix
<lib_test/*.ml{,i}>: pkg_lwt.syntax
<lib_test/*.ml{,i}>: pkg_fileutils
"lib_test/run_tests.byte": pkg_lwt.unix
"lib_test/run_tests.byte": use_lwt_parallel
<lib_test/*.ml{,i,y}>: pkg_lwt
<lib_test/*.ml{,i,y}>: pkg_lwt.syntax
<lib_test/*.ml{,i,y}>: pkg_lwt.unix
<lib_test/*.ml{,i,y}>: use_lwt_parallel
# OASIS_STOP
<lib/*.ml> : syntax_camlp4o
<lib/*.ml> : annot
Expand Down
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
14 changes: 7 additions & 7 deletions lib/META
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# OASIS_START
# DO NOT EDIT (digest: 2b9450486012b10a7f4101103e4a7a9a)
# DO NOT EDIT (digest: 1b2563c1be59f9bca84171de109fc59a)
version = "0.1.0"
description = "Lwt-enabled parallel computing library"
requires = "lwt lwt.unix lwt.syntax fileutils"
archive(byte) = "parallel.cma"
archive(byte, plugin) = "parallel.cma"
archive(native) = "parallel.cmxa"
archive(native, plugin) = "parallel.cmxs"
exists_if = "parallel.cma"
requires = "lwt lwt.unix lwt.syntax"
archive(byte) = "lwt_parallel.cma"
archive(byte, plugin) = "lwt_parallel.cma"
archive(native) = "lwt_parallel.cmxa"
archive(native, plugin) = "lwt_parallel.cmxs"
exists_if = "lwt_parallel.cma"
# OASIS_STOP

4 changes: 4 additions & 0 deletions lib/lwt_parallel.mldylib
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: 98402eecfbcefc336954458a01752131)
Parallel
# OASIS_STOP
4 changes: 4 additions & 0 deletions lib/lwt_parallel.mllib
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: 98402eecfbcefc336954458a01752131)
Parallel
# OASIS_STOP
4 changes: 4 additions & 0 deletions lib/parallel.mldylib
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: 98402eecfbcefc336954458a01752131)
Parallel
# OASIS_STOP
Loading

0 comments on commit 8903549

Please sign in to comment.