Skip to content

Commit 8903549

Browse files
ivgivg
committed
Merge pull request #1 from tmcgilchrist/opam_package
Setup for opam packaging.
2 parents 5992537 + 529b3bb commit 8903549

File tree

14 files changed

+1907
-643
lines changed

14 files changed

+1907
-643
lines changed

‎AUTHORS.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
(* OASIS_START *)
2-
(* DO NOT EDIT (digest: e50db38d140321f4b931ed21db6d1923) *)
3-
Authors of parallel
4-
Ivan Gotovchits <[email protected]>
2+
(* DO NOT EDIT (digest: ec50cd6052c5c7edabafe97758cc8e91) *)
3+
4+
Authors of lwt_parallel:
5+
6+
* Ivan Gotovchits <[email protected]>
7+
58
(* OASIS_STOP *)

‎INSTALL.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
(* OASIS_START *)
2-
(* DO NOT EDIT (digest: 4c4c0fe9898100dc3be0529f78d78db4) *)
3-
This is the INSTALL file for the parallel distribution.
2+
(* DO NOT EDIT (digest: a51a7562576d46e1b5e75ff0a0b1f62c) *)
3+
4+
This is the INSTALL file for the lwt_parallel distribution.
45

56
This package uses OASIS to generate its build system. See section OASIS for
6-
full information.
7+
full information.
78

89
Dependencies
910
============
1011

1112
In order to compile this package, you will need:
13+
1214
* ocaml
1315
* findlib
14-
* lwt for library parallel
15-
* fileutils for library parallel
16+
* lwt for library lwt_parallel
1617

1718
Installing
1819
==========
@@ -25,7 +26,7 @@ Installing
2526
Uninstalling
2627
============
2728

28-
1. Go to the root of the package
29+
1. Go to the root of the package
2930
2. Run 'ocaml setup.ml -uninstall'
3031

3132
OASIS

‎Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: bc1e05bfc8b39b664f29dae8dbd3ebbb)
2+
# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)
33

44
SETUP = ocaml setup.ml
55

@@ -12,7 +12,7 @@ doc: setup.data build
1212
test: setup.data build
1313
$(SETUP) -test $(TESTFLAGS)
1414

15-
all:
15+
all:
1616
$(SETUP) -all $(ALLFLAGS)
1717

1818
install: setup.data
@@ -24,15 +24,18 @@ uninstall: setup.data
2424
reinstall: setup.data
2525
$(SETUP) -reinstall $(REINSTALLFLAGS)
2626

27-
clean:
27+
clean:
2828
$(SETUP) -clean $(CLEANFLAGS)
2929

30-
distclean:
30+
distclean:
3131
$(SETUP) -distclean $(DISTCLEANFLAGS)
3232

3333
setup.data:
3434
$(SETUP) -configure $(CONFIGUREFLAGS)
3535

36+
configure:
37+
$(SETUP) -configure $(CONFIGUREFLAGS)
38+
3639
.PHONY: build doc test all install uninstall reinstall clean distclean configure
3740

3841
# OASIS_STOP

‎README.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
(* OASIS_START *)
2-
(* DO NOT EDIT (digest: bf5f04e07e3e3a11a911289dc6658d59) *)
3-
This is the README file for the parallel distribution.
2+
(* DO NOT EDIT (digest: 26ab0dc91868743ee758ecb45b268d43) *)
43

5-
Lwt-enabled parallel computing library
4+
lwt_parallel - Lwt-enabled parallel computing library
5+
=====================================================
66

7-
See the files INSTALL.txt for building and installation instructions.
7+
See the file [INSTALL.txt](INSTALL.txt) for building and installation
8+
instructions.
89

10+
Copyright and license
11+
---------------------
12+
13+
lwt_parallel is distributed under the terms of the MIT License.
914

1015
(* OASIS_STOP *)

‎_oasis

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
OASISFormat: 0.3
2-
Name: parallel
2+
Name: lwt_parallel
33
Version: 0.1.0
44
Synopsis: Lwt-enabled parallel computing library
55
Authors: Ivan Gotovchits <[email protected]>
66
License: MIT
77
Plugins: META (0.3), StdFiles (0.3), DevFiles (0.3)
88

9-
Library parallel
9+
Library lwt_parallel
1010
Path: lib
1111
BuildTools: ocamlbuild
1212
BuildDepends: lwt, lwt.unix, lwt.syntax
1313
Modules: Parallel
14-
14+
1515
Executable run_tests
1616
Path: lib_test
1717
Install: false
1818
BuildTools: ocamlbuild
19-
BuildDepends: parallel
19+
BuildDepends: lwt_parallel
2020
MainIs: run_tests.ml
21-

