diff --git a/.appveyor.yml b/.appveyor.yml index 206a74ca..47cced00 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,7 +7,6 @@ environment: global: GOOS: windows GOARCH: amd64 -# GOPATH: c:\gopath GOPATH: C:\projects\pyskycoin\gopath\ GIT: c:\Program Files\Git\bin APPVEYOR_SAVE_CACHE_ON_ERROR: true @@ -61,7 +60,7 @@ install: # - cmd: git submodule foreach git checkout develop - cmd: cd gopath/src/github.com/skycoin/skycoin - cmd: git checkout origin/stdevEclipse_t1568_swig_files - - cmd: git pull origin stdevEclipse_t1568_swig_files +# - cmd: git pull origin stdevEclipse_t1568_swig_files - cmd: cd C:\projects\pyskycoin - cmd: curl -fsSL -o swigwin-3.0.12.zip "https://downloads.sourceforge.net/project/swig/swigwin/swigwin-3.0.12/swigwin-3.0.12.zip?r=https%3A%2F%2Fsourceforge.net%2Fprojects%2Fswig%2Ffiles%2Fswigwin%2Fswigwin-3.0.12%2Fswigwin-3.0.12.zip%2Fdownload%3Fuse_mirror%3Dayera&ts=1531774939" - cmd: 7z x swigwin-3.0.12.zip @@ -113,7 +112,6 @@ before_test: - cmd: cd C:\projects\pyskycoin\gopath\src\github.com\skycoin\skycoin\ - cmd: go get github.com/gz-c/gox - cmd: go get -t ./... - - cmd: mingw32-make build-libc test_script: - cmd: cd C:\projects\pyskycoin\ diff --git a/Makefile b/Makefile index 28b1f4f8..6d926451 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ build-swig: } rm -f ./skycoin/skycoin.py rm -f swig/pyskycoin_wrap.c - swig -python -Iswig/include -I$(INCLUDE_DIR) -outdir ./skycoin/ -o swig/pyskycoin_wrap.c $(LIBSWIG_DIR)/skycoin.i + swig -python -Iswig/include -I$(INCLUDE_DIR) -outdir ./skycoin/ -o swig/pyskycoin_wrap.c $(LIBSWIG_DIR)/skycoin.coin.i develop: $(PYTHON_BIN) setup.py develop diff --git a/gopath/src/github.com/skycoin/skycoin b/gopath/src/github.com/skycoin/skycoin index dadeafcc..8d49f360 160000 --- a/gopath/src/github.com/skycoin/skycoin +++ b/gopath/src/github.com/skycoin/skycoin @@ -1 +1 @@ -Subproject commit dadeafccf69807013c10324927bf83e033f9ed5a +Subproject commit 8d49f36088303e08f822ac8969acefbc009431a6