Skip to content

Commit

Permalink
[ci] refs skycoin#17 Chnage url to download gimme.dll
Browse files Browse the repository at this point in the history
  • Loading branch information
stdevYuniers committed Dec 6, 2018
2 parents 2f9970e + b844c62 commit 1c29d17
Show file tree
Hide file tree
Showing 42 changed files with 17,690 additions and 18,504 deletions.
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ install:
- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
- cmd: swig -version
# Download, decompress and copy gimme to system folder
- cmd: curl -o gimme-dll.zip http://www.dlldownloader.com/gimme-dll/download/41c439f31bfea636635533d4ae192954/6467a807837072dbd28a0124bb5dc3f3/
- cmd: 7z x gimme-dll.zip
- cmd: curl -o gimme.dll https://fix4dll.com/get?file=gimme.dll&md5=9BF09079226324C2C4A8A65A880CFD41
# - cmd: 7z x gimme-dll.zip
- cmd: cp gimme.dll C:\Windows\SysWOW64

build: off
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ tests/mytest.py
*.swp
*.swo

# IDES
.idea/
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]

- Added all the SWIG interface files corresponding to the repository
### Added

- Add versions of Python3.4, 3.5 and 3.6 in skycoindev-cli:py3 image.
Expand All @@ -18,4 +18,3 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Known issues

- Pip tool for python3.4 is is not compatible with Debian's openssl package, so, python3.4 is installed without pip.
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SKYCOIN_DIR = gopath/src/github.com/skycoin/skycoin
SKYBUILD_DIR = $(SKYCOIN_DIR)/build
BUILDLIBC_DIR = $(SKYBUILD_DIR)/libskycoin
LIBC_DIR = $(SKYCOIN_DIR)/lib/cgo
LIBSWIG_DIR = $(SKYCOIN_DIR)/lib/swig
LIBSWIG_DIR = swig
BUILD_DIR = build
BIN_DIR = $(SKYCOIN_DIR)/bin
INCLUDE_DIR = $(SKYCOIN_DIR)/include
Expand Down Expand Up @@ -55,7 +55,9 @@ 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.coin.i
rm -f swig/include/swig.h
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:
$(PYTHON_BIN) setup.py develop
Expand All @@ -66,4 +68,4 @@ test-ci:
tox

test: build-libc build-swig develop
$(PYTHON_BIN) setup.py test
$(PYTHON_BIN) setup.py test
11 changes: 4 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ def build_extension(self, ext):
stdout, stderr = make_process.communicate()
print("stdout:")
sys.stderr.write(str(stdout))
if len(stderr) > 0:
print("stderr:")
sys.stderr.write(str(stderr))
# After making the library build the c library's
# python interface with the parent build_extension method
super(skycoin_build_ext, self).build_extension(ext)
Expand All @@ -76,13 +73,13 @@ def build_extension(self, ext):
library_file = path.join(lib_path, 'libskycoin.a')
extra_link_args = []
if platform.system() == "Darwin":
extra_link_args += ["-framework", "Foundation", "-framework", "Security"]
extra_link_args += ["-framework", "Foundation", "-framework", "Security"]
extra_link_args.append(library_file)

setup(
name='Pyskycoin', # Required
version='0.24.4', # Required
description='Skycoin Python Library',
name='Pyskycoin', # Required
version='0.25.0', # Required
description='Skycoin Python Library',
long_description=long_description,
url='https://github.com/simelo/pyskycoin',
author='stdevEclipse', # Optional
Expand Down
Loading

0 comments on commit 1c29d17

Please sign in to comment.