Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2015-2017 JoyStream AS

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# ProtocolWire
C++ wire library for the JoyStream extension protocol, as specified [here](http://#).

Current published release: `ProtocolWire/0.1.1@joystream/stable`
conan package name: `ProtocolWire/0.1.2@joystream/stable`

### Dependencies

Expand All @@ -26,4 +26,5 @@ sh run_tests.sh

## License & Copyright

`...add later...`
JoyStream protocol_wire library is released under the terms of the MIT license.
See [LICENSE](LICENCE) for more information.
7 changes: 4 additions & 3 deletions conan_package/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@

class ProtocolWireBase(ConanFile):
name = "ProtocolWire"
version = "0.1.1"
version = "0.1.2"
license = "(c) JoyStream Inc. 2016-2017"
url = "https://github.com/JoyStream/protocol_wire-cpp.git"
git_repo = "git@github.com:JoyStream/protocol_wire-cpp.git"
repo_ssh_url = "git@github.com:JoyStream/protocol_wire-cpp.git"
repo_https_url = "https://github.com/JoyStream/protocol_wire-cpp.git"
settings = "os", "compiler", "build_type", "arch"
generators = "cmake"
requires = "Common/0.1.1@joystream/stable"
requires = "Common/0.1.2@joystream/stable"
build_policy = "missing"

def source(self):
Expand Down
14 changes: 14 additions & 0 deletions conan_package/release_fetches_source_https.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
from base import ProtocolWireBase

# Use this recipe when creating recipies for uploading to joystream conan repo on stable channel
# Source will be fetched from github repo

class ProtocolWireRelease(ProtocolWireBase):
exports = "base.py"

# make extra sure no sources are exported by base package
exports_sources = ""

def source(self):
self.run("git clone %s repo" % self.repo_https_url)
self.run("cd repo && git checkout v%s" % self.version)
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ class ProtocolWireRelease(ProtocolWireBase):
exports_sources = ""

def source(self):
self.run("git clone %s repo" % self.git_repo)
self.run("git clone %s repo" % self.repo_ssh_url)
self.run("cd repo && git checkout v%s" % self.version)
2 changes: 1 addition & 1 deletion conan_package/test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PROJECT(PackageTest)
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.1 FATAL_ERROR)

set(CMAKE_CXX_STANDARD 11)

Expand Down
2 changes: 1 addition & 1 deletion sources/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
cmake_minimum_required(VERSION 3.1 FATAL_ERROR)

project(ProtocolWire CXX)

Expand Down