mirror of https://github.com/oxen-io/oxen-mq.git
Merge pull request #81 from jagerman/remove-deprecated
Remove deprecated code
This commit is contained in:
Jason Rhinelander
GitHub
commit
b26fe8cb04
|
|
@ -19,6 +19,7 @@ local debian_pipeline(name,
|
|||
cmake_extra='',
|
||||
build_type='Release',
|
||||
extra_cmds=[],
|
||||
distro='$$(lsb_release -sc)',
|
||||
allow_fail=false) = {
|
||||
kind: 'pipeline',
|
||||
type: 'docker',
|
||||
|
|
@ -39,7 +40,7 @@ local debian_pipeline(name,
|
|||
apt_get_quiet + 'install -y eatmydata',
|
||||
'eatmydata ' + apt_get_quiet + ' install --no-install-recommends -y lsb-release',
|
||||
'cp contrib/deb.oxen.io.gpg /etc/apt/trusted.gpg.d',
|
||||
'echo deb http://deb.oxen.io $$(lsb_release -sc) main >/etc/apt/sources.list.d/oxen.list',
|
||||
'echo deb http://deb.oxen.io ' + distro + ' main >/etc/apt/sources.list.d/oxen.list',
|
||||
'eatmydata ' + apt_get_quiet + ' update',
|
||||
'eatmydata ' + apt_get_quiet + 'dist-upgrade -y',
|
||||
'eatmydata ' + apt_get_quiet + 'install -y cmake git ninja-build pkg-config ccache ' + std.join(' ', deps),
|
||||
|
|
@ -56,6 +57,7 @@ local debian_pipeline(name,
|
|||
local clang(version) = debian_pipeline(
|
||||
'Debian sid/clang-' + version + ' (amd64)',
|
||||
docker_base + 'debian-sid-clang',
|
||||
distro='sid',
|
||||
deps=['clang-' + version] + default_deps_nocxx,
|
||||
cmake_extra='-DCMAKE_C_COMPILER=clang-' + version + ' -DCMAKE_CXX_COMPILER=clang++-' + version + ' '
|
||||
);
|
||||
|
|
@ -63,6 +65,7 @@ local clang(version) = debian_pipeline(
|
|||
local full_llvm(version) = debian_pipeline(
|
||||
'Debian sid/llvm-' + version + ' (amd64)',
|
||||
docker_base + 'debian-sid-clang',
|
||||
distro='sid',
|
||||
deps=['clang-' + version, 'lld-' + version, 'libc++-' + version + '-dev', 'libc++abi-' + version + '-dev']
|
||||
+ default_deps_nocxx,
|
||||
cmake_extra='-DCMAKE_C_COMPILER=clang-' + version +
|
||||
|
|
@ -76,13 +79,13 @@ local full_llvm(version) = debian_pipeline(
|
|||
|
||||
|
||||
[
|
||||
debian_pipeline('Debian sid (amd64)', docker_base + 'debian-sid'),
|
||||
debian_pipeline('Debian sid/Debug (amd64)', docker_base + 'debian-sid', build_type='Debug'),
|
||||
clang(13),
|
||||
full_llvm(13),
|
||||
debian_pipeline('Debian sid (amd64)', docker_base + 'debian-sid', distro='sid'),
|
||||
debian_pipeline('Debian sid/Debug (amd64)', docker_base + 'debian-sid', build_type='Debug', distro='sid'),
|
||||
clang(14),
|
||||
full_llvm(14),
|
||||
debian_pipeline('Debian buster (amd64)', docker_base + 'debian-buster'),
|
||||
debian_pipeline('Debian stable (i386)', docker_base + 'debian-stable/i386'),
|
||||
debian_pipeline('Debian sid (ARM64)', docker_base + 'debian-sid', arch='arm64'),
|
||||
debian_pipeline('Debian sid (ARM64)', docker_base + 'debian-sid', arch='arm64', distro='sid'),
|
||||
debian_pipeline('Debian stable (armhf)', docker_base + 'debian-stable/arm32v7', arch='arm64'),
|
||||
debian_pipeline('Debian buster (armhf)', docker_base + 'debian-buster/arm32v7', arch='arm64'),
|
||||
debian_pipeline('Ubuntu focal (amd64)', docker_base + 'ubuntu-focal'),
|
||||
|
|
|
|||
|
|
@ -42,15 +42,11 @@ endif()
|
|||
option(OXENMQ_BUILD_TESTS "Building and perform oxenmq tests" ${oxenmq_IS_TOPLEVEL_PROJECT})
|
||||
option(OXENMQ_INSTALL "Add oxenmq libraries and headers to cmake install target; defaults to ON if BUILD_SHARED_LIBS is enabled or we are the top-level project; OFF for a static subdirectory build" ${oxenmq_INSTALL_DEFAULT})
|
||||
option(OXENMQ_INSTALL_CPPZMQ "Install cppzmq header with oxenmq/ headers (requires OXENMQ_INSTALL)" ON)
|
||||
option(OXENMQ_LOKIMQ_COMPAT "Install lokimq compatibility headers and pkg-config for rename migration" ON)
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
|
||||
configure_file(oxenmq/version.h.in oxenmq/version.h @ONLY)
|
||||
configure_file(liboxenmq.pc.in liboxenmq.pc @ONLY)
|
||||
if(OXENMQ_LOKIMQ_COMPAT)
|
||||
configure_file(liblokimq.pc.in liblokimq.pc @ONLY)
|
||||
endif()
|
||||
|
||||
|
||||
add_library(oxenmq
|
||||
|
|
@ -186,9 +182,6 @@ else()
|
|||
endif()
|
||||
|
||||
add_library(oxenmq::oxenmq ALIAS oxenmq)
|
||||
if(OXENMQ_LOKIMQ_COMPAT)
|
||||
add_library(lokimq::lokimq ALIAS oxenmq)
|
||||
endif()
|
||||
|
||||
export(
|
||||
TARGETS oxenmq
|
||||
|
|
@ -234,31 +227,6 @@ if(OXENMQ_INSTALL)
|
|||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
|
||||
)
|
||||
|
||||
if(OXENMQ_LOKIMQ_COMPAT)
|
||||
install(
|
||||
FILES lokimq/address.h
|
||||
lokimq/auth.h
|
||||
lokimq/base32z.h
|
||||
lokimq/base64.h
|
||||
lokimq/batch.h
|
||||
lokimq/bt_serialize.h
|
||||
lokimq/bt_value.h
|
||||
lokimq/connections.h
|
||||
lokimq/hex.h
|
||||
lokimq/lokimq.h
|
||||
lokimq/message.h
|
||||
lokimq/variant.h
|
||||
lokimq/version.h
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lokimq
|
||||
)
|
||||
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_BINARY_DIR}/liblokimq.pc
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
endif()
|
||||
|
||||
if(OXENMQ_BUILD_TESTS)
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
prefix=@CMAKE_INSTALL_PREFIX@
|
||||
exec_prefix=${prefix}
|
||||
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
|
||||
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
|
||||
|
||||
Name: liblokimq
|
||||
Description: ZeroMQ-based communication library (compatibility package for liboxenmq)
|
||||
Version: @PROJECT_VERSION@
|
||||
|
||||
Libs: -L${libdir} -loxenmq
|
||||
Libs.private: @PRIVATE_LIBS@
|
||||
Requires: liboxenc
|
||||
Requires.private: libzmq libsodium
|
||||
Cflags: -I${includedir}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#pragma once
|
||||
#include "../oxenmq/address.h"
|
||||
|
||||
namespace lokimq = oxenmq;
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#pragma once
|
||||
#include "../oxenmq/auth.h"
|
||||
|
||||
namespace lokimq = oxenmq;
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#pragma once
|
||||
#include "../oxenmq/base32z.h"
|
||||
|
||||
namespace lokimq = oxenmq;
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#pragma once
|
||||
#include "../oxenmq/base64.h"
|
||||
|
||||
namespace lokimq = oxenmq;
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#pragma once
|
||||
#include "../oxenmq/batch.h"
|
||||
|
||||
namespace lokimq = oxenmq;
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#pragma once
|
||||
#include "../oxenmq/bt_serialize.h"
|
||||
|
||||
namespace lokimq = oxenmq;
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#pragma once
|
||||
#include "../oxenmq/bt_value.h"
|
||||
|
||||
namespace lokimq = oxenmq;
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#pragma once
|
||||
#include "../oxenmq/connections.h"
|
||||
|
||||
namespace lokimq = oxenmq;
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#pragma once
|
||||
#include "../oxenmq/hex.h"
|
||||
|
||||
namespace lokimq = oxenmq;
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
#pragma once
|
||||
#include "../oxenmq/oxenmq.h"
|
||||
|
||||
namespace lokimq = oxenmq;
|
||||
|
||||
namespace oxenmq {
|
||||
|
||||
using LokiMQ = OxenMQ;
|
||||
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#pragma once
|
||||
#include "../oxenmq/message.h"
|
||||
|
||||
namespace lokimq = oxenmq;
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
#pragma once
|
||||
#include "../oxenmq/variant.h"
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#pragma once
|
||||
#include "../oxenmq/version.h"
|
||||
|
||||
namespace lokimq = oxenmq;
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include <oxenc/bt_producer.h>
|
||||
|
||||
// Compatibility shim for oxenc includes
|
||||
|
||||
namespace oxenmq {
|
||||
|
||||
using oxenc::bt_list_producer;
|
||||
using oxenc::bt_dict_producer;
|
||||
|
||||
} // namespace oxenmq
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
// Copyright (c) 2019-2020, The Oxen Project
|
||||
//
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification, are
|
||||
// permitted provided that the following conditions are met:
|
||||
//
|
||||
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
// conditions and the following disclaimer.
|
||||
//
|
||||
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||
// of conditions and the following disclaimer in the documentation and/or other
|
||||
// materials provided with the distribution.
|
||||
//
|
||||
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||
// used to endorse or promote products derived from this software without specific
|
||||
// prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#pragma once
|
||||
|
||||
// Compatibility shim for oxenc includes
|
||||
|
||||
#include <oxenc/bt_serialize.h>
|
||||
|
||||
namespace oxenmq {
|
||||
|
||||
using oxenc::bt_deserialize_invalid;
|
||||
using oxenc::bt_deserialize_invalid_type;
|
||||
using oxenc::bt_serializer;
|
||||
using oxenc::bt_serialize;
|
||||
using oxenc::bt_deserialize;
|
||||
using oxenc::bt_get;
|
||||
using oxenc::get_int;
|
||||
using oxenc::get_tuple;
|
||||
using oxenc::bt_dict_consumer;
|
||||
using oxenc::bt_list_consumer;
|
||||
|
||||
} // namespace oxenmq
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
// Copyright (c) 2019-2021, The Oxen Project
|
||||
//
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification, are
|
||||
// permitted provided that the following conditions are met:
|
||||
//
|
||||
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
// conditions and the following disclaimer.
|
||||
//
|
||||
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||
// of conditions and the following disclaimer in the documentation and/or other
|
||||
// materials provided with the distribution.
|
||||
//
|
||||
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||
// used to endorse or promote products derived from this software without specific
|
||||
// prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#pragma once
|
||||
|
||||
// Compatibility shim for oxenc includes
|
||||
|
||||
#include <oxenc/bt_value.h>
|
||||
|
||||
namespace oxenmq {
|
||||
|
||||
using oxenc::bt_value;
|
||||
using oxenc::bt_dict;
|
||||
using oxenc::bt_list;
|
||||
using oxenc::bt_variant;
|
||||
|
||||
using oxenc::has_alternative;
|
||||
using oxenc::has_alternative_v;
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue