Commit 8afa1292 authored by jan.koester's avatar jan.koester
Browse files

test

parents 1e6e0e22 cf8ca7b7

.kdev4/authdb.kdev4

+1 −1
Changes for .kdev4/authdb.kdev4: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
[Buildset]

BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x0c\x00a\x00u\x00t\x00h\x00d\x00b)

BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x00)



[CMake]

Build Directory Count=1

CMakeLists.txt

+3 −1
Changes for CMakeLists.txt: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ cmake_minimum_required(VERSION 3.18) 
set(CMAKE_CXX_STANDARD 20)

set(CMAKE_CXX_STANDARD_REQUIRED ON)



add_definitions(-D${CMAKE_HOST_SYSTEM_NAME} -DDATAPATH="${CMAKE_INSTALL_PREFIX}/share/authdb/data")

set(DATAPATH "${CMAKE_INSTALL_PREFIX}/share/authdb/data" CACHE FILEPATH "path where stored admin db")



add_definitions(-D${CMAKE_HOST_SYSTEM_NAME} -DDATAPATH="${DATAPATH}")



message(STATUS "System: ${CMAKE_HOST_SYSTEM_NAME}")

Dockerfile

+10 −6
Changes for Dockerfile: 10 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -4,27 +4,31 @@ WORKDIR /build/alpine 
RUN apk update --no-cache  && apk upgrade --no-cache

RUN apk add --no-cache cmake ninja clang alpine-sdk lua-aports sudo openssh-keygen fakeroot openssh-client yaml-dev brotli-dev json-c-dev util-linux-dev



RUN git clone https://git.tuxist.de/git/jan.koester/libcmdplus.git

RUN git clone https://tuxist.de/git/jan.koester/libcmdplus.git

RUN mkdir libcmdplus/build

RUN cd libcmdplus/build && cmake ../ -G Ninja && ninja install



RUN git clone https://git.tuxist.de/git/jan.koester/libnetplus.git

RUN git clone https://tuxist.de/git/tuxist/uuidplus.git

RUN mkdir uuidplus/build

RUN cd uuidplus/build && cmake ../ -G Ninja && ninja install



RUN git clone https://tuxist.de/git/jan.koester/libnetplus.git

RUN mkdir libnetplus/build

RUN cd libnetplus/build && cmake ../ -G Ninja && ninja install



RUN git clone https://git.tuxist.de/git/jan.koester/libhtmlpp.git

RUN git clone https://tuxist.de/git/jan.koester/libhtmlpp.git

RUN mkdir libhtmlpp/build

RUN cd libhtmlpp/build && cmake ../ -G Ninja && ninja install



RUN git clone https://git.tuxist.de/git/jan.koester/libhttppp.git

RUN git clone https://tuxist.de/git/jan.koester/libhttppp.git

RUN mkdir libhttppp/build

RUN cd libhttppp/build && cmake ../ -G Ninja && ninja install



RUN git clone https://git.tuxist.de/git/jan.koester/libconfplus.git

RUN git clone https://tuxist.de/git/jan.koester/libconfplus.git

RUN mkdir libconfplus/build

RUN cd libconfplus/build && cmake ../ -G Ninja && ninja install



RUN git clone https://git.tuxist.de/git/jan.koester/authdb.git

RUN git clone https://tuxist.de/git/jan.koester/authdb.git

RUN mkdir authdb/build

RUN cd authdb/build && cmake ../ -G Ninja -DDATAPATH:PATH=/usr/local/share/authdb && ninja install

client/CMakeLists.txt

+1 −1
Changes for client/CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ add_compile_definitions(DATAPATH="${DATAPATH}") 


add_library(client STATIC client.cpp  $<TARGET_OBJECTS:authobj>)



target_link_libraries(client PUBLIC uuidp::uuidp confplus::confplus netplus::netplus json-c::json-c httppp::httppp  ${LIBUUID_LIBRARY})

target_link_libraries(client PUBLIC uuidp::uuidp confplus::confplus netplus::netplus json-c::json-c httppp::httppp)



set_target_properties(client PROPERTIES

  INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/include/authdb"

client/client.h

+2 −2
Changes for client/client.h: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 


namespace authdb {   

    namespace client {

        VISIBILITY class ClientConnection {

        class VISIBILITY ClientConnection {

        public:

            ClientConnection();

            ~ClientConnection();
@@ -85,7 +85,7 @@ namespace authdb { 
            friend class Client;

        };



        VISIBILITY class Client {

        class VISIBILITY Client {

        public:

            Client(ClientConnection &clt);

            ~Client();