From a3f16c09657a521bebff49d2ff890da225d0bf51 Mon Sep 17 00:00:00 2001 From: Marcos Maceo Date: Sat, 4 May 2019 23:01:46 -0400 Subject: [PATCH] [swig] refs #131 Solve build issue --- .fuse_hidden0003358400000017 | Bin 0 -> 12288 bytes .gitignore | 2 +- Makefile | 14 +++++++------- 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 .fuse_hidden0003358400000017 diff --git a/.fuse_hidden0003358400000017 b/.fuse_hidden0003358400000017 new file mode 100644 index 0000000000000000000000000000000000000000..64fa72d47245106ffc15f4225f3f63c6e0b1644f GIT binary patch literal 12288 zcmeI2y>HV%7>D1MkFB%ec2|_4R&ixq3#6l|w5+712477?I`{JD9_^h1W)C-h< zf`JJpCU!b8uy#9^VTELluLwbfoSLU z!PbXtmcB}&p)pAwKIs~`o-!v5!hL6;eC;~LaA(a;T)XVVneAtu(UBtqo#-GkL-h|! z@enq^22NujO}dTd+~(@aa`CFyZY+vR7dKC{0*_?_Y=8~00XDz}*Z><~18iW*4J7dl zy+#hRWgf-H0opTVe^QrSuGjz@U;}J`4X^<=zy{a=8(;%$fDN#LDKy~vL|5jBeuDh} z|H=3Nk9neR-~fC9``{D!2;PIYU=LWZ1s;PISO<5(3b+Lp!BwyT&Vn<5z@H05-@!ik z4Bmk^U=MV_Hh2OafF`&D>fk204z7XAU>=+Y=fH2|@N1IG6g~^yG8<~18m@b7^usBr%yGp@uGE~NbXqA_{t%vedRicx7OA-@WmzV$P{Ia*fTYVMOTN) z5{0_s*pUt#>A7A{QCS^@6SGS)FKWV1l}L<8t&RdTc7+@HBF++JalHI+M&7l~pa{!2 zquRsNCZcPGBEOSQHECk8zkG?xykZwR^1>7eV72l*x$IHxo{2MIx}q8tI>K+4gOK4X zqESz&uxC;W0oAq&0!u~lbTXk)r)s+{%}@srR7f&}edn8PkDVN*c0Al}$5}C;-FA-B zKNhWH#!EbrZ7f}Eps2>3hK{<%Az$01GJV|bq&oB~(Xw9?fr`}74Moy}NSi;6@~Hh^ DMhWBN literal 0 HcmV?d00001 diff --git a/.gitignore b/.gitignore index fd012d99..a33bef8b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,7 @@ lib/swig/eggs eggs lib/swig/wheelhouse/ wheelhouse/ - +*fuse* *~ #Copy of libskycoin.h in pyskycoin diff --git a/Makefile b/Makefile index eb76ba88..52e4b6fc 100644 --- a/Makefile +++ b/Makefile @@ -65,33 +65,33 @@ build-swig: ## Generate Python C module from SWIG interfaces rm -f $(LIBSWIG_PYSKYCOIN)/swig/pyskycoin_wrap.c rm -f $(LIBSWIG_PYSKYCOIN)/swig/include/swig.h cp -v gopath/src/github.com/skycoin/skycoin/include/swig.h $(LIBSWIG_PYSKYCOIN)/swig/include/ - swig -python -Ilib/swig/swig/include -I$(INCLUDE_DIR) -outdir $(LIBSWIG_PYSKYCOIN)/skycoin/ -o $(LIBSWIG_PYSKYCOIN)/swig/pyskycoin_wrap.c $(LIBSWIG_DIR)/pyskycoin.i + swig -python -Ilib/swig/swig/include -I$(shell pwd)/gopath/src/github.com/skycoin/skycoin/include -outdir $(LIBSWIG_PYSKYCOIN)/skycoin/ -o $(LIBSWIG_PYSKYCOIN)/swig/pyskycoin_wrap.c $(LIBSWIG_DIR)/pyskycoin.i develop: ## Install PySkycoin for development - (cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py develop) \ + $(PYTHON) $(PYTHON_CLIENT_DIR)/setup.py develop \ (cd $(LIBSWIG_PYSKYCOIN) && $(PYTHON) setup.py develop) build-libc-swig: build-libc build-swig build: build-libc-swig ## Build PySkycoin Python package - (cd $(LIBSWIG_PYSKYCOIN) && $(PYTHON) setup.py build) + $(PYTHON) $(LIBSWIG_PYSKYCOIN)/setup.py build (cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py build) test-ci: ## Run tests on (Travis) CI build -# (cd $(LIBSWIG_PYSKYCOIN) && tox) + (cd $(PYTHON_CLIENT_DIR) && tox) (cd $(PYTHON_CLIENT_DIR) && tox) test: build-libc build-swig develop ## Run project test suite - (cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py test) \ + $(PYTHON) $(PYTHON_CLIENT_DIR)/setup.py test \ (cd $(LIBSWIG_PYSKYCOIN) && $(PYTHON) setup.py test) sdist: ## Create source distribution archive - (cd $(LIBSWIG_PYSKYCOIN) && $(PYTHON) setup.py sdist --formats=gztar) \ + $(PYTHON) $(LIBSWIG_PYSKYCOIN)/setup.py sdist --formats=gztar \ (cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py sdist --formats=gztar) bdist_wheel: ## Create architecture-specific binary wheel distribution archive - (cd $(LIBSWIG_PYSKYCOIN) && $(PYTHON) setup.py bdist_wheel)/ + $(PYTHON) $(LIBSWIG_PYSKYCOIN)/setup.py bdist_wheel \ (cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py bdist_wheel) # FIXME: After libskycoin 32-bits binaries add bdist_manylinux_i686