diff --git a/building/build_build_system.sh b/building/build_build_system.sh deleted file mode 100755 index aeb562d..0000000 --- a/building/build_build_system.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -BUILDING_DIR="./building" -[ -d "$BUILDING_DIR" ] || exit 1 -MAIN_FILE="$BUILDING_DIR/main.cpp" -[ -f "$MAIN_FILE" ] || exit 1 -COOL_FLAGS="$(pkg-config --cflags regexis024-build-system)" - -g++ $COOL_FLAGS -o "$BUILDING_DIR/main" "$MAIN_FILE" || exit 1 diff --git a/building/main.cpp b/building/main.cpp index bc680c1..642c86b 100644 --- a/building/main.cpp +++ b/building/main.cpp @@ -6,7 +6,6 @@ struct Libregexis024BuildSystem { /* Installation runlevel */ BuildUnitsArray runlevel_2; - /* "debug" or "release" */ std::string build_type; bool build_tests; @@ -33,10 +32,12 @@ struct Libregexis024BuildSystem { return my_flag_collection; } - Libregexis024BuildSystem(const std::string& build_type, bool build_tests, const NormalCBuildSystemCommandMeaning& cmd) - :build_type(build_type), build_tests(build_tests) - { + Libregexis024BuildSystem(const NormalCBuildSystemCommandMeaning& cmd){ + const char* BSCRIPT_TYPE = getenv("BSCRIPT_TYPE"); + const char* BSCRIPT_TESTS = getenv("BSCRIPT_TESTS"); + build_type = std::string(BSCRIPT_TYPE ? BSCRIPT_TYPE : "release"); ASSERT(build_type == "release" || build_type == "debug", "Unknown build type"); + build_tests = (bool)BSCRIPT_TESTS; std::vector ext_targets; @@ -115,7 +116,6 @@ struct Libregexis024BuildSystem { T.include_ir = ""; T.exported_headers = exported_headers; T.installation_dir = ""; - T.pc_output_path = "libregexis024.pc"; my_targets.push_back(T); } if (build_tests) { @@ -140,9 +140,7 @@ int main(int argc, char** argv) { } NormalCBuildSystemCommandMeaning cmd; regular_bs_cli_cmd_interpret(args, cmd); - const char* BS_SCRIPT_TYPE = getenv("BS_SCRIPT_TYPE"); - const char* BS_SCRIPT_TESTS = getenv("BS_SCRIPT_TESTS"); - Libregexis024BuildSystem bs(BS_SCRIPT_TYPE ? BS_SCRIPT_TYPE : "release", (bool)BS_SCRIPT_TESTS, cmd); + Libregexis024BuildSystem bs(cmd); if (cmd.need_to_build) complete_tasks_of_build_units(bs.runlevel_1); if (cmd.need_to_install)