Merge pull request #10 from JoyStream/development

dev to master

Author: mnaamani

.gitignore

@@ -1,4 +1,2 @@
 build/
-conanbuildinfo.*
-conaninfo.txt
-
+*.pyc

README.md

@@ -0,0 +1,30 @@
+from conans import ConanFile, CMake, tools
+import os
+
+class ProtocolSessionBase(ConanFile):
+    name = "ProtocolSession"
+    version = "0.1.1"
+    license = "(c) JoyStream Inc. 2016-2017"
+    url = "https://github.com/JoyStream/protocol_session-conan.git"
+    git_repo = "git@github.com:JoyStream/protocol_session-cpp.git"
+    settings = "os", "compiler", "build_type", "arch"
+    generators = "cmake"
+    requires = "ProtocolStateMachine/0.1.1@joystream/stable"
+    build_policy = "missing"
+
+    def source(self):
+        raise Exception("abstract base package was exported")
+
+    def build(self):
+        cmake = CMake(self.settings)
+        self.run('cmake repo/sources %s' % (cmake.command_line))
+        self.run("cmake --build . %s" % cmake.build_config)
+
+    def package(self):
+        self.copy("*.hpp", dst="include", src="repo/sources/include/")
+        self.copy("*.cpp", dst="include", src="repo/sources/include/") #template defenitions
+        self.copy("*.a", dst="lib", keep_path=False)
+        self.copy("*.lib", dst="lib", keep_path=False)
+
+    def package_info(self):
+        self.cpp_info.libs = ["protocol_session"]

conan_package/base.py

@@ -0,0 +1,42 @@
+import os
+import shutil
+from distutils.dir_util import copy_tree
+from base import ProtocolSessionBase
+
+# The reason the local package is named conanfile.py and not testing.py is to we can run
+# the test_pacakge command (it doesn't accept a --filename arg)
+# This way the "default mode" of working with the pacakges is with the testing channels
+
+# By default conan export uses the testing channel if not specified so it is also convenient to just run
+# `conan export joystream` for local development
+
+LOCAL_REPO_PATH_ENV = "PROTOCOL_SESSION_LOCAL_REPO_PATH"
+
+class ProtocolSessionTesting(ProtocolSessionBase):
+    # No real version is defined when working with a package on the testing channel
+    # Keep at at 0.0.0 to detect accidentally exporting to stable branch
+    # It would be nice to have a method that conan calls when the recipie is being exported
+    version = "0.0.0"
+
+    exports = "base.py"
+
+    exports_sources = "../sources*"
+
+    # override base policy
+    build_policy="always"
+
+    def source(self):
+        repo_path = os.getenv(LOCAL_REPO_PATH_ENV)
+
+        if (repo_path):
+            os.makedirs("repo/sources")
+            copy_tree("%s/sources" % repo_path, "repo/sources")
+        else:
+            os.mkdir("repo")
+            shutil.move("sources", "repo/")
+
+    def requirements(self):
+        self.requires("gtest/1.8.0@lasote/stable")
+
+    def configure(self):
+        self.options["gtest"].shared=False

conan_package/conanfile.py

@@ -0,0 +1,14 @@
+from base import ProtocolSessionBase
+
+# Use this recipe when creating recipies for uploading to joystream conan repo on stable channel
+# Source will be fetched from github repo
+
+class ProtocolSessionRelease(ProtocolSessionBase):
+    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.git_repo)
+        self.run("cd repo && git checkout v%s" % self.version)

conan_package/release_fetches_source.py

@@ -0,0 +1,16 @@
+import os
+import shutil
+from base import ProtocolSessionBase
+
+# Use this recipe when checking out a tagged version locally and you wish to use it in your projects
+# on the stable channel. Source will be copied to cache from local folder
+# do not upload the recipie if you don't want to include source files with the recipe
+
+class ProtocolSessionRelease(ProtocolSessionBase):
+    exports = "base.py"
+
+    exports_sources = "../sources*"
+
+    def source(self):
+        os.mkdir("repo")
+        shutil.move("sources", "repo/")

conan_package/release_include_source.py

@@ -0,0 +1,10 @@
+PROJECT(PackageTest)
+cmake_minimum_required(VERSION 2.8.12)
+
+set(CMAKE_CXX_STANDARD 11)
+
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup()
+
+ADD_EXECUTABLE(example example.cpp)
+TARGET_LINK_LIBRARIES(example ${CONAN_LIBS})

conan_package/test_package/CMakeLists.txt

@@ -0,0 +1,20 @@
+from conans import ConanFile, CMake
+import os
+
+class ProtocolSessionTestConan(ConanFile):
+    settings = "os", "compiler", "build_type", "arch"
+    requires = "ProtocolSession/0.0.0@%s/%s" % ("joystream", "testing")
+    generators = "cmake"
+
+    def build(self):
+        cmake = CMake(self.settings)
+        self.run('cmake "%s" %s' % (self.conanfile_directory, cmake.command_line))
+        self.run("cmake --build . %s" % cmake.build_config)
+
+    def imports(self):
+        self.copy("*.dll", "bin", "bin")
+        self.copy("*.dylib", "bin", "bin")
+
+    def test(self):
+        os.chdir("bin")
+        self.run(".%sexample" % os.sep)

conan_package/test_package/conanfile.py

@@ -0,0 +1,6 @@
+#include <protocol_session/protocol_session.hpp>
+
+int main() {
+
+    return 0;
+}