From 0943d357cb41eb4f941ce9261fe174ce758b8dac Mon Sep 17 00:00:00 2001 From: staskau Date: Mon, 17 Aug 2020 14:31:14 +0200 Subject: [PATCH] git rid of the self-made seasocks package, because meanwhile, an official package is available --- Seasocks/build.py | 10 ---- Seasocks/conanfile.py | 77 ------------------------- Seasocks/test_package/CMakeLists.txt | 10 ---- Seasocks/test_package/README.md | 3 - Seasocks/test_package/conanfile.py | 17 ------ Seasocks/test_package/seasocks_test.cpp | 24 -------- 6 files changed, 141 deletions(-) delete mode 100644 Seasocks/build.py delete mode 100644 Seasocks/conanfile.py delete mode 100644 Seasocks/test_package/CMakeLists.txt delete mode 100644 Seasocks/test_package/README.md delete mode 100644 Seasocks/test_package/conanfile.py delete mode 100644 Seasocks/test_package/seasocks_test.cpp diff --git a/Seasocks/build.py b/Seasocks/build.py deleted file mode 100644 index 5a172e1..0000000 --- a/Seasocks/build.py +++ /dev/null @@ -1,10 +0,0 @@ -from conan.packager import ConanMultiPackager - -if __name__ == "__main__": - builder = ConanMultiPackager() - libstd = ['libstdc++11', 'libstdc++'] - types = ['Debug','Release'] - configs = [[i,k] for i in libstd for k in types] - for triple in configs: - builder.add(settings={"build_type":triple[1], "compiler.libcxx":triple[0]}, options={}, env_vars={}, build_requires={}) - builder.run() diff --git a/Seasocks/conanfile.py b/Seasocks/conanfile.py deleted file mode 100644 index 11df7d0..0000000 --- a/Seasocks/conanfile.py +++ /dev/null @@ -1,77 +0,0 @@ -from conans import CMake, ConanFile, tools -from conans.errors import ConanException, ConanInvalidConfiguration -import os -import re -import shutil -import textwrap - - -class SeasocksConan(ConanFile): - name = "Seasocks" - version = "1.4.4" - topics = ("seasocks", "embeddable", "webserver", "websockets") - homepage = "https://github.com/mattgodbolt/seasocks" - url = "https://github.com/mattgodbolt/seasocks" - description = "Simple, small, C++ embeddable webserver with WebSockets support" - license = "BSD-2-Clause" - settings = "os", "arch", "compiler", "build_type" - options = { - "shared": [True, False], - "fPIC": [True, False], - "with_zlib": [True, False], - } - default_options = { - "shared": True, - "fPIC": True, - "with_zlib": True, - } - no_copy_source = True - generators = "cmake", "cmake_find_package" - - exports_sources = "src/main/c/*" - - def configure(self): - if self.options.shared: - del self.options.fPIC - - def requirements(self): - if self.options.with_zlib: - self.requires("zlib/1.2.11") - - def source(self): - self.run("git clone https://github.com/mattgodbolt/seasocks.git .") - self.run("git checkout tags/v1.4.4") - - def build(self): - if self.source_folder == self.build_folder: - raise ConanException("Cannot build in same folder as sources") - tools.save(os.path.join(self.build_folder, "CMakeLists.txt"), textwrap.dedent("""\ - cmake_minimum_required(VERSION 3.0) - project(cmake_wrapper) - - include("{install_folder}/conanbuildinfo.cmake") - conan_basic_setup(TARGETS) - - add_subdirectory("{source_folder}" seasocks) - """).format( - source_folder=self.source_folder.replace("\\", "/"), - install_folder=self.install_folder.replace("\\", "/"))) - cmake = CMake(self) - cmake.definitions["DEFLATE_SUPPORT"] = self.options.with_zlib - cmake.configure(source_folder=self.build_folder) - cmake.build() - - def package(self): - cmake = CMake(self) - cmake.install() - - def package_info(self): - # Set the name of the generated `FindSeasocks.cmake` and `SeasocksConfig.cmake` cmake scripts - self.cpp_info.names["cmake_find_package"] = "Seasocks" - self.cpp_info.names["cmake_find_package_multi"] = "Seasocks" - self.cpp_info.components["libseasocks"].libs = ["seasocks"] - # Set the name of the generated seasocks target: `Seasocks::seasocks` - self.cpp_info.components["libseasocks"].names["cmake_find_package"] = "seasocks" - self.cpp_info.components["libseasocks"].names["cmake_find_package_multi"] = "seasocks" - if self.options.with_zlib: - self.cpp_info.components["libseasocks"].requires = ["zlib::zlib"] diff --git a/Seasocks/test_package/CMakeLists.txt b/Seasocks/test_package/CMakeLists.txt deleted file mode 100644 index 0e7869d..0000000 --- a/Seasocks/test_package/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -cmake_minimum_required(VERSION 3.3) -project(PackageTest CXX) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() - -find_package(Threads) - -add_executable(seasocks_test seasocks_test.cpp) -target_link_libraries(seasocks_test ${CONAN_LIBS} ${CMAKE_THREAD_LIBS_INIT}) diff --git a/Seasocks/test_package/README.md b/Seasocks/test_package/README.md deleted file mode 100644 index 20c57d6..0000000 --- a/Seasocks/test_package/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This directory contains a conan test package to ensure the packaging works. - -It's not meant as an example of how best to use Seasocks. \ No newline at end of file diff --git a/Seasocks/test_package/conanfile.py b/Seasocks/test_package/conanfile.py deleted file mode 100644 index 74f9376..0000000 --- a/Seasocks/test_package/conanfile.py +++ /dev/null @@ -1,17 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self.settings): - bin_path = os.path.join("bin", "seasocks_test") - self.run(bin_path, run_environment=True) diff --git a/Seasocks/test_package/seasocks_test.cpp b/Seasocks/test_package/seasocks_test.cpp deleted file mode 100644 index eb27bfa..0000000 --- a/Seasocks/test_package/seasocks_test.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "seasocks/Server.h" -#include "seasocks/Connection.h" -#include "seasocks/PrintfLogger.h" - -#include -#include - -using namespace seasocks; - -// This is a conan test program to ensure the packaging works. -// It's not meant as an example of how best to use Seasocks. -int main(int argc, const char* argv[]) { - auto logger = std::make_shared(); - Server server(logger); - server.startListening(0); - std::thread seasocksThread([&] { - server.loop(); - }); - - sleep(1); - - server.terminate(); - seasocksThread.join(); -}