Merge pull request #36 from Doy-lee/UpdateCmakeRefs

Update cmakelists and misc refs to Loki
This commit is contained in:
KeeJef 2018-04-28 18:50:47 +10:00 committed by GitHub
commit 6d81abc05c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 115 additions and 91 deletions

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -41,7 +42,7 @@ endif()
cmake_minimum_required(VERSION 2.8.7)
project(monero)
project(loki)
function (die msg)
if (NOT WIN32)
@ -298,7 +299,7 @@ if(SANITIZE)
endif()
# Set default blockchain storage location:
# memory was the default in Cryptonote before Monero implemented LMDB, it still works but is unnecessary.
# memory was the default in Cryptonote before monero implemented LMDB, it still works but is unnecessary.
# set(DATABASE memory)
set(DATABASE lmdb)

View File

@ -26,7 +26,7 @@ DOXYFILE_ENCODING = UTF-8
# identify the project. Note that if you do not use Doxywizard you need
# to put quotes around the project name if it contains spaces.
PROJECT_NAME = Monero
PROJECT_NAME = Loki
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or

View File

@ -121,7 +121,7 @@ void mlog_configure(const std::string &filename_base, bool console, const std::s
el::Configurations c;
c.setGlobally(el::ConfigurationType::Filename, filename_base);
c.setGlobally(el::ConfigurationType::ToFile, "true");
const char *log_format = getenv("MONERO_LOG_FORMAT");
const char *log_format = getenv("LOKI_LOG_FORMAT");
if (!log_format)
log_format = MLOG_BASE_FORMAT;
c.setGlobally(el::ConfigurationType::Format, log_format);
@ -139,12 +139,12 @@ void mlog_configure(const std::string &filename_base, bool console, const std::s
rename(name, rname.c_str());
});
mlog_set_common_prefix();
const char *monero_log = getenv("MONERO_LOGS");
if (!monero_log)
const char *loki_log = getenv("LOKI_LOGS");
if (!loki_log)
{
monero_log = get_default_categories(0);
loki_log = get_default_categories(0);
}
mlog_set_log(monero_log);
mlog_set_log(loki_log);
}
void mlog_set_categories(const char *categories)

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -39,13 +40,13 @@ if (NOT (MINGW OR APPLE OR FREEBSD OR OPENBSD OR DRAGONFLY))
add_compile_options("${WARNINGS_AS_ERRORS_FLAG}") # applies only to targets that follow
endif()
function (monero_private_headers group)
function (loki_private_headers group)
source_group("${group}\\Private"
FILES
${ARGN})
endfunction ()
function (monero_install_headers subdir)
function (loki_install_headers subdir)
install(
FILES ${ARGN}
DESTINATION "include/${subdir}"
@ -63,7 +64,7 @@ function (enable_stack_trace target)
endif()
endfunction()
function (monero_add_executable name)
function (loki_add_executable name)
source_group("${name}"
FILES
${ARGN})
@ -82,31 +83,31 @@ function (monero_add_executable name)
enable_stack_trace("${name}")
endfunction ()
function (monero_add_library name)
monero_add_library_with_deps(NAME "${name}" SOURCES ${ARGN})
function (loki_add_library name)
loki_add_library_with_deps(NAME "${name}" SOURCES ${ARGN})
endfunction()
function (monero_add_library_with_deps)
cmake_parse_arguments(MONERO_ADD_LIBRARY "" "NAME" "DEPENDS;SOURCES" ${ARGN})
source_group("${MONERO_ADD_LIBRARY_NAME}" FILES ${MONERO_ADD_LIBRARY_SOURCES})
function (loki_add_library_with_deps)
cmake_parse_arguments(LOKI_ADD_LIBRARY "" "NAME" "DEPENDS;SOURCES" ${ARGN})
source_group("${LOKI_ADD_LIBRARY_NAME}" FILES ${LOKI_ADD_LIBRARY_SOURCES})
# Define a ("virtual") object library and an actual library that links those
# objects together. The virtual libraries can be arbitrarily combined to link
# any subset of objects into one library archive. This is used for releasing
# libwallet, which combines multiple components.
set(objlib obj_${MONERO_ADD_LIBRARY_NAME})
add_library(${objlib} OBJECT ${MONERO_ADD_LIBRARY_SOURCES})
add_library("${MONERO_ADD_LIBRARY_NAME}" $<TARGET_OBJECTS:${objlib}>)
if (MONERO_ADD_LIBRARY_DEPENDS)
add_dependencies(${objlib} ${MONERO_ADD_LIBRARY_DEPENDS})
set(objlib obj_${LOKI_ADD_LIBRARY_NAME})
add_library(${objlib} OBJECT ${LOKI_ADD_LIBRARY_SOURCES})
add_library("${LOKI_ADD_LIBRARY_NAME}" $<TARGET_OBJECTS:${objlib}>)
if (LOKI_ADD_LIBRARY_DEPENDS)
add_dependencies(${objlib} ${LOKI_ADD_LIBRARY_DEPENDS})
endif()
set_property(TARGET "${MONERO_ADD_LIBRARY_NAME}" PROPERTY FOLDER "libs")
set_property(TARGET "${LOKI_ADD_LIBRARY_NAME}" PROPERTY FOLDER "libs")
target_compile_definitions(${objlib}
PRIVATE $<TARGET_PROPERTY:${MONERO_ADD_LIBRARY_NAME},INTERFACE_COMPILE_DEFINITIONS>)
PRIVATE $<TARGET_PROPERTY:${LOKI_ADD_LIBRARY_NAME},INTERFACE_COMPILE_DEFINITIONS>)
endfunction ()
include(Version)
monero_add_library(version SOURCES ${CMAKE_BINARY_DIR}/version.cpp DEPENDS genversion)
loki_add_library(version SOURCES ${CMAKE_BINARY_DIR}/version.cpp DEPENDS genversion)
add_subdirectory(common)
add_subdirectory(crypto)

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -53,9 +54,9 @@ if (BERKELEY_DB)
)
endif()
monero_private_headers(blockchain_db
loki_private_headers(blockchain_db
${crypto_private_headers})
monero_add_library(blockchain_db
loki_add_library(blockchain_db
${blockchain_db_sources}
${blockchain_db_headers}
${blockchain_db_private_headers})

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -48,7 +49,7 @@ set(blockchain_import_private_headers
bootstrap_serialization.h
)
monero_private_headers(blockchain_import
loki_private_headers(blockchain_import
${blockchain_import_private_headers})
set(blockchain_export_sources
@ -63,7 +64,7 @@ set(blockchain_export_private_headers
bootstrap_serialization.h
)
monero_private_headers(blockchain_export
loki_private_headers(blockchain_export
${blockchain_export_private_headers})
@ -77,7 +78,7 @@ set(blockchain_blackball_private_headers
bootstrap_serialization.h
)
monero_private_headers(blockchain_blackball
loki_private_headers(blockchain_blackball
${blockchain_blackball_private_headers})
set(blockchain_usage_sources
@ -86,12 +87,12 @@ set(blockchain_usage_sources
set(blockchain_usage_private_headers)
monero_private_headers(blockchain_usage
loki_private_headers(blockchain_usage
${blockchain_usage_private_headers})
monero_add_executable(blockchain_import
loki_add_executable(blockchain_import
${blockchain_import_sources}
${blockchain_import_private_headers}
${blocksdat})
@ -119,7 +120,7 @@ set_property(TARGET blockchain_import
OUTPUT_NAME "loki-blockchain-import")
install(TARGETS blockchain_import DESTINATION bin)
monero_add_executable(blockchain_export
loki_add_executable(blockchain_export
${blockchain_export_sources}
${blockchain_export_private_headers})
@ -141,7 +142,7 @@ set_property(TARGET blockchain_export
OUTPUT_NAME "loki-blockchain-export")
install(TARGETS blockchain_export DESTINATION bin)
monero_add_executable(blockchain_blackball
loki_add_executable(blockchain_blackball
${blockchain_blackball_sources}
${blockchain_blackball_private_headers})
@ -165,7 +166,7 @@ set_property(TARGET blockchain_blackball
install(TARGETS blockchain_blackball DESTINATION bin)
monero_add_executable(blockchain_usage
loki_add_executable(blockchain_usage
${blockchain_usage_sources}
${blockchain_usage_private_headers})

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -40,9 +41,9 @@ set(checkpoints_headers)
set(checkpoints_private_headers
checkpoints.h)
monero_private_headers(checkpoints
loki_private_headers(checkpoints
${checkpoints_private_headers})
monero_add_library(checkpoints
loki_add_library(checkpoints
${checkpoints_sources}
${checkpoints_headers}
${checkpoints_private_headers})

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -69,9 +70,9 @@ set(common_private_headers
threadpool.h
updates.h)
monero_private_headers(common
loki_private_headers(common
${common_private_headers})
monero_add_library(common
loki_add_library(common
${common_sources}
${common_headers}
${common_private_headers}

View File

@ -1,3 +1,4 @@
// Copyright (c) 2018, The Loki Project
// Copyright (c) 2014-2018, The Monero Project
//
// All rights reserved.
@ -528,10 +529,10 @@ std::string get_nix_version_display_string()
{
ub_ctx *ctx = ub_ctx_create();
if (!ctx) return false; // cheat a bit, should not happen unless OOM
char *monero = strdup("monero"), *unbound = strdup("unbound");
ub_ctx_zone_add(ctx, monero, unbound); // this calls ub_ctx_finalize first, then errors out with UB_SYNTAX
char *loki = strdup("loki"), *unbound = strdup("unbound");
ub_ctx_zone_add(ctx, loki, unbound); // this calls ub_ctx_finalize first, then errors out with UB_SYNTAX
free(unbound);
free(monero);
free(loki);
// if no threads, bails out early with UB_NOERROR, otherwise fails with UB_AFTERFINAL id already finalized
bool with_threads = ub_ctx_async(ctx, 1) != 0; // UB_AFTERFINAL is not defined in public headers, check any error
ub_ctx_delete(ctx);

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -68,9 +69,9 @@ set(crypto_private_headers
skein.h
skein_port.h)
monero_private_headers(cncrypto
loki_private_headers(cncrypto
${crypto_private_headers})
monero_add_library(cncrypto
loki_add_library(cncrypto
${crypto_sources}
${crypto_headers}
${crypto_private_headers})

View File

@ -244,7 +244,7 @@ STATIC INLINE int force_software_aes(void)
if (use != -1)
return use;
const char *env = getenv("MONERO_USE_SOFTWARE_AES");
const char *env = getenv("LOKI_USE_SOFTWARE_AES");
if (!env) {
use = 0;
}

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -57,9 +58,9 @@ set(cryptonote_basic_private_headers
tx_extra.h
verification_context.h)
monero_private_headers(cryptonote_basic
loki_private_headers(cryptonote_basic
${cryptonote_basic_private_headers})
monero_add_library(cryptonote_basic
loki_add_library(cryptonote_basic
${cryptonote_basic_sources}
${cryptonote_basic_headers}
${cryptonote_basic_private_headers})

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -47,9 +48,9 @@ else()
set(Blocks "")
endif()
monero_private_headers(cryptonote_core
loki_private_headers(cryptonote_core
${cryptonote_core_private_headers})
monero_add_library(cryptonote_core
loki_add_library(cryptonote_core
${cryptonote_core_sources}
${cryptonote_core_headers}
${cryptonote_core_private_headers})

View File

@ -140,7 +140,7 @@ namespace cryptonote
};
static const command_line::arg_descriptor<std::string> arg_check_updates = {
"check-updates"
, "Check for new versions of monero: [disabled|notify|download|update]"
, "Check for new versions of loki: [disabled|notify|download|update]"
, "notify"
};
static const command_line::arg_descriptor<bool> arg_fluffy_blocks = {
@ -408,7 +408,7 @@ namespace cryptonote
if (boost::filesystem::exists(old_files / "blockchain.bin"))
{
MWARNING("Found old-style blockchain.bin in " << old_files.string());
MWARNING("Monero now uses a new format. You can either remove blockchain.bin to start syncing");
MWARNING("Loki now uses a new format. You can either remove blockchain.bin to start syncing");
MWARNING("the blockchain anew, or use loki-blockchain-export and loki-blockchain-import to");
MWARNING("convert your existing blockchain.bin to the new format. See README.md for instructions.");
return false;
@ -1431,7 +1431,7 @@ namespace cryptonote
//-----------------------------------------------------------------------------------------------
bool core::check_updates()
{
static const char software[] = "monero";
static const char software[] = "loki";
#ifdef BUILD_TAG
static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG);
static const char subdir[] = "cli"; // because it can never be simple

View File

@ -27,13 +27,13 @@
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cmake_minimum_required (VERSION 2.6)
project (monero CXX)
project (loki CXX)
file(GLOB CRYPTONOTE_PROTOCOL *)
source_group(cryptonote_protocol FILES ${CRYPTONOTE_PROTOCOL})
#monero_private_headers(cryptonote_protocol ${CRYPTONOTE_PROTOCOL})
monero_add_library(cryptonote_protocol ${CRYPTONOTE_PROTOCOL})
loki_add_library(cryptonote_protocol ${CRYPTONOTE_PROTOCOL})
target_link_libraries(cryptonote_protocol
PUBLIC
p2p

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -72,9 +73,9 @@ set(daemon_private_headers
../p2p/p2p_protocol_defs.h
../p2p/stdafx.h)
monero_private_headers(daemon
loki_private_headers(daemon
${daemon_private_headers})
monero_add_executable(daemon
loki_add_executable(daemon
${daemon_sources}
${daemon_headers}
${daemon_private_headers}

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -58,9 +59,9 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
add_definitions(-DDEBUG_TMPDIR_LOG=1)
endif()
monero_private_headers(daemonizer
loki_private_headers(daemonizer
${daemonizer_private_headers})
monero_add_library(daemonizer
loki_add_library(daemonizer
${daemonizer_sources}
${daemonizer_headers}
${daemonizer_private_headers})

View File

@ -121,7 +121,7 @@ void fork(const std::string & pidfile)
if (!tmpdir)
tmpdir = TMPDIR;
std::string output = tmpdir;
output += "/bitmonero.daemon.stdout.stderr";
output += "/loki.daemon.stdout.stderr";
const int flags = O_WRONLY | O_CREAT | O_APPEND;
const mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
if (open(output.c_str(), flags, mode) < 0)

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -30,7 +31,7 @@ set(cn_deserialize_sources
cn_deserialize.cpp
)
monero_add_executable(cn_deserialize
loki_add_executable(cn_deserialize
${cn_deserialize_sources}
${cn_deserialize_private_headers})
@ -53,7 +54,7 @@ set(object_sizes_sources
object_sizes.cpp
)
monero_add_executable(object_sizes
loki_add_executable(object_sizes
${object_sizes_sources}
${object_sizes_private_headers})

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2017, The Monero Project
#
# All rights reserved.
@ -55,10 +56,10 @@ else()
set(Blocks "")
endif()
monero_private_headers(device
loki_private_headers(device
${device_private_headers})
monero_add_library(device
loki_add_library(device
${device_sources}
${device_headers}
${device_private_headers})

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2017-2018, The Monero Project
#
# All rights reserved.
@ -29,7 +30,7 @@
set(gen_multisig_sources
gen_multisig.cpp)
monero_add_executable(gen_multisig
loki_add_executable(gen_multisig
${gen_multisig_sources})
target_link_libraries(gen_multisig
PRIVATE

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -49,9 +50,9 @@ set(mnemonics_private_headers
esperanto.h
lojban.h)
monero_private_headers(mnemonics
loki_private_headers(mnemonics
${mnemonics_private_headers})
monero_add_library(mnemonics
loki_add_library(mnemonics
${mnemonics_sources}
${mnemonics_headers}
${mnemonics_private_headers})

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2017-2018, The Monero Project
#
# All rights reserved.
@ -34,10 +35,10 @@ set(multisig_headers)
set(multisig_private_headers
multisig.h)
monero_private_headers(multisig
loki_private_headers(multisig
${multisig_private_headers})
monero_add_library(multisig
loki_add_library(multisig
${multisig_sources}
${multisig_headers}
${multisig_private_headers})

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -27,15 +28,15 @@
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cmake_minimum_required (VERSION 2.6)
project (monero CXX)
project (loki CXX)
file(GLOB P2P *)
source_group(p2p FILES ${P2P})
#add_library(p2p ${P2P})
#monero_private_headers(p2p ${P2P})
monero_add_library(p2p ${P2P})
#loki_private_headers(p2p ${P2P})
loki_add_library(p2p ${P2P})
target_link_libraries(p2p
PUBLIC
epee

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2016-2018, The Monero Project
#
# All rights reserved.
@ -37,9 +38,9 @@ set(ringct_basic_private_headers
rctTypes.h
bulletproofs.h)
monero_private_headers(ringct_basic
loki_private_headers(ringct_basic
${crypto_private_headers})
monero_add_library(ringct_basic
loki_add_library(ringct_basic
${ringct_basic_sources}
${ringct_basic_private_headers})
target_link_libraries(ringct_basic
@ -60,9 +61,9 @@ set(ringct_private_headers
rctSigs.h
)
monero_private_headers(ringct
loki_private_headers(ringct
${crypto_private_headers})
monero_add_library(ringct
loki_add_library(ringct
${ringct_sources}
${ringct_headers}
${ringct_private_headers})

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -67,29 +68,29 @@ set(daemon_rpc_server_private_headers
zmq_server.h)
monero_private_headers(rpc
loki_private_headers(rpc
${rpc_private_headers})
monero_private_headers(daemon_rpc_server
loki_private_headers(daemon_rpc_server
${daemon_rpc_server_private_headers})
monero_add_library(rpc_base
loki_add_library(rpc_base
${rpc_base_sources}
${rpc_base_headers}
${rpc_base_private_headers})
monero_add_library(rpc
loki_add_library(rpc
${rpc_sources}
${rpc_headers}
${rpc_private_headers})
monero_add_library(daemon_messages
loki_add_library(daemon_messages
${daemon_messages_sources}
${daemon_messages_headers}
${daemon_messages_private_headers})
monero_add_library(daemon_rpc_server
loki_add_library(daemon_rpc_server
${daemon_rpc_server_sources}
${daemon_rpc_server_headers}
${daemon_rpc_server_private_headers})

View File

@ -1898,7 +1898,7 @@ namespace cryptonote
bool core_rpc_server::on_update(const COMMAND_RPC_UPDATE::request& req, COMMAND_RPC_UPDATE::response& res)
{
PERF_TIMER(on_update);
static const char software[] = "monero";
static const char software[] = "loki";
#ifdef BUILD_TAG
static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG);
static const char subdir[] = "cli";

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2016-2018, The Monero Project
#
# All rights reserved.
@ -34,9 +35,9 @@ set(serialization_headers)
set(serialization_private_headers
json_object.h)
monero_private_headers(serialization
loki_private_headers(serialization
${serialization_private_headers})
monero_add_library(serialization
loki_add_library(serialization
${serialization_sources}
${serialization_headers}
${serialization_private_headers})

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -34,9 +35,9 @@ set(simplewallet_headers)
set(simplewallet_private_headers
simplewallet.h)
monero_private_headers(simplewallet
loki_private_headers(simplewallet
${simplewallet_private_headers})
monero_add_executable(simplewallet
loki_add_executable(simplewallet
${simplewallet_sources}
${simplewallet_headers}
${simplewallet_private_headers})

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -46,9 +47,9 @@ set(wallet_private_headers
ringdb.h
node_rpc_proxy.h)
monero_private_headers(wallet
loki_private_headers(wallet
${wallet_private_headers})
monero_add_library(wallet
loki_add_library(wallet
${wallet_sources}
${wallet_private_headers})
target_link_libraries(wallet
@ -75,9 +76,9 @@ set(wallet_rpc_headers)
set(wallet_rpc_private_headers
wallet_rpc_server.h)
monero_private_headers(wallet_rpc_server
loki_private_headers(wallet_rpc_server
${wallet_rpc_private_headers})
monero_add_executable(wallet_rpc_server
loki_add_executable(wallet_rpc_server
${wallet_rpc_sources}
${wallet_rpc_headers}
${wallet_rpc_private_headers})

View File

@ -1,3 +1,4 @@
# Copyright (c) 2018, The Loki Project
# Copyright (c) 2014-2018, The Monero Project
#
# All rights reserved.
@ -57,9 +58,9 @@ set(wallet_api_private_headers
subaddress_account.h
unsigned_transaction.h)
monero_private_headers(wallet_api
loki_private_headers(wallet_api
${wallet_api_private_headers})
monero_add_library(wallet_api
loki_add_library(wallet_api
${wallet_api_sources}
${wallet_api_headers}
${wallet_api_private_headers})