From a0b6d45c8a59ae9bbb83e3f33408c740ac914174 Mon Sep 17 00:00:00 2001 From: Kyle Isom Date: Tue, 24 Oct 2023 19:07:16 -0700 Subject: [PATCH] Bump to version 1.1.0. - remove debug output - add scripts, README, Containerfiles, and LICENSE to install. --- CMakeLists.txt | 5 ++++- README.md | 8 +++++++- cmake/install.cmake | 5 +++-- src/Debian.cc | 1 - src/Generic.cc | 1 - 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 844c8da..ea84b81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.25) project(sc3dev - VERSION 1.0.0 + VERSION 1.1.0 LANGUAGES CXX HOMEPAGE_URL "https://git.wntrmute.dev/sc/sc3dev" DESCRIPTION "") @@ -55,6 +55,9 @@ set(SOURCES src/Generic.cc ) +file(GLOB SCRIPTS *.sh) +file(GLOB_RECURSE CONTAINERFILES Containerfile*) + include_directories(SYSTEM include) include_directories(SYSTEM ${CURLPP_INCLUDE_DIRS}) diff --git a/README.md b/README.md index b5733c3..55905d2 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,14 @@ used across shimmering clarity projects. ### Scripts - - `build-all-containers.sh` automates building all supported containers. - `build-container.sh` automated building and pushing a container. - `check-code.sh` wraps several code scanning tools. - `cmake-build-and-test.sh` sets up cmake projects building a RelWithDebInfo config. +- `cmake-package.sh` packages the project and uploads it. +- `cmake-valgrind.sh` run valgrind over all test targets. +- `container-setup.sh` is the root script for setting up containers. - `install-cmake-debian.sh` install the latest CMake on Debian-based systems. - `install-development-tools.sh` installs the tools needed to build and @@ -30,3 +32,7 @@ used across shimmering clarity projects. - alpine: (Alpine 3.18) a minimal image, suitable for CI - debian: (Debian 12.2) verify Debian installation - fedora: (Fedora 38) verify Fedora installation + +### Programs + +- `sc3dev-packager`: interact with Gitea package repositories. diff --git a/cmake/install.cmake b/cmake/install.cmake index 045e1ae..fddcccf 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake @@ -18,5 +18,6 @@ include(CMakePackageConfigHelpers) install(TARGETS ${PROJECT_NAME}-packager RUNTIME DESTINATION bin) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man DESTINATION share) - - +install(FILES ${SCRIPTS} DESTINATION share/sc/scripts) +install(FILES ${CONTAINERFILES} DESTINATION share/sc/containers) +install(FILES README.md LICENSE DESTINATION share/sc) \ No newline at end of file diff --git a/src/Debian.cc b/src/Debian.cc index 8878810..e60ea23 100644 --- a/src/Debian.cc +++ b/src/Debian.cc @@ -42,7 +42,6 @@ debianEndpoint(std::string endpoint) endpoint.insert(endpoint.cbegin(), '/'); } - std::cerr << "owner: " << scsl::SimpleConfig::GetGlobal("owner", defaultOwner) << "\n"; auto urlBase = "https://" + scsl::SimpleConfig::GetGlobal("server"); return urlBase + "/api/packages/" + scsl::SimpleConfig::GetGlobal("owner", defaultOwner) + diff --git a/src/Generic.cc b/src/Generic.cc index c64d235..e116120 100644 --- a/src/Generic.cc +++ b/src/Generic.cc @@ -41,7 +41,6 @@ genericEndpoint(std::string endpoint) endpoint.insert(endpoint.cbegin(), '/'); } - std::cerr << "owner: " << scsl::SimpleConfig::GetGlobal("owner", defaultOwner) << "\n"; auto urlBase = "https://" + scsl::SimpleConfig::GetGlobal("server"); return urlBase + "/api/packages/" + scsl::SimpleConfig::GetGlobal("owner", defaultOwner) +