Skip to content

Commit 56fe74a

Browse files
committed
Dune packaging
1 parent ebb29f0 commit 56fe74a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+355
-14951
lines changed

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,11 @@ ocp-autoconf.d/config.ocp2inc
2323

2424
_esy
2525
esy.lock
26+
27+
_build
28+
*.merlin
29+
autoconf
30+
ocp-autoconf.d
31+
test/*.js
32+
examples/chrome-extension/*.js
33+
configure

.merlin

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
export OPAMYES=1 OPAMVERBOSE=1
4-
eval `opam config env`
4+
eval $(opam env)
55

66
echo Architecture
77
uname -a
@@ -13,7 +13,5 @@ opam --git-version
1313

1414
PREFIX=$HOME/.opam/$OCAML_VERSION
1515

16-
opam pin add my-package .
17-
opam install my-package
18-
opam remove my-package
19-
16+
opam install .
17+
opam remove .
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@ echo OPAM versions
99
opam --version
1010
opam --git-version
1111

12-
opam init
13-
opam switch $OCAML_VERSION
14-
12+
opam init --disable-sandboxing --compiler=${OCAML_VERSION}

.travis.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,10 @@ addons:
88
- ocaml
99
- opam
1010
- ocaml-native-compilers
11-
install: sh -ex ./autoconf/travis-install.sh
11+
install: sh -ex .travis-install.sh
1212
cache:
1313
directories:
1414
- ${HOME}/.opam
15-
script: sh -ex ./autoconf/travis-ci.sh
15+
script: sh -ex .travis-ci.sh
1616
env:
17-
- OCAML_VERSION=system
18-
- OCAML_VERSION=4.02.3
19-
- OCAML_VERSION=4.03.0
20-
- OCAML_VERSION=4.04.0
21-
- OCAML_VERSION=4.05.0
22-
- OCAML_VERSION=4.06.1
23-
- OCAML_VERSION=4.07.0
17+
- OCAML_VERSION=4.08.1

CHANGES

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## 0.0 (2020-05-15)
2+
3+
Initial public release

Makefile

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,33 @@
1+
-include autoconf/Makefile.config
12

2-
#############################################################################
3-
#
4-
# This file is managed by ocp-autoconf.
5-
#
6-
# Remove it from `manage_files` in 'ocp-autoconf.config' if you want to
7-
# modify it manually.
8-
#
9-
#############################################################################
10-
11-
BASE64_3:=true
3+
all: build
124

13-
include autoconf/Makefile.config
5+
build:
6+
dune build
147

15-
all: build
8+
clean:
9+
dune clean
1610

17-
-include ocp-autoconf.d/Makefile
11+
install:
12+
dune install
1813

19-
build: base64-conf ocp-build-build $(PROJECT_BUILD)
14+
ocp-build-conf:
15+
ocp-autoconf
2016

21-
install: ocp-build-install $(PROJECT_INSTALL)
17+
ocp-build: ocp-build-conf
18+
ocp-build $(PROJECT_BUILD)
2219

23-
clean: ocp-build-clean $(PROJECT_CLEAN)
20+
ocp-build-install: ocp-build-install $(PROJECT_INSTALL)
2421

25-
distclean: clean ocp-distclean $(PROJECT_DISTCLEAN)
26-
find . -name '*~' -exec rm -f {} \;
22+
ocp-build-clean: ocp-build-clean $(PROJECT_CLEAN)
2723

28-
test: build
24+
test: ocp-build
2925
cp _obuild/main/main.js test
3026

31-
chrome-extension-example: build
27+
chrome-extension-example: ocp-build
3228
cp _obuild/background-example/background-example.js examples/chrome-extension
3329
cp _obuild/popup-example/popup-example.js examples/chrome-extension
3430
cp _obuild/options-example/options-example.js examples/chrome-extension
3531
cp _obuild/chrome-example/chrome-example.js examples/chrome-extension
3632

37-
include autoconf/Makefile.rules
33+
-include autoconf/Makefile.rules

autoconf/.gitignore

Lines changed: 0 additions & 7 deletions
This file was deleted.

autoconf/Makefile.config.in

Lines changed: 0 additions & 28 deletions
This file was deleted.

autoconf/Makefile.rules

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)