2 Commits

Author SHA1 Message Date
9437b175a2 updated build system
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2024-07-26 15:08:41 -05:00
302d73a078 unmount if initilization fails 2024-07-26 14:54:05 -05:00
13 changed files with 32 additions and 23 deletions

View File

@ -359,9 +359,15 @@ auto fuse_base::init_impl([[maybe_unused]] struct fuse_conn_info *conn,
#else #else
auto fuse_base::init_impl(struct fuse_conn_info *conn) -> void * { auto fuse_base::init_impl(struct fuse_conn_info *conn) -> void * {
#endif #endif
constexpr const auto *function_name = static_cast<const char *>(__FUNCTION__);
utils::file::change_to_process_directory(); utils::file::change_to_process_directory();
if (not console_enabled_) { if (not console_enabled_) {
repertory::project_initialize(); if (not repertory::project_initialize()) {
utils::error::raise_error(function_name,
"failed to initialize repertory");
event_system::instance().raise<unmount_requested>();
}
} }
#if defined(__APPLE__) #if defined(__APPLE__)

View File

@ -37,6 +37,7 @@ auto main(int argc, char **argv) -> int {
#endif #endif
if (not repertory::project_initialize()) { if (not repertory::project_initialize()) {
std::cerr << "fatal: failed to initialize repertory" << std::endl;
return -1; return -1;
} }

View File

@ -21,6 +21,7 @@
*/ */
#include "initialize.hpp" #include "initialize.hpp"
#include "test_common.hpp" #include "test_common.hpp"
#include "utils/error_utils.hpp"
#if defined(_WIN32) #if defined(_WIN32)
#include "utils/cli_utils.hpp" #include "utils/cli_utils.hpp"
#endif // _WIN32 #endif // _WIN32
@ -33,6 +34,7 @@ std::size_t PROVIDER_INDEX{0U};
auto main(int argc, char **argv) -> int { auto main(int argc, char **argv) -> int {
if (not repertory::project_initialize()) { if (not repertory::project_initialize()) {
std::cerr << "fatal: failed to initialize repertory" << std::endl;
return -1; return -1;
} }

View File

@ -2,8 +2,8 @@
PROJECT_MINGW64_COPY_DEPENDENCIES=() PROJECT_MINGW64_COPY_DEPENDENCIES=()
PROJECT_SCRIPTS_DIR=$(dirname "$0") PROJECT_SCRIPTS_DIR=$(realpath "$0")
PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1>/dev/null 2>&1 . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1>/dev/null 2>&1
if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; then if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; then

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
PROJECT_SCRIPTS_DIR=$(dirname "$0") PROJECT_SCRIPTS_DIR=$(realpath "$0")
PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1 1>/dev/null 2>&1 . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1 1>/dev/null 2>&1
if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then

View File

@ -3,8 +3,8 @@
DEST_DIR=$1 DEST_DIR=$1
DIST_DIR=$2 DIST_DIR=$2
PROJECT_SCRIPTS_DIR=$(dirname "$0") PROJECT_SCRIPTS_DIR=$(realpath "$0")
PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
. "${PROJECT_SCRIPTS_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7" . "${PROJECT_SCRIPTS_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7"
function error_exit() { function error_exit() {

View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
PROJECT_SCRIPTS_DIR=$(dirname "$0") PROJECT_SCRIPTS_DIR=$(realpath "$0")
PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1 . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
PROJECT_SCRIPTS_DIR=$(dirname "$0") PROJECT_SCRIPTS_DIR=$(realpath "$0")
PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5"
mkdir -p "${PROJECT_BUILD_DIR}/build" mkdir -p "${PROJECT_BUILD_DIR}/build"
@ -60,8 +60,8 @@ for APP in ${PROJECT_APP_LIST[@]}; do
rsync -av --progress "${PROJECT_BUILD_DIR}/build/${APP}${PROJECT_APP_BINARY_EXT}" "${PROJECT_DIST_DIR}/bin/" rsync -av --progress "${PROJECT_BUILD_DIR}/build/${APP}${PROJECT_APP_BINARY_EXT}" "${PROJECT_DIST_DIR}/bin/"
cat <<EOF >>"${PROJECT_DIST_DIR}/${APP}${PROJECT_APP_BINARY_EXT}" cat <<EOF >>"${PROJECT_DIST_DIR}/${APP}${PROJECT_APP_BINARY_EXT}"
#!/bin/sh #!/bin/sh
PROJECT_SCRIPTS_DIR=\$(dirname "\$0") PROJECT_SCRIPTS_DIR=\$(realpath \${0})
PROJECT_SCRIPTS_DIR=\$(realpath \${PROJECT_SCRIPTS_DIR}) PROJECT_SCRIPTS_DIR=\$(dirname "\${PROJECT_SCRIPTS_DIR}")
export LD_LIBRARY_PATH="\${PROJECT_SCRIPTS_DIR}/lib:\${PROJECT_SCRIPTS_DIR}/lib64:\${LD_LIBRARY_PATH}" export LD_LIBRARY_PATH="\${PROJECT_SCRIPTS_DIR}/lib:\${PROJECT_SCRIPTS_DIR}/lib64:\${LD_LIBRARY_PATH}"

View File

@ -4,8 +4,8 @@ TEMP_DIR=$(mktemp -d)
DEST_DIR=$1 DEST_DIR=$1
PROJECT_SCRIPTS_DIR=$(dirname "$0") PROJECT_SCRIPTS_DIR=$(realpath "$0")
PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
. "${PROJECT_SCRIPTS_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6" . "${PROJECT_SCRIPTS_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6"
function error_exit() { function error_exit() {

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
PROJECT_SCRIPTS_DIR=$(dirname "$0") PROJECT_SCRIPTS_DIR=$(realpath "$0")
PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" 0 0 . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" 0 0
if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
PROJECT_SCRIPTS_DIR=$(dirname "$0") PROJECT_SCRIPTS_DIR=$(realpath "$0")
PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" 1 1 . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" 1 1
if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then

View File

@ -2,8 +2,8 @@
DOCKER_NAME=$1 DOCKER_NAME=$1
PROJECT_SCRIPTS_DIR=$(dirname "$0") PROJECT_SCRIPTS_DIR=$(realpath "$0")
PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
. "${PROJECT_SCRIPTS_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6" 1 1>/dev/null 2>&1 . "${PROJECT_SCRIPTS_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6" 1 1>/dev/null 2>&1
if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then

View File

@ -2,8 +2,8 @@
PROJECT_MSYS2_PACKAGE_LIST=() PROJECT_MSYS2_PACKAGE_LIST=()
PROJECT_SCRIPTS_DIR=$(dirname "$0") PROJECT_SCRIPTS_DIR=$(realpath "$0")
PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1 1>/dev/null 2>&1 . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1 1>/dev/null 2>&1
PROJECT_MSYS2_PACKAGE_LIST+=( PROJECT_MSYS2_PACKAGE_LIST+=(