Skip to content

Commit

Permalink
Merge pull request fibercrypto#73 from fibercrypto/stdevHan_t72_updat…
Browse files Browse the repository at this point in the history
…e_0.27.0

Fixes fibercrypto#72 Update submodule to 0.27.0
  • Loading branch information
stdevMac authored Nov 15, 2019
2 parents fd8a248 + 241915e commit fa2370d
Show file tree
Hide file tree
Showing 31 changed files with 11,981 additions and 7,187 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "gopath/src/github.com/skycoin/libskycoin"]
path = gopath/src/github.com/skycoin/libskycoin
url = https://github.com/skycoin/libskycoin
[submodule "gopath/src/github.com/fibercrypto/libskycoin"]
path = gopath/src/github.com/fibercrypto/libskycoin
url = https://github.com/fibercrypto/libskycoin
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ sudo: required
env:
global:
- CGO_ENABLED: 1
- PATH_SUBMODULE: "gopath/src/github.com/fibercrypto/libskycoin"

matrix:
include:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Changed

- Update Skyapi wrapper for Skycoin node REST API version 0.26.0
- Submodule change skycoin/skycoin => skycoin/libskycoin@develop
- Submodule change skycoin/skycoin => fibercrypto/libskycoin@develop

### Fixed

Expand Down
18 changes: 10 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.DEFAULT_GOAL := help
.PHONY: configure build-libc build-swig develop build-libc-swig build
.PHONY: test test-ci help
.PHONY: test test-ci help clean

# Compilation output
.ONESHELL:
Expand All @@ -9,7 +9,7 @@ SHELL := /bin/bash
MKFILE_PATH = $(abspath $(lastword $(MAKEFILE_LIST)))
REPO_ROOT = $(dir $(MKFILE_PATH))
GOPATH_DIR = gopath
SKYLIBC_DIR ?= $(GOPATH_DIR)/src/github.com/skycoin/libskycoin
SKYLIBC_DIR ?= $(GOPATH_DIR)/src/github.com/fibercrypto/libskycoin
SKYCOIN_DIR ?= $(SKYLIBC_DIR)/vendor/github.com/skycoin/skycoin
SKYBUILD_DIR = $(SKYLIBC_DIR)/build
BUILDLIBC_DIR = $(SKYBUILD_DIR)/libskycoin
Expand Down Expand Up @@ -63,7 +63,7 @@ else
endif

# Added by Swagger
LIB_SKYCOIN_DIR = gopath/src/github.com/skycoin/libskycoin
LIB_SKYCOIN_DIR = gopath/src/github.com/fibercrypto/libskycoin
SWAGGER_SPEC_DIR = $(LIB_SKYCOIN_DIR)/lib/swagger/skycoin.v0.26.0.openapi.v2.yml
CSHARP_CLIENT_DIR = lib/skyapi
CSHARP_SWIG_DIR = lib/swig
Expand All @@ -90,13 +90,13 @@ build-libc: configure ## Build libskycoin C client library

build-swig: ## Generate C# C module from SWIG interfaces
#Generate structs.i from skytypes.gen.h
rm -f $(CSHARP_SWIG_DIR)/structs.i
cp $(INCLUDE_DIR)/skytypes.gen.h $(CSHARP_SWIG_DIR)/structs.i
rm -f $(CSHARP_SWIG_DIR)/swig/include/structs.i
cp $(INCLUDE_DIR)/skytypes.gen.h $(CSHARP_SWIG_DIR)/swig/include/structs.i
{ \
if [[ "$$(uname -s)" == "Darwin" ]]; then \
sed -i '.kbk' 's/#/%/g' $(CSHARP_SWIG_DIR)/structs.i ;\
sed -i '.kbk' 's/#/%/g' $(CSHARP_SWIG_DIR)/swig/include/structs.i ;\
else \
sed -i 's/#/%/g' $(CSHARP_SWIG_DIR)/structs.i ;\
sed -i 's/#/%/g' $(CSHARP_SWIG_DIR)/swig/include/structs.i ;\
fi \
}
mkdir -p $(CSHARP_SWIG_DIR)/LibskycoinNet/skycoin
Expand Down Expand Up @@ -135,7 +135,7 @@ test-libsky-mono: build-mono ## Run LibSkycoinNet test suite mono
$(LDPATHVAR)="$(LDCOPY):$(LDPATHVAR)" mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe $(CSHARP_SWIG_DIR)/LibskycoinNetTest/bin/Release/LibskycoinNetTest.dll -labels

