From 04c85bdae05062b4d1e7d3b7ea9360808102b802 Mon Sep 17 00:00:00 2001 From: Olemis Lang Date: Fri, 28 Dec 2018 21:47:49 -0500 Subject: [PATCH 1/3] [ci] refs #85 - Add make help --- Makefile | 3 +++ gopath/src/github.com/skycoin/skycoin | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 84b5d522..5b285b9f 100644 --- a/Makefile +++ b/Makefile @@ -69,3 +69,6 @@ test-ci: test: build-libc build-swig develop $(PYTHON_BIN) setup.py test + +help: + @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' diff --git a/gopath/src/github.com/skycoin/skycoin b/gopath/src/github.com/skycoin/skycoin index 230c856b..438f338f 160000 --- a/gopath/src/github.com/skycoin/skycoin +++ b/gopath/src/github.com/skycoin/skycoin @@ -1 +1 @@ -Subproject commit 230c856be4b2ee105f97716704d38fe094aed44f +Subproject commit 438f338fff7f58c14abf10265574625988e36cbf From 7266fdc4f260b177d18f6624b941191a113e5ee5 Mon Sep 17 00:00:00 2001 From: Olemis Lang Date: Fri, 28 Dec 2018 21:56:40 -0500 Subject: [PATCH 2/3] [ci] refs #93 - Implement make help --- Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 5b285b9f..dc3c4017 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ else ifeq ($(shell uname -s),Darwin) TEMP_DIR = $TMPDIR endif -configure: +configure: ## Configure build environment mkdir -p $(BUILD_DIR)/usr/tmp $(BUILD_DIR)/usr/lib $(BUILD_DIR)/usr/include mkdir -p $(BUILDLIBC_DIR) $(BIN_DIR) $(INCLUDE_DIR) @@ -38,10 +38,9 @@ $(BUILDLIBC_DIR)/libskycoin.a: $(LIB_FILES) $(SRC_FILES) $(HEADER_FILES) mkdir -p swig/include grep -v _Complex $(INCLUDE_DIR)/libskycoin.h > swig/include/libskycoin.h -## Build libskycoin C client library -build-libc: configure $(BUILDLIBC_DIR)/libskycoin.a +build-libc: configure $(BUILDLIBC_DIR)/libskycoin.a ## Build libskycoin C client library -build-swig: +build-swig: ## Generate Pyhton C module from SWIG interfaces #Generate structs.i from skytypes.gen.h rm -f $(LIBSWIG_DIR)/structs.i cp $(INCLUDE_DIR)/skytypes.gen.h $(LIBSWIG_DIR)/structs.i @@ -59,16 +58,18 @@ build-swig: cp -v gopath/src/github.com/skycoin/skycoin/include/swig.h swig/include/ swig -python -Iswig/include -I$(INCLUDE_DIR) -outdir ./skycoin/ -o swig/pyskycoin_wrap.c $(LIBSWIG_DIR)/pyskycoin.i -develop: +develop: ## Install PySkycoin for development $(PYTHON_BIN) setup.py develop build-libc-swig: build-libc build-swig -test-ci: +build: build-libc-swig ## Build PySkycoin Python package + +test-ci: ## Run tests on (Travis) CI build tox -test: build-libc build-swig develop +test: build-libc build-swig develop ## Run project test suite $(PYTHON_BIN) setup.py test -help: +help: ## List available commands @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' From d9d5dc904e2b4fd62e5ec718ce5ffbb785ff8e4c Mon Sep 17 00:00:00 2001 From: Olemis Lang Date: Fri, 28 Dec 2018 22:14:52 -0500 Subject: [PATCH 3/3] refs #93 - make build and make help in CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88b62c92..8faab6ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added +- Add `make build` target to build PySkycoin C extension module +- Add `make help` - Add Python-specific SWIG interface files - Add versions of Python3.4, 3.5 and 3.6 in skycoindev-cli:py3 image.