diff --git a/building/main.cpp b/building/main.cpp index e1fdb3a..9185ea4 100644 --- a/building/main.cpp +++ b/building/main.cpp @@ -45,26 +45,30 @@ struct TestWebsiteBuildScript { std::vector my_targets; { CTarget T("libjsonincpp", "shared_library"); T.additional_compilation_flags = getSomeRadFlags(); - T.units_dir = "library"; T.units = { - "libjsonincpp/utf8.cpp", - "libjsonincpp/jsonobj.cpp", - "libjsonincpp/quality_of_life.cpp", - "libjsonincpp/quality_of_life_2.cpp", - "libjsonincpp/integer.cpp", - "libjsonincpp/inner_storage.cpp", - "libjsonincpp/generator.cpp", - "libjsonincpp/parser.cpp", - "libjsonincpp/parser_context.cpp", - "libjsonincpp/container_parsing.cpp", + "utf8.cpp", + "jsonobj.cpp", + "quality_of_life.cpp", + "quality_of_life_2.cpp", + "integer.cpp", + "inner_storage.cpp", + "generator.cpp", + "parser.cpp", + "parser_context.cpp", + "container_parsing.cpp", }; + for (std::string& u: T.units) + u = "library/libjsonincpp/" + u; T.include_pr = "library"; T.include_ir = ""; T.exported_headers = { - "libjsonincpp/jsonobj.h", - "libjsonincpp/string_representation.h", - "libjsonincpp/utf8.h" + "jsonobj.h", + "string_representation.h", + "utf8.h", + "integer.h", }; + for (std::string& u: T.exported_headers) + u = "libjsonincpp/" + u; T.installation_dir = ""; T.description = "C++ JSON object structure + parser and generator"; T.pc_output_path = "libjsonincpp.pc"; @@ -73,8 +77,7 @@ struct TestWebsiteBuildScript { if (make_tests) { CTarget T("test0", "executable"); T.additional_compilation_flags = getSomeRadFlags(); T.proj_deps = {CTargetDependenceOnProjectsLibrary("libjsonincpp")}; - T.units_dir = "tests"; - T.units = {"test0.cpp"}; + T.units = {"tests/test0.cpp"}; T.include_pr = "tests"; my_targets.push_back(T); } @@ -95,9 +98,10 @@ int main(int argc, char** argv) { TestWebsiteBuildScript bs("debug", false, cmd); if (cmd.need_to_build) complete_tasks_of_build_units(bs.runlevel_1); + umask(~0755); if (cmd.need_to_install) complete_tasks_of_build_units(bs.runlevel_2); } catch (const buildSystemFailure& e) { printf("Build system failure\n""%s\n", e.toString().c_str()); } -} \ No newline at end of file +}