Skip to content

Commit

Permalink
Dune packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
maxtori committed May 15, 2020
1 parent ebb29f0 commit 56fe74a
Show file tree
Hide file tree
Showing 67 changed files with 355 additions and 14,951 deletions.
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,11 @@ ocp-autoconf.d/config.ocp2inc

_esy
esy.lock

_build
*.merlin
autoconf
ocp-autoconf.d
test/*.js
examples/chrome-extension/*.js
configure
6 changes: 0 additions & 6 deletions .merlin

This file was deleted.

8 changes: 3 additions & 5 deletions autoconf/travis-ci.sh → .travis-ci.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

export OPAMYES=1 OPAMVERBOSE=1
eval `opam config env`
eval $(opam env)

echo Architecture
uname -a
Expand All @@ -13,7 +13,5 @@ opam --git-version

PREFIX=$HOME/.opam/$OCAML_VERSION

opam pin add my-package .
opam install my-package
opam remove my-package

opam install .
opam remove .
4 changes: 1 addition & 3 deletions autoconf/travis-install.sh → .travis-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ echo OPAM versions
opam --version
opam --git-version

opam init
opam switch $OCAML_VERSION

opam init --disable-sandboxing --compiler=${OCAML_VERSION}
12 changes: 3 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,10 @@ addons:
- ocaml
- opam
- ocaml-native-compilers
install: sh -ex ./autoconf/travis-install.sh
install: sh -ex .travis-install.sh
cache:
directories:
- ${HOME}/.opam
script: sh -ex ./autoconf/travis-ci.sh
script: sh -ex .travis-ci.sh
env:
- OCAML_VERSION=system
- OCAML_VERSION=4.02.3
- OCAML_VERSION=4.03.0
- OCAML_VERSION=4.04.0
- OCAML_VERSION=4.05.0
- OCAML_VERSION=4.06.1
- OCAML_VERSION=4.07.0
- OCAML_VERSION=4.08.1
3 changes: 3 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## 0.0 (2020-05-15)

Initial public release
38 changes: 17 additions & 21 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,37 +1,33 @@
-include autoconf/Makefile.config

#############################################################################
#
# This file is managed by ocp-autoconf.
#
# Remove it from `manage_files` in 'ocp-autoconf.config' if you want to
# modify it manually.
#
#############################################################################

BASE64_3:=true
all: build

include autoconf/Makefile.config
build:
dune build

all: build
clean:
dune clean

-include ocp-autoconf.d/Makefile
install:
dune install

build: base64-conf ocp-build-build $(PROJECT_BUILD)
ocp-build-conf:
ocp-autoconf

install: ocp-build-install $(PROJECT_INSTALL)
ocp-build: ocp-build-conf
ocp-build $(PROJECT_BUILD)

clean: ocp-build-clean $(PROJECT_CLEAN)
ocp-build-install: ocp-build-install $(PROJECT_INSTALL)

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

test: build
test: ocp-build
cp _obuild/main/main.js test

chrome-extension-example: build
chrome-extension-example: ocp-build
cp _obuild/background-example/background-example.js examples/chrome-extension
cp _obuild/popup-example/popup-example.js examples/chrome-extension
cp _obuild/options-example/options-example.js examples/chrome-extension
cp _obuild/chrome-example/chrome-example.js examples/chrome-extension

include autoconf/Makefile.rules
-include autoconf/Makefile.rules
7 changes: 0 additions & 7 deletions autoconf/.gitignore

This file was deleted.

28 changes: 0 additions & 28 deletions autoconf/Makefile.config.in

This file was deleted.

42 changes: 0 additions & 42 deletions autoconf/Makefile.rules

This file was deleted.

16 changes: 0 additions & 16 deletions autoconf/aclocal.m4

This file was deleted.

55 changes: 0 additions & 55 deletions autoconf/config.ocp2gen.in

This file was deleted.

49 changes: 0 additions & 49 deletions autoconf/config.ocpgen.in

This file was deleted.

Loading

0 comments on commit 56fe74a

Please sign in to comment.