From 0efcc73beaf94a588e6a6e8b474ced9d800d0f52 Mon Sep 17 00:00:00 2001 From: Podkopaev Anton Date: Mon, 19 Feb 2018 15:53:48 +0300 Subject: [PATCH 1/5] Build configuration. --- .travis.yml | 8 ++++++++ opam | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 .travis.yml create mode 100644 opam diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..b3cc7f0f5 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +language: c +sudo: required +install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh +script: bash -ex .travis-opam.sh +env: + - OCAML_VERSION=4.06 +os: + - linux \ No newline at end of file diff --git a/opam b/opam new file mode 100644 index 000000000..25174bcbc --- /dev/null +++ b/opam @@ -0,0 +1,28 @@ +opam-version: "1.2" +authors: "dboulytchev@gmail.com" +maintainer: "dboulytchev@gmail.com" +version: "0.3" +homepage: "https://github.com/dboulytchev/compiler-workout" +bug-reports: "https://github.com/dboulytchev/compiler-workout/issues" +dev-repo: "git+https://github.com/dboulytchev/compiler-workout.git" + +build: [ + [make "-f" "Makefile" ] +] + +install: [make "-f" "Makefile" "PREFIX=%{prefix}%" "install"] +remove: ["ocamlfind" "remove" "compiler-workout"] +flags: [ light-uninstall ] + +build-test: [ + [make "-f" "Makefile.ob" "test"] +] + +depends: [ + "ocamlbuild" {build} + "ocamlfind" + "camlp5" + "ostap" + "GT" + "re" +] \ No newline at end of file From 3a1e425fa0a34980eb28b617b11cd79400f2e0eb Mon Sep 17 00:00:00 2001 From: Podkopaev Anton Date: Mon, 19 Feb 2018 16:08:01 +0300 Subject: [PATCH 2/5] Changed link to Travis build script. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b3cc7f0f5..7dbaf148d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: c sudo: required -install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh +install: wget https://raw.githubusercontent.com/anlun/ocaml-ci-scripts/patch-1/.travis-opam.sh script: bash -ex .travis-opam.sh env: - OCAML_VERSION=4.06 From 0a1922520b494488a6a414787417a3ea48ee64d9 Mon Sep 17 00:00:00 2001 From: Podkopaev Anton Date: Mon, 19 Feb 2018 17:19:00 +0300 Subject: [PATCH 3/5] Updated Travis build script. --- Makefile | 7 ++++++- opam | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d13b54d61..4b162e273 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,15 @@ SHELL := /bin/bash -.PHONY: all +.PHONY: all regression all: pushd src && make && popd +install: ; + +regression: + pushd regression && ./test.sh && popd + clean: pushd src && make clean && popd diff --git a/opam b/opam index 25174bcbc..8a6eea720 100644 --- a/opam +++ b/opam @@ -15,7 +15,7 @@ remove: ["ocamlfind" "remove" "compiler-workout"] flags: [ light-uninstall ] build-test: [ - [make "-f" "Makefile.ob" "test"] + [make "-f" "Makefile" "regression"] ] depends: [ From 142a4ad4033e5995a9ee203f7183533d08be8e2e Mon Sep 17 00:00:00 2001 From: Anton Podkopaev Date: Mon, 19 Feb 2018 17:22:55 +0300 Subject: [PATCH 4/5] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index e2e51686a..552617ec3 100644 --- a/README.md +++ b/README.md @@ -12,5 +12,3 @@ Building: * `opam install GT` * To build the sources: `make` from the top project directory * To test: `test.sh` from `regression` subfolder - - From 6cb78de5a4e75b86d26f2d73d28e48a5e43e3404 Mon Sep 17 00:00:00 2001 From: Podkopaev Anton Date: Mon, 19 Feb 2018 17:35:47 +0300 Subject: [PATCH 5/5] Removed `install` from OPAM configuration file. --- opam | 1 - 1 file changed, 1 deletion(-) diff --git a/opam b/opam index 8a6eea720..2099ce320 100644 --- a/opam +++ b/opam @@ -10,7 +10,6 @@ build: [ [make "-f" "Makefile" ] ] -install: [make "-f" "Makefile" "PREFIX=%{prefix}%" "install"] remove: ["ocamlfind" "remove" "compiler-workout"] flags: [ light-uninstall ]