Moved bs from pkg-config

This commit is contained in:
Андреев Григорий 2024-08-16 22:25:14 +03:00
parent fe08489408
commit ac41331ff9
2 changed files with 6 additions and 17 deletions

View File

@ -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

View File

@ -6,7 +6,6 @@ struct Libregexis024BuildSystem {
/* Installation runlevel */ /* Installation runlevel */
BuildUnitsArray runlevel_2; BuildUnitsArray runlevel_2;
/* "debug" or "release" */
std::string build_type; std::string build_type;
bool build_tests; bool build_tests;
@ -33,10 +32,12 @@ struct Libregexis024BuildSystem {
return my_flag_collection; return my_flag_collection;
} }
Libregexis024BuildSystem(const std::string& build_type, bool build_tests, const NormalCBuildSystemCommandMeaning& cmd) Libregexis024BuildSystem(const NormalCBuildSystemCommandMeaning& cmd){
:build_type(build_type), build_tests(build_tests) 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"); ASSERT(build_type == "release" || build_type == "debug", "Unknown build type");
build_tests = (bool)BSCRIPT_TESTS;
std::vector<ExternalLibraryTarget> ext_targets; std::vector<ExternalLibraryTarget> ext_targets;
@ -115,7 +116,6 @@ struct Libregexis024BuildSystem {
T.include_ir = ""; T.include_ir = "";
T.exported_headers = exported_headers; T.exported_headers = exported_headers;
T.installation_dir = ""; T.installation_dir = "";
T.pc_output_path = "libregexis024.pc";
my_targets.push_back(T); my_targets.push_back(T);
} }
if (build_tests) { if (build_tests) {
@ -140,9 +140,7 @@ int main(int argc, char** argv) {
} }
NormalCBuildSystemCommandMeaning cmd; NormalCBuildSystemCommandMeaning cmd;
regular_bs_cli_cmd_interpret(args, cmd); regular_bs_cli_cmd_interpret(args, cmd);
const char* BS_SCRIPT_TYPE = getenv("BS_SCRIPT_TYPE"); Libregexis024BuildSystem bs(cmd);
const char* BS_SCRIPT_TESTS = getenv("BS_SCRIPT_TESTS");
Libregexis024BuildSystem bs(BS_SCRIPT_TYPE ? BS_SCRIPT_TYPE : "release", (bool)BS_SCRIPT_TESTS, cmd);
if (cmd.need_to_build) if (cmd.need_to_build)
complete_tasks_of_build_units(bs.runlevel_1); complete_tasks_of_build_units(bs.runlevel_1);
if (cmd.need_to_install) if (cmd.need_to_install)