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

Compare commits

base: collarbone-annihilation:dfbf0b202893c5a3e59f42cbf96c1ca72ad98ddf
Branches Tags
collarbone-annihilation:master
..
compare: collarbone-annihilation:046a58a4500f745a5583ff95a81680ad12283df5
Branches Tags
collarbone-annihilation:master

No commits in common. "dfbf0b202893c5a3e59f42cbf96c1ca72ad98ddf" and "046a58a4500f745a5583ff95a81680ad12283df5" have entirely different histories.
dfbf0b2028 ... 046a58a450

1 changed files with 17 additions and 21 deletions
Show Stats Expand all files Collapse all files

38
building/main.cpp
View File

@ -45,30 +45,26 @@ 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 = {
"utf8.cpp", "libjsonincpp/utf8.cpp",
"jsonobj.cpp", "libjsonincpp/jsonobj.cpp",
"quality_of_life.cpp", "libjsonincpp/quality_of_life.cpp",
"quality_of_life_2.cpp", "libjsonincpp/quality_of_life_2.cpp",
"integer.cpp", "libjsonincpp/integer.cpp",
"inner_storage.cpp", "libjsonincpp/inner_storage.cpp",
"generator.cpp", "libjsonincpp/generator.cpp",
"parser.cpp", "libjsonincpp/parser.cpp",
"parser_context.cpp", "libjsonincpp/parser_context.cpp",
"container_parsing.cpp", "libjsonincpp/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 = {
"jsonobj.h", "libjsonincpp/jsonobj.h",
"string_representation.h", "libjsonincpp/string_representation.h",
"utf8.h", "libjsonincpp/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";
@ -77,7 +73,8 @@ 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 = {"tests/test0.cpp"}; T.units_dir = "tests";
T.units = {"test0.cpp"};
T.include_pr = "tests"; T.include_pr = "tests";
my_targets.push_back(T); my_targets.push_back(T);
} }
@ -98,10 +95,9 @@ 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) {
printf("Build system failure\n""%s\n", e.toString().c_str()); printf("Build system failure\n""%s\n", e.toString().c_str());
} }
} }