collarbone-annihilation/libjsonincpp
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Fix' (#1) from deut into master

Browse Source 
Reviewed-on: https://peppermintgingerbread.zip/collarbone-annihilation/libjsonincpp/pulls/1
This commit is contained in:
Андреев Григорий 2024-07-27 12:17:19 +00:00
commit dfbf0b2028
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
building/main.cpp
View File

@ -45,26 +45,30 @@ struct TestWebsiteBuildScript {
std::vector<CTarget> my_targets; std::vector<CTarget> my_targets;
{ CTarget T("libjsonincpp", "shared_library"); { CTarget T("libjsonincpp", "shared_library");
T.additional_compilation_flags = getSomeRadFlags(); T.additional_compilation_flags = getSomeRadFlags();
T.units_dir = "library";
T.units = { T.units = {
"libjsonincpp/utf8.cpp", "utf8.cpp",
"libjsonincpp/jsonobj.cpp", "jsonobj.cpp",
"libjsonincpp/quality_of_life.cpp", "quality_of_life.cpp",
"libjsonincpp/quality_of_life_2.cpp", "quality_of_life_2.cpp",
"libjsonincpp/integer.cpp", "integer.cpp",
"libjsonincpp/inner_storage.cpp", "inner_storage.cpp",
"libjsonincpp/generator.cpp", "generator.cpp",
"libjsonincpp/parser.cpp", "parser.cpp",
"libjsonincpp/parser_context.cpp", "parser_context.cpp",
"libjsonincpp/container_parsing.cpp", "container_parsing.cpp",
}; };
for (std::string& u: T.units)
u = "library/libjsonincpp/" + u;
T.include_pr = "library"; T.include_pr = "library";
T.include_ir = ""; T.include_ir = "";
T.exported_headers = { T.exported_headers = {
"libjsonincpp/jsonobj.h", "jsonobj.h",
"libjsonincpp/string_representation.h", "string_representation.h",
"libjsonincpp/utf8.h" "utf8.h",
"integer.h",
}; };
for (std::string& u: T.exported_headers)
u = "libjsonincpp/" + u;
T.installation_dir = ""; T.installation_dir = "";
T.description = "C++ JSON object structure + parser and generator"; T.description = "C++ JSON object structure + parser and generator";
T.pc_output_path = "libjsonincpp.pc"; T.pc_output_path = "libjsonincpp.pc";
@ -73,8 +77,7 @@ struct TestWebsiteBuildScript {
if (make_tests) { CTarget T("test0", "executable"); if (make_tests) { CTarget T("test0", "executable");
T.additional_compilation_flags = getSomeRadFlags(); T.additional_compilation_flags = getSomeRadFlags();
T.proj_deps = {CTargetDependenceOnProjectsLibrary("libjsonincpp")}; T.proj_deps = {CTargetDependenceOnProjectsLibrary("libjsonincpp")};
T.units_dir = "tests"; T.units = {"tests/test0.cpp"};
T.units = {"test0.cpp"};
T.include_pr = "tests"; T.include_pr = "tests";
my_targets.push_back(T); my_targets.push_back(T);
} }
@ -95,6 +98,7 @@ int main(int argc, char** argv) {
TestWebsiteBuildScript bs("debug", false, cmd); TestWebsiteBuildScript bs("debug", false, 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);
umask(~0755);
if (cmd.need_to_install) if (cmd.need_to_install)
complete_tasks_of_build_units(bs.runlevel_2); complete_tasks_of_build_units(bs.runlevel_2);
} catch (const buildSystemFailure& e) { } catch (const buildSystemFailure& e) {