balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A few fixes to make things more posix compliant in build/test scripts

Browse Source
This commit is contained in:
Alain Mebsout 2017-04-12 12:55:01 +02:00 committed by Grégoire Henry
parent e12e0e9a5b
commit 8777349a19
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/create_build_deps_docker_image.sh
View File

@ -2,7 +2,7 @@
set -e
script_dir="$(dirname "$(readlink -f "$0")")"
script_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
src_dir="$(dirname "$script_dir")"
cd "$src_dir"

2
scripts/create_docker_image.sh
View File

@ -2,7 +2,7 @@
set -e
script_dir="$(dirname "$(readlink -f "$0")")"
script_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
src_dir="$(dirname "$script_dir")"
cd "$src_dir"

4
scripts/install_build_deps.sh
View File

@ -1,6 +1,6 @@
#! /bin/sh
script_dir="$(dirname "$(readlink -f "$0")")"
script_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
src_dir="$(dirname "$script_dir")"
. "$script_dir/version.sh"
@ -54,7 +54,7 @@ if "$pin"; then
opam pin add typerex-build --dev --no-action
## Force opam to take account of the new `tezos-deps.opam`
opam pin --yes remove tezos-deps
opam pin --yes add --no-action tezos-deps src
opam pin --yes add --no-action tezos-deps $src_dir/src
fi
if "$depext"; then

2
scripts/launch-client.sh
View File

@ -2,7 +2,7 @@
set -e
script_dir="$(dirname "$(readlink -f "$0")")"
script_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
src_dir="$(dirname "$script_dir")"
cd "$src_dir"

2
scripts/launch-node.sh
View File

@ -2,7 +2,7 @@
set -e
script_dir="$(dirname "$(readlink -f "$0")")"
script_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
src_dir="$(dirname "$script_dir")"
cd "$src_dir"

6
src/Makefile
View File

@ -314,7 +314,7 @@ partial-clean::
.PHONY: clean partial-clean
clean:: partial-clean
partial-clean::
-find \( -name \*.cm\* -or -name \*.cmp -or -name \*.out -or -name \*~ -or -name \*.o -or -name \*.a \) -delete
-find . \( -name \*.cm\* -or -name \*.cmp -or -name \*.out -or -name \*~ -or -name \*.o -or -name \*.a \) -delete
## Dependencies
@ -366,8 +366,8 @@ compiler/tezos_compiler.cmo compiler/tezos_compiler.cmx: \
partial-clean::
-rm -f .depend
-find \( -name \*.mli.deps -or -name \*.ml.deps \) -delete
-find \( -name \*.mli.deps.byte -or -name \*.ml.deps.byte \) -delete
-find . \( -name \*.mli.deps -or -name \*.ml.deps \) -delete
-find . \( -name \*.mli.deps.byte -or -name \*.ml.deps.byte \) -delete
## Embedded protocol modules

4
test/Makefile.shared
View File

@ -79,10 +79,10 @@ ${SRCDIR}/client/%: ${CLIENTLIB}
.PHONY: clean partial-clean
clean:: partial-clean
partial-clean::
-find \( -name \*.cm\* -or -name \*.cmp -or -name \*.out -or -name \*~ -or -name \*.o -or -name \*.a \) -delete
-find . \( -name \*.cm\* -or -name \*.cmp -or -name \*.out -or -name \*~ -or -name \*.o -or -name \*.a \) -delete
-include .depend
.depend: $(shell find -name \*.ml -or -name \*.ml)
.depend: $(shell find . -name \*.ml -or -name \*.ml)
@echo OCAMLDEP "(test/$(notdir $(shell echo $$PWD)))"
@$(OCAMLDEP) -native $(INCLUDES) $^ > .depend

4
test/test-basic.sh
View File

@ -5,8 +5,8 @@ set -e
DIR=$(dirname "$0")
cd "${DIR}"
DATA_DIR="$(mktemp -td tezos_node.XXXXXXXXXX)"
CLIENT_DIR="$(mktemp -td tezos_client.XXXXXXXXXX)"
DATA_DIR="$(mktemp -d -t tezos_node.XXXXXXXXXX)"
CLIENT_DIR="$(mktemp -d -t tezos_client.XXXXXXXXXX)"
cleanup() {
[ -z "${NODE_PID}" ] || kill -9 ${NODE_PID} || true