test-libsky-dotnet: build-dotnet
$(LDPATHVAR)="$(LDCOPY):$(LDPATHVAR)" dotnet test $(CSHARP_SWIG_DIR)/LibSkycoinDotNet.sln
$(LDPATHVAR)="$(LDCOPY):$(LDPATHVAR)" dotnet test -v n $(CSHARP_SWIG_DIR)/LibSkycoinDotNet.sln

build-skyapi: ## Build SkyApi Assembly
(cd $(CSHARP_CLIENT_DIR) && /bin/sh build.sh)
Expand All @@ -148,6 +148,8 @@ lint:
gendarme --v --config rules.xml --severity critical lib/swig/LibskycoinNet/bin/Release/netstandard2.0/LibSkycoinDotNet.dll
gendarme --v --config rules.xml --severity critical lib/swig/LibskycoinNet/bin/Release/LibskycoinNet.dll

clean: ## Clean all trash
GOPATH="$(REPO_ROOT)/$(GOPATH_DIR)" make -C $(SKYLIBC_DIR) clean-libc

help:
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
Expand Down
4 changes: 2 additions & 2 deletions docker/images/dev-cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ LABEL "org.label-schema.name"="libskycoin-dotnet" \
"org.label-schema.version"="0.1.0" \
"org.label-schema.schema-version"="1.0" \
"org.label-schema.build-date"=$BDATE \
"org.label-schema.vcs-url"="https://github.com/skycoin/libskycoin-dotnet.git" \
"org.label-schema.vcs-url"="https://github.com/fibercrypto/libskycoin-dotnet.git" \
"org.label-schema.vcs-ref"=$SCOMMIT \
"org.label-schema.usage"="https://github.com/skycoin/libskycoin-dotnet/blob/"$SCOMMIT"/docker/images/dev-cli/README.md" \
"org.label-schema.usage"="https://github.com/fibercrypto/libskycoin-dotnet/blob/"$SCOMMIT"/docker/images/dev-cli/README.md" \
"org.label-schema.docker.cmd"="mkdir src; docker run --rm -v ${PWD}/src:/usr/local/src skycoin/skycoindev-dotnet:develop git clone https://github.com/simelo/libskycoin-dotnet.git; sudo chown -R `whoami` src"

ENV MONO_VERSION 4.8.0.524
Expand Down
1 change: 1 addition & 0 deletions gopath/src/github.com/fibercrypto/libskycoin
Submodule libskycoin added at e89588
1 change: 0 additions & 1 deletion gopath/src/github.com/skycoin/libskycoin
Submodule libskycoin deleted from d6046c
22 changes: 19 additions & 3 deletions lib/swig/LibskycoinNet/LibskycoinNet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@
<Compile Include="skycoin\SWIGTYPE_p_ReadableEntry__Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_ReadableWallet__Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_Signature_Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_SortableTransactionResult_Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_Strings__Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_Transaction__Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_Transactions__Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_WalletResponse__Handle.cs" />
Expand Down Expand Up @@ -126,7 +124,6 @@
<Compile Include="skycoin\cipher_Addresses.cs" />
<Compile Include="skycoin\cipher__BitcoinAddress.cs" />
<Compile Include="skycoin\api__NetworkConnectionsFilter.cs" />
<Compile Include="skycoin\SWIGTYPE_p_p_GoSlice_.cs" />
<Compile Include="skycoin\SWIGTYPE_p_GoUint32_.cs" />
<Compile Include="skycoin\SWIGTYPE_p_GoUint64_.cs" />
<Compile Include="skycoin\SWIGTYPE_p_GoUint8_.cs" />
Expand All @@ -152,6 +149,25 @@
<Compile Include="skycoin\SWIGTYPE_p_ReadableUnspentOutputsSummary_Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_Hash_Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_UnspentOutputsSummary_Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_Distribution__Handle.cs" />
<Compile Include="skycoin\coin__UxArray.cs" />
<Compile Include="skycoin\SWIGTYPE_p_SortableTransactions_Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_MetaWallet__Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_PrivateKey__Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_Account__Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_Coin__Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_CollectionWallet__Handle.cs" />
<Compile Include="skycoin\cli__PasswordFromBytes.cs" />
<Compile Include="skycoin\SWIGTYPE_p_WalletRecoverRequest__Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_CreateWalletOptions__Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_WalletSeedResponse__Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_BalanceResult_Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_GetOutputser__Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_PublicKey__Handle.cs" />
<Compile Include="skycoin\SWIGTYPE_p_Path__Handle.cs" />
<Compile Include="skycoin\coin__Transactions.cs" />
<Compile Include="skycoin\bip32__PathNode.cs" />
<Compile Include="skycoin\wallet__CryptoType.cs" />
</ItemGroup>
<ItemGroup>
<None Include="skycoin\skycoinnet_wrap.c" />
Expand Down
Loading

0 comments on commit fa2370d

Please sign in to comment.