Permalink
Browse files

Slightly more robust install procedure.

  • Loading branch information...
vlad-alexandru-ionescu committed May 17, 2016
1 parent 92f40c0 commit 2a2d2846ea56afaadd498db2ef1847e3406b5e5b
Showing with 18 additions and 9 deletions.
  1. +1 −1 .travis.yml
  2. +15 −6 Makefile
  3. +2 −2 README.md
View
@@ -44,7 +44,7 @@ script:
- docker logs leverosnghttpxext
- docker logs leveroshost
- sudo make clean-all
- - make RUN_BACKGROUND=1 all fastrun && sleep 3 && make systest
+ - make RUN_BACKGROUND=1 fastcli fastrun && sleep 3 && make systest
- docker logs leverosconsul
- docker logs leverosaerospike
- docker logs leverosnghttpxext
View
@@ -91,10 +91,18 @@ ALL_LEVER_CONTAINERS = $(shell $(DOCKER) ps -a -q --filter="label=com.leveros.is
ADMIN_DIR := $(REPO_DIR)/$(ADMIN_ENV)/admin/1
.PHONY: all
-all: cli docker-images
+all: fastcli pull-docker-images
.PHONY: cli
-cli: $(BIN_DIR)/lever
+cli:
+ $(MAKE) clicommon
+
+.PHONY: fastcli
+fastcli:
+ $(MAKE) HAVE_GO="" HAVE_PROTOC="" clicommon
+
+.PHONY: clicommon
+clicommon: $(BIN_DIR)/lever
.PHONY: cmd
cmd: $(CMD_TARGETS)
@@ -112,14 +120,14 @@ systest: $(TEST_SERVICES_TARGETS)
.PHONY: run
run:
- $(MAKE) all
+ $(MAKE) cli docker-images
$(MAKE) runcommon
# This uses pre-built docker images as much as possible and compiles within
# docker.
.PHONY: fastrun
fastrun:
- $(MAKE) HAVE_GO="" runcommon
+ $(MAKE) HAVE_GO="" HAVE_PROTOC="" runcommon
.PHONY: runcommon
runcommon:
@@ -135,7 +143,7 @@ runcommon:
leveroshost nghttpxext
.PHONY: install-cli
-install-cli: $(BIN_DIR)/lever
+install-cli:
cp $< $(CLI_INSTALL_DIR)
.PHONY: uninstall-cli
@@ -224,7 +232,8 @@ PROTOC_CMD = \
if [ -n "$(HAVE_PROTOC)" ]; then \
$(PROTOC) -I $(dir $<) --go_out=plugins=grpc:$(dir $@) $< ;\
else \
- echo "Warning! protoc not found. Should be ok if not modifying protos." ;\
+ echo "Warning! protoc not found." \
+ "Should be ok if not modifying protos." ;\
fi
.SECONDARY: $(PROTO_TARGETS)
View
@@ -52,8 +52,8 @@ You will need to run the second command for every new terminal window.
```bash
$ git clone https://github.com/leveros/leveros
$ cd leveros
-$ make HAVE_GO="" cli pull-docker-images
-$ sudo make HAVE_GO="" install-cli
+$ make
+$ sudo make install-cli
$ make fastrun
```

0 comments on commit 2a2d284

Please sign in to comment.