‎_tags

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: d7fb979fb34ae6a22a233304d6f1ba4b)
3-
# Ignore VCS directories, you can use the same kind of rule outside
4-
# OASIS_START/STOP if you want to exclude directories that contains
2+
# DO NOT EDIT (digest: 6ae27acb439a9d847880e98c9f93331b)
3+
# Ignore VCS directories, you can use the same kind of rule outside
4+
# OASIS_START/STOP if you want to exclude directories that contains
55
# useless stuff for the build process
6+
true: annot, bin_annot
67
<**/.svn>: -traverse
78
<**/.svn>: not_hygienic
89
".bzr": -traverse
@@ -13,23 +14,20 @@
1314
".git": not_hygienic
1415
"_darcs": -traverse
1516
"_darcs": not_hygienic
16-
# Library parallel
17-
"lib/parallel.cmxs": use_parallel
18-
<lib/*.ml{,i}>: pkg_lwt
19-
<lib/*.ml{,i}>: pkg_lwt.unix
20-
<lib/*.ml{,i}>: pkg_lwt.syntax
21-
<lib/*.ml{,i}>: pkg_fileutils
17+
# Library lwt_parallel
18+
"lib/lwt_parallel.cmxs": use_lwt_parallel
19+
<lib/*.ml{,i,y}>: pkg_lwt
20+
<lib/*.ml{,i,y}>: pkg_lwt.syntax
21+
<lib/*.ml{,i,y}>: pkg_lwt.unix
2222
# Executable run_tests
23-
"lib_test/run_tests.byte": use_parallel
2423
"lib_test/run_tests.byte": pkg_lwt
25-
"lib_test/run_tests.byte": pkg_lwt.unix
2624
"lib_test/run_tests.byte": pkg_lwt.syntax
27-
"lib_test/run_tests.byte": pkg_fileutils
28-
<lib_test/*.ml{,i}>: use_parallel
29-
<lib_test/*.ml{,i}>: pkg_lwt
30-
<lib_test/*.ml{,i}>: pkg_lwt.unix
31-
<lib_test/*.ml{,i}>: pkg_lwt.syntax
32-
<lib_test/*.ml{,i}>: pkg_fileutils
25+
"lib_test/run_tests.byte": pkg_lwt.unix
26+
"lib_test/run_tests.byte": use_lwt_parallel
27+
<lib_test/*.ml{,i,y}>: pkg_lwt
28+
<lib_test/*.ml{,i,y}>: pkg_lwt.syntax
29+
<lib_test/*.ml{,i,y}>: pkg_lwt.unix
30+
<lib_test/*.ml{,i,y}>: use_lwt_parallel
3331
# OASIS_STOP
3432
<lib/*.ml> : syntax_camlp4o
3533
<lib/*.ml> : annot

‎configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/sh
22

33
# OASIS_START
4-
# DO NOT EDIT (digest: 425187ed8bfdbdd207fd76392dd243a7)
4+
# DO NOT EDIT (digest: dc86c2ad450f91ca10c931b6045d0499)
55
set -e
66

77
FST=true
8-
for i in "$@"; do
8+
for i in "$@"; do
99
if $FST; then
1010
set --
1111
FST=false

‎lib/META

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: 2b9450486012b10a7f4101103e4a7a9a)
2+
# DO NOT EDIT (digest: 1b2563c1be59f9bca84171de109fc59a)
33
version = "0.1.0"
44
description = "Lwt-enabled parallel computing library"
5-
requires = "lwt lwt.unix lwt.syntax fileutils"
6-
archive(byte) = "parallel.cma"
7-
archive(byte, plugin) = "parallel.cma"
8-
archive(native) = "parallel.cmxa"
9-
archive(native, plugin) = "parallel.cmxs"
10-
exists_if = "parallel.cma"
5+
requires = "lwt lwt.unix lwt.syntax"
6+
archive(byte) = "lwt_parallel.cma"
7+
archive(byte, plugin) = "lwt_parallel.cma"
8+
archive(native) = "lwt_parallel.cmxa"
9+
archive(native, plugin) = "lwt_parallel.cmxs"
10+
exists_if = "lwt_parallel.cma"
1111
# OASIS_STOP
1212

‎lib/lwt_parallel.mldylib

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# OASIS_START
2+
# DO NOT EDIT (digest: 98402eecfbcefc336954458a01752131)
3+
Parallel
4+
# OASIS_STOP

‎lib/lwt_parallel.mllib

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# OASIS_START
2+
# DO NOT EDIT (digest: 98402eecfbcefc336954458a01752131)
3+
Parallel
4+
# OASIS_STOP

‎lib/parallel.mldylib

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# OASIS_START
2+
# DO NOT EDIT (digest: 98402eecfbcefc336954458a01752131)
3+
Parallel
4+
# OASIS_STOP

0 commit comments

Comments
 (0)