diff --git a/compiler2/AST.cc b/compiler2/AST.cc index 82686289f829e85b3b30aefd6995e1015ae5ff5d..fcaf27e50ebdaec2a2e583b763ae9765ea07f690 100644 --- a/compiler2/AST.cc +++ b/compiler2/AST.cc @@ -20,6 +20,7 @@ * Kovacs, Ferenc * Raduly, Csaba * Szabados, Kristof + * Szabo, Bence Janos * Szabo, Janos Zoltan – initial implementation * Szalai, Gabor * Zalanyi, Balazs Andor @@ -49,7 +50,7 @@ reffer::reffer(const char*) {} namespace Common { - + // ================================= // ===== Modules // ================================= @@ -356,7 +357,7 @@ namespace Common { if (bits == 0) continue; if (is_nonempty) src = mputstr(src, ",\n"); else { - src = mputstr(src, "static const unsigned char "); + src = mputprintf(src, "%sconst unsigned char ", split_to_slices ? "" : "static "); is_nonempty = true; } src = mputprintf(src, "%s_bits[] = { ", @@ -395,12 +396,14 @@ namespace Common { if (splitting) hdr = mputstr(hdr, ";\n"); } - void Module::generate_bp_literals(char *&src, char *& /*hdr*/) + void Module::generate_bp_literals(char *&src, char *& hdr) { if (bp_literals.size() == 0) return; for (size_t i = 0; i < bp_literals.size(); i++) { if (i > 0) src = mputstr(src, ",\n"); - else src = mputstr(src, "static const unsigned char "); + else { + src = mputprintf(src, "%sconst unsigned char ", split_to_slices ? "" : "static "); + } src = mputprintf(src, "%s_elements[] = { ", bp_literals.get_nth_elem(i)->c_str()); const string& str = bp_literals.get_nth_key(i); @@ -427,13 +430,29 @@ namespace Common { } src = mputstr(src, ";\n"); for (size_t i = 0; i < bp_literals.size(); i++) { - if (i > 0) src = mputstr(src, ",\n"); - else src = mputstr(src, "static const BITSTRING_template "); + if (i > 0) { + src = mputstr(src, ",\n"); + if (split_to_slices) { + hdr = mputstr(hdr, ",\n"); + } + } + else { + src = mputprintf(src, "%sconst BITSTRING_template ", split_to_slices ? "" : "static "); + if (split_to_slices) { + hdr = mputprintf(hdr, "extern const BITSTRING_template "); + } + } const char *name = bp_literals.get_nth_elem(i)->c_str(); src = mputprintf(src, "%s(%lu, %s_elements)", name, (unsigned long) bp_literals.get_nth_key(i).size(), name); + if (split_to_slices) { + hdr = mputstr(hdr, name); + } } src = mputstr(src, ";\n"); + if (split_to_slices) { + hdr = mputstr(hdr, ";\n"); + } } void Module::generate_hs_literals(char *&src, char *&hdr) @@ -451,7 +470,7 @@ namespace Common { const char *str_ptr = str.c_str(); if (is_nonempty) src = mputstr(src, ",\n"); else { - src = mputstr(src, "static const unsigned char "); + src = mputprintf(src, "%sconst unsigned char ", split_to_slices ? "" : "static "); is_nonempty = true; } src = mputprintf(src, "%s_nibbles[] = { ", @@ -494,12 +513,15 @@ namespace Common { if (splitting) hdr = mputstr(hdr, ";\n"); } - void Module::generate_hp_literals(char *&src, char *& /*hdr*/) + void Module::generate_hp_literals(char *&src, char *& hdr) { if (hp_literals.size() == 0) return; for (size_t i = 0; i < hp_literals.size(); i++) { - if (i > 0) src = mputstr(src, ",\n"); - else src = mputstr(src, "static const unsigned char "); + if (i > 0) { + src = mputstr(src, ",\n"); + } else { + src = mputprintf(src, "%sconst unsigned char ", split_to_slices ? "" : "static "); + } src = mputprintf(src, "%s_elements[] = { ", hp_literals.get_nth_elem(i)->c_str()); const string& str = hp_literals.get_nth_key(i); @@ -517,13 +539,28 @@ namespace Common { } src = mputstr(src, ";\n"); for (size_t i = 0; i < hp_literals.size(); i++) { - if (i > 0) src = mputstr(src, ",\n"); - else src = mputstr(src, "static const HEXSTRING_template "); + if (i > 0) { + src = mputstr(src, ",\n"); + if (split_to_slices) { + hdr = mputstr(hdr, ",\n"); + } + } else { + src = mputprintf(src, "%sconst HEXSTRING_template ", split_to_slices ? "" : "static "); + if (split_to_slices) { + hdr = mputprintf(hdr, "extern const HEXSTRING_template "); + } + } const char *name = hp_literals.get_nth_elem(i)->c_str(); src = mputprintf(src, "%s(%lu, %s_elements)", name, (unsigned long) hp_literals.get_nth_key(i).size(), name); + if (split_to_slices) { + hdr = mputstr(hdr, name); + } } src = mputstr(src, ";\n"); + if (split_to_slices) { + hdr = mputstr(hdr, ";\n"); + } } void Module::generate_os_literals(char *&src, char *&hdr) @@ -542,7 +579,7 @@ namespace Common { const char *str_ptr = str.c_str(); if (is_nonempty) src = mputstr(src, ",\n"); else { - src = mputstr(src, "static const unsigned char "); + src = mputprintf(src, "%sconst unsigned char ", split_to_slices ? "" : "static "); is_nonempty = true; } src = mputprintf(src, "%s_octets[] = { ", @@ -576,13 +613,16 @@ namespace Common { if (splitting) hdr = mputstr(hdr, ";\n"); } - void Module::generate_op_literals(char *&src, char *& /*hdr*/) + void Module::generate_op_literals(char *&src, char *& hdr) { if (op_literals.size() == 0) return; vector<size_t> pattern_lens; for(size_t i = 0; i < op_literals.size(); i++) { - if (i > 0) src = mputstr(src, ",\n"); - else src = mputstr(src, "static const unsigned short "); + if (i > 0) { + src = mputstr(src, ",\n"); + } else { + src = mputprintf(src, "%sconst unsigned short ", split_to_slices ? "" : "static "); + } src = mputprintf(src, "%s_elements[] = { ", op_literals.get_nth_elem(i)->c_str()); const string& str = op_literals.get_nth_key(i); @@ -610,13 +650,29 @@ namespace Common { } src = mputstr(src, ";\n"); for (size_t i = 0; i < op_literals.size(); i++) { - if (i > 0) src = mputstr(src, ",\n"); - else src = mputstr(src, "static const OCTETSTRING_template "); + if (i > 0) { + src = mputstr(src, ",\n"); + if (split_to_slices) { + hdr = mputstr(hdr, ",\n"); + } + } + else { + src = mputprintf(src, "%sconst OCTETSTRING_template ", split_to_slices ? "" : "static "); + if (split_to_slices) { + hdr = mputprintf(hdr, "extern const OCTETSTRING_template "); + } + } const char *name = op_literals.get_nth_elem(i)->c_str(); src = mputprintf(src, "%s(%lu, %s_elements)", name, (unsigned long) *pattern_lens[i], name); + if (split_to_slices) { + hdr = mputstr(hdr, name); + } } src = mputstr(src, ";\n"); + if (split_to_slices) { + hdr = mputstr(hdr, ";\n"); + } for (size_t i = 0; i < pattern_lens.size(); i++) delete pattern_lens[i]; pattern_lens.clear(); } @@ -674,8 +730,12 @@ namespace Common { const string& pattern = pp_literals.get_nth_key(i); size_t pattern_len = pattern.size(); const char *pattern_ptr = pattern.c_str(); - if (i > 0) src = mputstr(src, ",\n"); - else src = mputstr(src, "static const unsigned char "); + if (i > 0) { + src = mputstr(src, ",\n"); + } + else { + src = mputprintf(src, "%sconst unsigned char ", split_to_slices ? "" : "static "); + } src = mputprintf(src, "%s[] = { ", pp_literals.get_nth_elem(i)->c_str()); if (pattern_len % 8 != 0) FATAL_ERROR("Module::generate_pp_literals()"); size_t nof_octets = pattern_len / 8; @@ -704,7 +764,7 @@ namespace Common { const char *str_ptr = str.c_str(); if (i > 0) src = mputstr(src, ",\n"); - else src = mputstr(src, "static const Token_Match "); + else src = mputprintf(src, "%sconst Token_Match ", split_to_slices ? "" : "static "); src = mputprintf(src, "%s(\"", mp_literals.get_nth_elem(i)->c_str()); src = Code::translate_string(src, str_ptr + 1); @@ -730,7 +790,7 @@ namespace Common { if (value_size < 2) continue; if (array_needed) src = mputstr(src, ",\n"); else { - src = mputstr(src, "static const universal_char "); + src = mputprintf(src, "%sconst universal_char ", split_to_slices ? "" : "static "); array_needed = true; } src = mputprintf(src, "%s_uchars[] = { ", @@ -777,12 +837,12 @@ namespace Common { if (splitting) hdr = mputstr(hdr, ";\n"); } - void Module::generate_oid_literals(char *&src, char *& /*hdr*/) + void Module::generate_oid_literals(char *&src, char *& hdr) { if (oid_literals.size() == 0) return; for (size_t i = 0; i < oid_literals.size(); i++) { if (i > 0) src = mputstr(src, ",\n"); - else src = mputstr(src, "static const OBJID::objid_element "); + else src = mputprintf(src, "%sconst OBJID::objid_element ", split_to_slices ? "" : "static "); src = mputprintf(src, "%s_comps[] = { %s }", oid_literals.get_nth_elem(i)->oid_id.c_str(), @@ -792,14 +852,30 @@ namespace Common { for(size_t i = 0; i < oid_literals.size(); i++) { const OID_literal *litstruct = oid_literals.get_nth_elem(i); - if (i > 0) src = mputstr(src, ",\n"); - else src = mputstr(src, "static const OBJID "); + if (i > 0) { + src = mputstr(src, ",\n"); + if (split_to_slices) { + hdr = mputstr(hdr, ",\n"); + } + } + else { + src = mputprintf(src, "%sconst OBJID ", split_to_slices ? "" : "static "); + if (split_to_slices) { + hdr = mputstr(hdr, "extern const OBJID "); + } + } src = mputprintf(src, "%s(%lu, %s_comps)", litstruct->oid_id.c_str(), (unsigned long) litstruct->nof_elems, litstruct->oid_id.c_str()); + if (split_to_slices) { + hdr = mputstr(hdr, litstruct->oid_id.c_str()); + } } src = mputstr(src, ";\n"); + if (split_to_slices) { + hdr = mputstr(hdr, ";\n"); + } } void Module::generate_functions(output_struct *output) @@ -819,11 +895,11 @@ namespace Common { // always generate pre_init_module if the file is profiled if (output->functions.pre_init || profiled || debugged) { output->source.static_function_prototypes = - mputstr(output->source.static_function_prototypes, - "static void pre_init_module();\n"); - output->source.static_function_bodies = mputstr(output->source.static_function_bodies, - "static void pre_init_module()\n" - "{\n"); + mputprintf(output->source.static_function_prototypes, + "%svoid pre_init_module();\n", split_to_slices ? "extern " : "static "); + output->source.static_function_bodies = mputprintf(output->source.static_function_bodies, + "%svoid pre_init_module()\n" + "{\n", split_to_slices ? "" : "static "); if (include_location_info) { output->source.static_function_bodies = mputstr(output->source.static_function_bodies, @@ -866,11 +942,11 @@ namespace Common { // post_init function bool has_post_init = false; if (output->functions.post_init) { - output->source.static_function_prototypes = mputstr(output->source.static_function_prototypes, - "static void post_init_module();\n"); - output->source.static_function_bodies = mputstr(output->source.static_function_bodies, - "static void post_init_module()\n" - "{\n"); + output->source.static_function_prototypes = mputprintf(output->source.static_function_prototypes, + "%svoid post_init_module();\n", split_to_slices ? "extern " : "static "); + output->source.static_function_bodies = mputprintf(output->source.static_function_bodies, + "%svoid post_init_module()\n" + "{\n", split_to_slices ? "" : "static "); if (include_location_info) { output->source.static_function_bodies = mputstr(output->source.static_function_bodies, @@ -907,12 +983,12 @@ namespace Common { // set_param function bool has_set_param; if (output->functions.set_param) { - output->source.static_function_prototypes = mputstr(output->source.static_function_prototypes, - "static boolean set_module_param(Module_Param& param);\n"); - output->source.static_function_bodies = mputstr(output->source.static_function_bodies, - "static boolean set_module_param(Module_Param& param)\n" + output->source.static_function_prototypes = mputprintf(output->source.static_function_prototypes, + "%sboolean set_module_param(Module_Param& param);\n", split_to_slices ? "extern " : "static "); + output->source.static_function_bodies = mputprintf(output->source.static_function_bodies, + "%sboolean set_module_param(Module_Param& param)\n" "{\n" - "const char* const par_name = param.get_id()->get_current_name();\n"); + "const char* const par_name = param.get_id()->get_current_name();\n", split_to_slices ? "" : "static "); output->source.static_function_bodies = mputstr(output->source.static_function_bodies, output->functions.set_param); output->source.static_function_bodies = @@ -925,12 +1001,12 @@ namespace Common { // get_param function bool has_get_param; if (output->functions.get_param) { - output->source.static_function_prototypes = mputstr(output->source.static_function_prototypes, - "static Module_Param* get_module_param(Module_Param_Name& param_name);\n"); - output->source.static_function_bodies = mputstr(output->source.static_function_bodies, - "static Module_Param* get_module_param(Module_Param_Name& param_name)\n" + output->source.static_function_prototypes = mputprintf(output->source.static_function_prototypes, + "%sModule_Param* get_module_param(Module_Param_Name& param_name);\n", split_to_slices ? "extern " : "static "); + output->source.static_function_bodies = mputprintf(output->source.static_function_bodies, + "%sModule_Param* get_module_param(Module_Param_Name& param_name)\n" "{\n" - "const char* const par_name = param_name.get_current_name();\n"); + "const char* const par_name = param_name.get_current_name();\n", split_to_slices ? "" : "static "); output->source.static_function_bodies = mputstr(output->source.static_function_bodies, output->functions.get_param); output->source.static_function_bodies = @@ -943,11 +1019,11 @@ namespace Common { // log_param function bool has_log_param; if (output->functions.log_param) { - output->source.static_function_prototypes = mputstr(output->source.static_function_prototypes, - "static void log_module_param();\n"); - output->source.static_function_bodies = mputstr(output->source.static_function_bodies, - "static void log_module_param()\n" - "{\n"); + output->source.static_function_prototypes = mputprintf(output->source.static_function_prototypes, + "%svoid log_module_param();\n", split_to_slices ? "extern " : "static "); + output->source.static_function_bodies = mputprintf(output->source.static_function_bodies, + "%svoid log_module_param()\n" + "{\n", split_to_slices ? "" : "static "); output->source.static_function_bodies = mputstr(output->source.static_function_bodies, output->functions.log_param); output->source.static_function_bodies = mputstr(output->source.static_function_bodies, @@ -960,14 +1036,14 @@ namespace Common { bool has_init_comp; if (output->functions.init_comp) { output->source.static_function_prototypes = - mputstr(output->source.static_function_prototypes, - "static boolean init_comp_type(" - "const char *component_type, boolean init_base_comps);\n"); + mputprintf(output->source.static_function_prototypes, + "%sboolean init_comp_type(" + "const char *component_type, boolean init_base_comps);\n", split_to_slices ? "extern " : "static "); output->source.static_function_bodies = - mputstr(output->source.static_function_bodies, - "static boolean init_comp_type(const char *component_type, " + mputprintf(output->source.static_function_bodies, + "%sboolean init_comp_type(const char *component_type, " "boolean init_base_comps)\n" - "{\n(void)init_base_comps;\n"); + "{\n(void)init_base_comps;\n", split_to_slices ? "" : "static "); output->source.static_function_bodies = mputstr(output->source.static_function_bodies, output->functions.init_comp); @@ -981,13 +1057,13 @@ namespace Common { // start function bool has_start; if (output->functions.start) { - output->source.static_function_prototypes = mputstr(output->source.static_function_prototypes, - "static boolean start_ptc_function(const char *function_name, " - "Text_Buf& function_arguments);\n"); - output->source.static_function_bodies = mputstr(output->source.static_function_bodies, - "static boolean start_ptc_function(const char *function_name, " + output->source.static_function_prototypes = mputprintf(output->source.static_function_prototypes, + "%sboolean start_ptc_function(const char *function_name, " + "Text_Buf& function_arguments);\n", split_to_slices ? "extern " : "static "); + output->source.static_function_bodies = mputprintf(output->source.static_function_bodies, + "%sboolean start_ptc_function(const char *function_name, " "Text_Buf& function_arguments)\n" - "{\n"); + "{\n", split_to_slices ? "" : "static "); output->source.static_function_bodies = mputstr(output->source.static_function_bodies, output->functions.start); output->source.static_function_bodies = @@ -1000,11 +1076,11 @@ namespace Common { // control part bool has_control; if (output->functions.control) { - output->source.static_function_prototypes = mputstr(output->source.static_function_prototypes, - "static void module_control_part();\n"); - output->source.static_function_bodies = mputstr(output->source.static_function_bodies, - "static void module_control_part()\n" - "{\n"); + output->source.static_function_prototypes = mputprintf(output->source.static_function_prototypes, + "%svoid module_control_part();\n", split_to_slices ? "extern " : "static "); + output->source.static_function_bodies = mputprintf(output->source.static_function_bodies, + "%svoid module_control_part()\n" + "{\n", split_to_slices ? "" : "static "); output->source.static_function_bodies = mputstr(output->source.static_function_bodies, output->functions.control); output->source.static_function_bodies = @@ -1015,8 +1091,11 @@ namespace Common { } else has_control = false; // module checksum if (has_checksum) { - output->source.string_literals = mputstr(output->source.string_literals, - "static const unsigned char module_checksum[] = {"); + if (split_to_slices) { + output->header.global_vars = mputprintf(output->header.global_vars, "extern const unsigned char module_checksum[];\n"); + } + output->source.string_literals = mputprintf(output->source.string_literals, + "%sconst unsigned char module_checksum[] = {", split_to_slices ? "" : "static "); for (size_t i = 0; i < sizeof(module_checksum); i++) { if (i > 0) output->source.string_literals = mputc(output->source.string_literals, ','); @@ -1046,10 +1125,17 @@ namespace Common { if (num_xml_namespaces != 0 || (control_ns && control_ns_prefix)) { output->source.global_vars = mputprintf(output->source.global_vars, - "static const size_t num_namespaces = %lu;\n" - "static const namespace_t xml_namespaces[num_namespaces+1] = {\n" - , (unsigned long)num_xml_namespaces + "%sconst size_t num_namespaces = %lu;\n" + "%sconst namespace_t xml_namespaces[num_namespaces+1] = {\n" + , split_to_slices ? "" : "static ", (unsigned long)num_xml_namespaces + , split_to_slices ? "" : "static " ); + if (split_to_slices) { + output->header.global_vars = mputprintf(output->header.global_vars, + "extern const size_t num_namespaces;\n"); + output->header.global_vars = mputprintf(output->header.global_vars, + "extern const namespace_t xml_namespaces[];\n"); + } for (size_t i=0; i < namespaces.size(); ++i) { if (used_namespaces.has_key(i)) { output->source.global_vars = mputprintf(output->source.global_vars, @@ -1126,19 +1212,31 @@ namespace Common { duplicate_underscores ? module_name : modid->get_ttcnname().c_str()); output->source.global_vars = mputprintf(output->source.global_vars, - "\nstatic const RuntimeVersionChecker ver_checker(" + "\n%sconst RuntimeVersionChecker ver_checker(" " current_runtime_version.requires_major_version_%d,\n" " current_runtime_version.requires_minor_version_%d,\n" " current_runtime_version.requires_patch_level_%d," " current_runtime_version.requires_runtime_%d);\n", + split_to_slices ? "" : "static ", TTCN3_MAJOR, TTCN3_MINOR, TTCN3_PATCHLEVEL, use_runtime_2 ? 2 : 1 ); + if (split_to_slices) { + output->header.global_vars = mputprintf(output->header.global_vars, + "extern const RuntimeVersionChecker ver_checker;\n"); + } if (tcov_enabled) { output->source.global_vars = mputprintf(output->source.global_vars, - "\nstatic const int effective_module_lines[] = { %s };\n" \ - "static const char *effective_module_functions[] = { %s };\n", + "\n%sconst int effective_module_lines[] = { %s };\n" \ + "%sconst char *effective_module_functions[] = { %s };\n", + split_to_slices ? "" : "static ", effective_module_lines ? static_cast<const char *>(effective_module_lines) : "", + split_to_slices ? "" : "static ", effective_module_functions ? static_cast<const char *>(effective_module_functions) : ""); + if (split_to_slices) { + output->header.global_vars = mputprintf(output->header.global_vars, + "extern const int effective_module_lines[];\n" \ + "extern const char *effective_module_functions[];\n"); + } } } @@ -1545,20 +1643,27 @@ namespace Common { cgh.add_module(modid->get_name(), modid->get_ttcnname(), moduletype == MOD_TTCN, true); cgh.set_current_module(modid->get_ttcnname()); - + // language specific parts (definitions, imports, etc.) //generate_code_internal(&target); <- needed to pass cgh generate_code_internal(cgh); output_struct* output = cgh.get_current_outputstruct(); + + CodeGenHelper::update_intervals(output); // string literals generate_literals(output); // module level entry points generate_functions(output); + + CodeGenHelper::update_intervals(output); // maybe deeper in generate_functions + // type conversion functions for type compatibility generate_conversion_functions(output); + CodeGenHelper::update_intervals(output); // maybe deeper in conv_funcs + /* generate the initializer function for the TTCN-3 profiler * (this is done at the end of the code generation, to make sure all code * lines have been added to the profiler database) */ @@ -1580,6 +1685,10 @@ namespace Common { } } output->source.global_vars = mputstr(output->source.global_vars, "}\n"); + if (split_to_slices) { + output->header.global_vars = mputstr(output->header.global_vars, + "extern void init_ttcn3_profiler();\n"); + } } /* TTCN-3 debugger: generate the printing function for the types defined in this module diff --git a/compiler2/Code.cc b/compiler2/Code.cc index 074fdc87845e20853a8252523f50419c274dff13..feac7577b57bb8393873e7ec6f226473410ef89d 100644 --- a/compiler2/Code.cc +++ b/compiler2/Code.cc @@ -12,12 +12,14 @@ * Forstner, Matyas * Kovacs, Ferenc * Raduly, Csaba + * Szabo, Bence Janos * Szabo, Janos Zoltan – initial implementation * ******************************************************************************/ #include "Code.hh" #include "../common/memory.h" #include "error.h" +#include "CodeGenHelper.hh" #include <ctype.h> @@ -54,6 +56,31 @@ namespace Common { output->functions.init_comp = NULL; output->functions.start = NULL; output->functions.control = NULL; + output->intervals.pre_things_size = 0; + output->intervals.methods_size = 0; + output->intervals.function_bodies_size = 0; + output->intervals.static_conversion_function_bodies_size = 0; + output->intervals.static_function_bodies_size = 0; + output->intervals.methods_max_size = 1; + output->intervals.function_bodies_max_size = 1; + output->intervals.static_conversion_function_bodies_max_size = 1; + output->intervals.static_function_bodies_max_size = 1; + if (CodeGenHelper::GetInstance().get_split_mode() == CodeGenHelper::SPLIT_TO_SLICES) { + output->intervals.methods = (size_t*)Malloc(output->intervals.methods_max_size * sizeof(size_t)); + output->intervals.function_bodies = (size_t*)Malloc(output->intervals.function_bodies_max_size * sizeof(size_t)); + output->intervals.static_conversion_function_bodies = (size_t*)Malloc(output->intervals.static_conversion_function_bodies_max_size * sizeof(size_t)); + output->intervals.static_function_bodies = (size_t*)Malloc(output->intervals.static_function_bodies_max_size * sizeof(size_t)); + + output->intervals.methods[0] = 0; + output->intervals.function_bodies[0] = 0; + output->intervals.static_conversion_function_bodies[0] = 0; + output->intervals.static_function_bodies[0] = 0; + } else { + output->intervals.methods = NULL; + output->intervals.function_bodies = NULL; + output->intervals.static_conversion_function_bodies = NULL; + output->intervals.static_function_bodies = NULL; + } } void Code::merge_output(output_struct *dest, output_struct *src) @@ -142,6 +169,10 @@ namespace Common { Free(output->functions.init_comp); Free(output->functions.start); Free(output->functions.control); + Free(output->intervals.methods); + Free(output->intervals.function_bodies); + Free(output->intervals.static_conversion_function_bodies); + Free(output->intervals.static_function_bodies); init_output(output); } diff --git a/compiler2/CodeGenHelper.cc b/compiler2/CodeGenHelper.cc index 772c5d54222d1d460d0d27195f28f5f1eb8829ab..5461368e977c6284f3cd032842a050e2569e9572 100644 --- a/compiler2/CodeGenHelper.cc +++ b/compiler2/CodeGenHelper.cc @@ -9,6 +9,7 @@ * Balasko, Jeno * Baranyi, Botond * Raduly, Csaba + * Szabo, Bence Janos * Zalanyi, Balazs Andor * ******************************************************************************/ @@ -20,7 +21,7 @@ #include <cstring> namespace Common { - + CodeGenHelper* CodeGenHelper::instance = 0; CodeGenHelper::generated_output_t::generated_output_t() : @@ -100,7 +101,8 @@ const char* const CodeGenHelper::typetypemap[] = { }; CodeGenHelper::CodeGenHelper() : - split_mode(SPLIT_NONE) + split_mode(SPLIT_NONE), + slice_num(1) { if (instance != 0) FATAL_ERROR("Attempted to create a second code generator."); @@ -115,14 +117,38 @@ CodeGenHelper& CodeGenHelper::GetInstance() { void CodeGenHelper::set_split_mode(split_type st) { split_mode = st; + + if (split_mode == SPLIT_TO_SLICES) { + split_to_slices = true; + } else { + split_to_slices = false; + } } bool CodeGenHelper::set_split_mode(const char* type) { - if (strcmp(type, "none") == 0) + int n; + if (strcmp(type, "none") == 0) { split_mode = SPLIT_NONE; - else if (strcmp(type, "type") == 0) + split_to_slices = false; + } else if (strcmp(type, "type") == 0) { split_mode = SPLIT_BY_KIND; - else + split_to_slices = false; + } else if ((n = atoi(type))) { + size_t length = strlen(type); + for (int i=0;i<length; i++) { + if (!isdigit(type[i])) { + ERROR("The number argument of -U must be a valid number."); + break; + } + } + split_mode = SPLIT_TO_SLICES; + if (n < 1 || n > 999999) { + ERROR("The number argument of -U must be between 1 and 999999."); + return false; + } + slice_num = n; + split_to_slices = slice_num > 1; // slice_num == 1 has no effect + } else return false; return true; } @@ -155,6 +181,128 @@ void CodeGenHelper::set_current_module(const string& name) { current_module = name; } +void CodeGenHelper::update_intervals(output_struct* const output) { + if(instance->split_mode != SPLIT_TO_SLICES) return; + + size_t tmp; + + // 1. check if some characters are added to the charstring + // 2. increment size variable + // 3. if size is bigger than the array's size, then double the array size + // 4. store new end position + + // class_defs are not counted as they will be in the header + tmp = mstrlen(output->source.function_bodies); + if (output->intervals.function_bodies[output->intervals.function_bodies_size] < tmp) { + output->intervals.function_bodies_size++; + if (output->intervals.function_bodies_size > output->intervals.function_bodies_max_size) { + output->intervals.function_bodies_max_size *= 2; + output->intervals.function_bodies = (size_t*)Realloc(output->intervals.function_bodies, output->intervals.function_bodies_max_size * sizeof(size_t)); + } + output->intervals.function_bodies[output->intervals.function_bodies_size] = tmp; + } + tmp = mstrlen(output->source.methods); + if (output->intervals.methods[output->intervals.methods_size] < tmp) { + output->intervals.methods_size++; + if (output->intervals.methods_size > output->intervals.methods_max_size) { + output->intervals.methods_max_size *= 2; + output->intervals.methods = (size_t*)Realloc(output->intervals.methods, output->intervals.methods_max_size * sizeof(size_t)); + } + output->intervals.methods[output->intervals.methods_size] = tmp; + } + tmp = mstrlen(output->source.static_conversion_function_bodies); + if (output->intervals.static_conversion_function_bodies[output->intervals.static_conversion_function_bodies_size] < tmp) { + output->intervals.static_conversion_function_bodies_size++; + if (output->intervals.static_conversion_function_bodies_size > output->intervals.static_conversion_function_bodies_max_size) { + output->intervals.static_conversion_function_bodies_max_size *= 2; + output->intervals.static_conversion_function_bodies = (size_t*)Realloc(output->intervals.static_conversion_function_bodies, output->intervals.static_conversion_function_bodies_max_size * sizeof(size_t)); + } + output->intervals.static_conversion_function_bodies[output->intervals.static_conversion_function_bodies_size] = tmp; + } + tmp = mstrlen(output->source.static_function_bodies); + if (output->intervals.static_function_bodies[output->intervals.static_function_bodies_size] < tmp) { + output->intervals.static_function_bodies_size++; + if (output->intervals.static_function_bodies_size > output->intervals.static_function_bodies_max_size) { + output->intervals.static_function_bodies_max_size *= 2; + output->intervals.static_function_bodies = (size_t*)Realloc(output->intervals.static_function_bodies, output->intervals.static_function_bodies_max_size * sizeof(size_t)); + } + output->intervals.static_function_bodies[output->intervals.static_function_bodies_size] = tmp; + } +} +//Advised to call update_intervals before this +size_t CodeGenHelper::size_of_sources(output_struct * const output) { + size_t size = 0; + // Calculate global var and string literals size + output->intervals.pre_things_size = mstrlen(output->source.global_vars) + mstrlen(output->source.string_literals); + + // Class_defs, static_conversion_function_prototypes, static_function_prototypes are in the header, + // and includes are not counted + size = output->intervals.pre_things_size + + output->intervals.function_bodies[output->intervals.function_bodies_size] + + output->intervals.methods[output->intervals.methods_size] + + output->intervals.static_conversion_function_bodies[output->intervals.static_conversion_function_bodies_size] + + output->intervals.static_function_bodies[output->intervals.static_function_bodies_size]; + return size; +} + +size_t CodeGenHelper::get_next_chunk_pos(const output_struct * const from, output_struct * const to, const size_t base_pos, const size_t chunk_size) { + size_t pos = 0; // Holds the position from the beginning + + pos += from->intervals.pre_things_size; + + if (pos > base_pos) { + to->source.global_vars = mputstr(to->source.global_vars, from->source.global_vars); + to->source.string_literals = mputstr(to->source.string_literals, from->source.string_literals); + } + + get_chunk_from_poslist(from->source.methods, to->source.methods, from->intervals.methods, from->intervals.methods_size, base_pos, chunk_size, pos); + get_chunk_from_poslist(from->source.function_bodies, to->source.function_bodies, from->intervals.function_bodies, from->intervals.function_bodies_size, base_pos, chunk_size, pos); + get_chunk_from_poslist(from->source.static_function_bodies, to->source.static_function_bodies, from->intervals.static_function_bodies, from->intervals.static_function_bodies_size, base_pos, chunk_size, pos); + get_chunk_from_poslist(from->source.static_conversion_function_bodies, to->source.static_conversion_function_bodies, from->intervals.static_conversion_function_bodies, from->intervals.static_conversion_function_bodies_size, base_pos, chunk_size, pos); + + return pos; +} +//if from null return. +void CodeGenHelper::get_chunk_from_poslist(const char* from, char *& to, const size_t interval_array[], const size_t interval_array_size, const size_t base_pos, const size_t chunk_size, size_t& pos) { + if (from == NULL) return; + // If we have enough to form a chunk + + // pos is unsigned so it can't be negative + if (pos > base_pos && pos - base_pos >= chunk_size) return; + + size_t tmp = pos; + + pos += interval_array[interval_array_size]; + + if (pos > base_pos) { // If we haven't finished with this interval_array + if (pos - base_pos >= chunk_size) { // It is a good chunk, but make it more precise because it may be too big + int ind = 0; + for (int i = 0; i <= interval_array_size; i++) { + if (tmp + interval_array[i] <= base_pos) { // Find the pos where we left off + ind = i; + } else if (tmp + interval_array[i] - base_pos >= chunk_size) { + // Found the first optimal position that is a good chunk + to = mputstrn(to, from + interval_array[ind], interval_array[i] - interval_array[ind]); + pos = tmp + interval_array[i]; + return; + } + } + } else { // We can't form a new chunk from the remaining characters + int ind = 0; + for (int i = 0; i <= interval_array_size; i++) { + if (tmp + interval_array[i] <= base_pos) { + ind = i; + } else { + break; + } + } + // Put the remaining characters + to = mputstrn(to, from + interval_array[ind], interval_array[interval_array_size] - interval_array[ind]); + pos = tmp + interval_array[interval_array_size]; + } + } +} + output_struct* CodeGenHelper::get_outputstruct(Ttcn::Definition* def) { string key = get_key(*def); const string& new_name = current_module + key; @@ -237,6 +385,8 @@ string CodeGenHelper::get_key(Ttcn::Definition& def) const { break; case SPLIT_BY_HEURISTICS: break; + case SPLIT_TO_SLICES: + break; } return retval; } @@ -268,6 +418,8 @@ string CodeGenHelper::get_key(Type& type) const { break; case SPLIT_BY_HEURISTICS: break; + case SPLIT_TO_SLICES: + break; } return retval; } @@ -286,12 +438,123 @@ void CodeGenHelper::write_output() { go->modulename = modules[j]->name; go->module_dispname = modules[j]->dispname; go->os.source.includes = mcopystr( - "\n//This file intentionally empty." + "\n//This file is intentionally empty." "\n#include <version.h>\n"); generated_code.add(fname, go); } } } + } else if (split_mode == SPLIT_TO_SLICES && slice_num > 0) { + // The strategy is the following: + // Goal: Get files with equal size + // Get the longest file's length and divide it by slice_num (chunk_size) + // We split every file to chunk_size sized chunks + size_t max = 0; + // Calculate maximum character length + for (j = 0; j < generated_code.size(); j++) { + update_intervals(&generated_code.get_nth_elem(j)->os); + size_t num_of_chars = size_of_sources(&generated_code.get_nth_elem(j)->os); + if (max < num_of_chars) { + max = num_of_chars; + } + } + // Calculate ideal chunk size + size_t chunk_size = max / slice_num; + string fname; + for (j = 0; j < modules.size(); j++) { + generated_output_t *output = generated_code[modules[j]->dispname]; + + // Just to be sure that everything is in the right place + update_intervals(&output->os); + + // Move static function prototypes to header (no longer static) + output->os.header.function_prototypes = mputstr(output->os.header.function_prototypes, output->os.source.static_function_prototypes); + Free(output->os.source.static_function_prototypes); + output->os.source.static_function_prototypes = NULL; + + output->os.header.function_prototypes = mputstr(output->os.header.function_prototypes, output->os.source.static_conversion_function_prototypes); + Free(output->os.source.static_conversion_function_prototypes); + output->os.source.static_conversion_function_prototypes = NULL; + + // Move internal class definitions to the header + output->os.header.class_defs = mputstr(output->os.header.class_defs, output->os.source.class_defs); + Free(output->os.source.class_defs); + output->os.source.class_defs = NULL; + + update_intervals(&output->os); + size_t num_of_chars = size_of_sources(&output->os); + char buffer[13]= ""; // Max is 999999 should be enough (checked in main.cc) | 6 digit + 2 underscore + part + // If we need to split + if (num_of_chars >= chunk_size) { + size_t base_pos = 0; + for (unsigned int i = 0; i < slice_num; i++) { + if (i == 0) { // The first slice has the module's name + fname = output->module_dispname; + } else { + sprintf(buffer, "_part_%d", (int)i); + fname = output->module_dispname + "_" + buffer; + } + if (i == 0 || !generated_code.has_key(fname)) { + generated_output_t* go = new generated_output_t; + go->filename = buffer; + go->modulename = output->modulename; + go->module_dispname = output->module_dispname; + size_t act_pos = get_next_chunk_pos(&output->os, &go->os, base_pos, chunk_size); + // True if the file is not empty + if (act_pos > base_pos) { + go->os.source.includes = mputstr(go->os.source.includes, output->os.source.includes); + } else { + go->os.source.includes = mcopystr( + "\n//This file is intentionally empty." + "\n#include <version.h>\n"); + } + // First slice: copy header and other properties and replace the original output struct + if (i == 0) { + go->has_circular_import = output->has_circular_import; + go->is_module = output->is_module; + go->is_ttcn = output->is_ttcn; + go->os.header.class_decls = mputstr(go->os.header.class_decls, output->os.header.class_decls); + go->os.header.class_defs = mputstr(go->os.header.class_defs, output->os.header.class_defs); + go->os.header.function_prototypes = mputstr(go->os.header.function_prototypes, output->os.header.function_prototypes); + go->os.header.global_vars = mputstr(go->os.header.global_vars, output->os.header.global_vars); + go->os.header.includes = mputstr(go->os.header.includes, output->os.header.includes); + go->os.header.testport_includes = mputstr(go->os.header.testport_includes, output->os.header.testport_includes); + go->os.header.typedefs = mputstr(go->os.header.typedefs, output->os.header.typedefs); + generated_code[modules[j]->dispname] = go; + } else { + generated_code.add(fname, go); + } + base_pos = act_pos; + } else { + // TODO: error handling: there is a module which has the same name as the + // numbered splitted file. splitting by type does not have this error + // handling so don't we + } + } + // Extra safety. If something is missing after the splitting, put the remaining + // things to the last file. (Should never happen) + if (base_pos < num_of_chars) { + get_next_chunk_pos(&output->os, &generated_code[fname]->os, base_pos, num_of_chars); + } + delete output; + } else { + // Create empty files. + for (i = 1; i < slice_num; i++) { + sprintf(buffer, "_part_%d", (int)i); + fname = output->module_dispname + "_" + buffer; + if (!generated_code.has_key(fname)) { + generated_output_t* go = new generated_output_t; + go->filename = buffer; + go->modulename = modules[j]->name; + go->module_dispname = modules[j]->dispname; + go->os.source.includes = mcopystr( + "\n//This file is intentionally empty." + "\n#include <version.h>\n"); + generated_code.add(fname, go); + } + } + } + } } generated_output_t* go; for (i = 0; i < generated_code.size(); i++) { diff --git a/compiler2/CodeGenHelper.hh b/compiler2/CodeGenHelper.hh index e11ff0b3fc92544503627b5e811586b679b3c124..97ba724e724b8e4ef089672f90cf8980770bb0db 100644 --- a/compiler2/CodeGenHelper.hh +++ b/compiler2/CodeGenHelper.hh @@ -8,6 +8,7 @@ * Contributors: * Balasko, Jeno * Raduly, Csaba + * Szabo, Bence Janos * Zalanyi, Balazs Andor * ******************************************************************************/ @@ -26,14 +27,15 @@ class Definition; } namespace Common { - + class CodeGenHelper { public: enum split_type { SPLIT_NONE, ///< original code generation SPLIT_BY_KIND, ///< place different kind of types in their own file SPLIT_BY_NAME, ///< place all definitions/assignments in their own file - SPLIT_BY_HEURISTICS ///< heuristic function will decide the structure + SPLIT_BY_HEURISTICS,///< heuristic function will decide the structure + SPLIT_TO_SLICES ///< split large files into smaller ones }; private: @@ -57,6 +59,7 @@ private: output_map_t generated_code; split_type split_mode; + unsigned int slice_num; struct module_names_t { string name; @@ -86,6 +89,14 @@ public: void finalize_generation(Type* type); void set_current_module(const string& name); + + static void update_intervals(output_struct* const output); + + size_t size_of_sources(output_struct * const output); + + size_t get_next_chunk_pos(const output_struct * const from, output_struct * const to, const size_t base_pos, const size_t chunk_size); + + void get_chunk_from_poslist(const char* from, char *& to, const size_t interval_array[], const size_t interval_array_size, const size_t base_pos, const size_t chunk_size, size_t& pos); void write_output(); diff --git a/compiler2/TypeCompat.cc b/compiler2/TypeCompat.cc index 6f4695b1f24263a8686afa4c097ce4f38d39cb4a..886c211ee78e0ccf4470ffd92fb57f46c1fd87b9 100644 --- a/compiler2/TypeCompat.cc +++ b/compiler2/TypeCompat.cc @@ -8,6 +8,7 @@ * Contributors: * Balasko, Jeno * Raduly, Csaba + * Szabo, Bence Janos * ******************************************************************************/ #include "TypeCompat.hh" @@ -323,12 +324,12 @@ void TypeConv::gen_conv_func(char **p_prototypes, char **p_bodies, string to_name = m_is_temp ? m_to->get_genname_template(p_mod) : m_to->get_genname_value(p_mod); *p_prototypes = mputprintf(*p_prototypes, - "static boolean %s(%s& p_to_v, const %s& p_from_v);\n", - get_conv_func(m_from, m_to, p_mod).c_str(), to_name.c_str(), + "%sboolean %s(%s& p_to_v, const %s& p_from_v);\n", + split_to_slices ? "" : "static ", get_conv_func(m_from, m_to, p_mod).c_str(), to_name.c_str(), from_name.c_str()); *p_bodies = mputprintf(*p_bodies, - "static boolean %s(%s& p_to_v, const %s& p_from_v)\n{\n", - get_conv_func(m_from, m_to, p_mod).c_str(), to_name.c_str(), + "%sboolean %s(%s& p_to_v, const %s& p_from_v)\n{\n", + split_to_slices ? "" : "static ", get_conv_func(m_from, m_to, p_mod).c_str(), to_name.c_str(), from_name.c_str()); switch (m_to->get_typetype()) { case Type::T_SEQ_A: diff --git a/compiler2/Type_codegen.cc b/compiler2/Type_codegen.cc index 530c2e83763ab6accb15e25de12f11b6e77f3c62..3acf33af65c61e1a05009970de6d20a76274ed6f 100644 --- a/compiler2/Type_codegen.cc +++ b/compiler2/Type_codegen.cc @@ -12,6 +12,7 @@ * Delic, Adam * Raduly, Csaba * Szabados, Kristof + * Szabo, Bence Janos * Pandi, Krisztian * ******************************************************************************/ @@ -53,6 +54,7 @@ void Type::generate_code(output_struct *target) { if (code_generated) return; generate_code_embedded_before(target); + CodeGenHelper::update_intervals(target); // TODO: class and template separate everywhere? // escape from recursion loops if (code_generated) return; code_generated = true; @@ -101,11 +103,14 @@ void Type::generate_code(output_struct *target) break; } // switch } + CodeGenHelper::update_intervals(target); generate_code_embedded_after(target); + CodeGenHelper::update_intervals(target); if (!is_asn1()) { if (has_done_attribute()) generate_code_done(target); if (sub_type) sub_type->generate_code(*target); } + CodeGenHelper::update_intervals(target); } void Type::generate_code_include(const string& sourcefile, output_struct *target) @@ -434,8 +439,8 @@ void Type::generate_code_typedescriptor(output_struct *target) void Type::generate_code_berdescriptor(output_struct *target) { const char *gennameown_str = get_genname_own().c_str(); - char *str = mprintf("static const ASN_Tag_t %s_tag_[] = { ", - gennameown_str); + char *str = mprintf("%sconst ASN_Tag_t %s_tag_[] = { ", + split_to_slices ? "" : "static ", gennameown_str); Tags *joinedtags = build_tags_joined(); size_t tagarraysize = joinedtags->get_nof_tags(); for (size_t i = 0; i < tagarraysize; i++) { @@ -720,7 +725,11 @@ void Type::generate_code_textdescriptor(output_struct *target) case T_BOOL: if (textattrib->true_params || textattrib->false_params) { target->source.global_vars = mputprintf(target->source.global_vars, - "static const TTCN_TEXTdescriptor_bool %s_bool_ = {", gennameown_str); + "%sconst TTCN_TEXTdescriptor_bool %s_bool_ = {", split_to_slices ? "" : "static ", gennameown_str); + if (split_to_slices) { + target->header.global_vars = mputprintf(target->header.global_vars, + "extern const TTCN_TEXTdescriptor_bool %s_bool_;\n", gennameown_str); + } if (textattrib->true_params && textattrib->true_params->encode_token) { target->source.global_vars = mputprintf(target->source.global_vars, @@ -779,8 +788,12 @@ void Type::generate_code_textdescriptor(output_struct *target) break; case T_ENUM_T: target->source.global_vars = mputprintf(target->source.global_vars, - "static const TTCN_TEXTdescriptor_enum %s_enum_[] = { ", - gennameown_str); + "%sconst TTCN_TEXTdescriptor_enum %s_enum_[] = { ", + split_to_slices ? "" : "static ", gennameown_str); + if (split_to_slices) { + target->header.global_vars = mputprintf(target->header.global_vars, + "extern const TTCN_TEXTdescriptor_enum %s_enum_[];\n", gennameown_str); + } for (size_t i = 0; i < t->u.enums.eis->get_nof_eis(); i++) { if (i > 0) target->source.global_vars = mputstr(target->source.global_vars, ", "); @@ -845,8 +858,12 @@ void Type::generate_code_textdescriptor(output_struct *target) textattrib->decoding_params.convert!=0 || textattrib->decoding_params.just!=1 ){ target->source.global_vars=mputprintf(target->source.global_vars, - "static const TTCN_TEXTdescriptor_param_values %s_par_ = {", - gennameown_str); + "%sconst TTCN_TEXTdescriptor_param_values %s_par_ = {", + split_to_slices ? "" : "static ", gennameown_str); + if (split_to_slices) { + target->header.global_vars=mputprintf(target->header.global_vars, + "extern const TTCN_TEXTdescriptor_param_values %s_par_;\n", gennameown_str); + } target->source.global_vars=mputprintf(target->source.global_vars, "{%s,%s,%i,%i,%i,%i},{%s,%s,%i,%i,%i,%i}};\n" ,textattrib->coding_params.leading_zero?"true":"false" @@ -868,8 +885,12 @@ void Type::generate_code_textdescriptor(output_struct *target) case T_SEQOF: case T_SETOF: target->source.global_vars=mputprintf(target->source.global_vars, - "static const TTCN_TEXTdescriptor_param_values %s_par_ = {", - gennameown_str); + "%sconst TTCN_TEXTdescriptor_param_values %s_par_ = {", + split_to_slices ? "" : "static ", gennameown_str); + if (split_to_slices) { + target->header.global_vars=mputprintf(target->header.global_vars, + "extern const TTCN_TEXTdescriptor_param_values %s_par_;\n", gennameown_str); + } target->source.global_vars=mputprintf(target->source.global_vars, "{%s,%s,%i,%i,%i,%i},{%s,%s,%i,%i,%i,%i}};\n" ,textattrib->coding_params.leading_zero?"true":"false" @@ -2040,7 +2061,7 @@ void Type::generate_code_Array(output_struct *target) "};\n\n", own_name, u.array.dimension->get_value_type(u.array.element_type, my_scope).c_str()); - target->source.class_defs = mputprintf(target->source.class_defs, + target->source.methods = mputprintf(target->source.methods, "const TTCN_Typedescriptor_t* %s::get_elem_descr() const { return &%s_descr_; }\n\n", own_name, u.array.element_type->get_genname_typedescriptor(my_scope).c_str()); } else { @@ -2696,8 +2717,11 @@ void Type::generate_code_object(const_def *cdef, Scope *p_scope, if (prefix) { cdef->decl = mputprintf(cdef->decl, "extern const %s& %s;\n", type_name_str, name_str); - cdef->def = mputprintf(cdef->def, "static %s %s%s;\n" - "const %s& %s = %s%s;\n", type_name_str, prefix, name_str, + if (split_to_slices) { + cdef->decl = mputprintf(cdef->decl, "extern %s %s%s;\n", type_name_str, prefix, name_str); + } + cdef->def = mputprintf(cdef->def, "%s%s %s%s;\n" + "const %s& %s = %s%s;\n", split_to_slices ? "" : "static ", type_name_str, prefix, name_str, type_name_str, name_str, prefix, name_str); } else { cdef->decl = mputprintf(cdef->decl, "extern %s %s;\n", @@ -2720,8 +2744,8 @@ void Type::generate_code_object(const_def *cdef, GovernedSimple *p_setting) FATAL_ERROR("Type::generate_code_object()"); } if (p_setting->get_err_descr()) { - cdef->def = p_setting->get_err_descr()->generate_code_str(cdef->def, - p_setting->get_genname_prefix() + p_setting->get_genname_own()); + cdef->def = p_setting->get_err_descr()->generate_code_str(cdef->def, cdef->decl, + p_setting->get_genname_prefix() + p_setting->get_genname_own(), false); } generate_code_object(cdef, p_setting->get_my_scope(), p_setting->get_genname_own(), p_setting->get_genname_prefix(), diff --git a/compiler2/asn1/AST_asn1.cc b/compiler2/asn1/AST_asn1.cc index f2086da7133d06cab229bc681fcbb2f36156482b..ee5920fbc2af2d650219e48c3325de4640a0007b 100644 --- a/compiler2/asn1/AST_asn1.cc +++ b/compiler2/asn1/AST_asn1.cc @@ -13,6 +13,7 @@ * Kovacs, Ferenc * Raduly, Csaba * Szabados, Kristof + * Szabo, Bence Janos * Szalai, Gabor * Zalanyi, Balazs Andor * Pandi, Krisztian @@ -921,7 +922,10 @@ namespace Asn { void Assignments::generate_code(CodeGenHelper& cgh) { for (size_t i = 0; i < asss_v.size(); i++) { Assignment *ass = asss_v[i]; - if (!top_level_pdu || ass->get_checked()) ass->generate_code(cgh); + if (!top_level_pdu || ass->get_checked()) { + ass->generate_code(cgh); + CodeGenHelper::update_intervals(cgh.get_current_outputstruct()); + } } } @@ -1400,6 +1404,7 @@ namespace Asn { if (ass_pard || dontgen) return; classify_ass(); ass->generate_code(cgh); + CodeGenHelper::update_intervals(cgh.get_current_outputstruct()); } void Ass_Undef::dump(unsigned level) const diff --git a/compiler2/compiler.1 b/compiler2/compiler.1 index 8c0e3467b9d1e86810be556aea974ddad06171a6..dc103acd679063a1390433dd91ba1efee4a3e27e 100644 --- a/compiler2/compiler.1 +++ b/compiler2/compiler.1 @@ -17,7 +17,7 @@ compiler \- TTCN-3 and ASN.1 to C++ translator .RB "[\| " \-Q .IR "n" " \|] " .RB "[\| " \-U -.IR "none|type" " \|] " +.IR "none|type|'number'" " \|] " .RB "[\| " \-T " \|]" module.ttcn ... .RB "[\| " \-A " \|]" @@ -262,8 +262,10 @@ Forces the compiler to do characters in all output file names. This option turns on the compatibility mode with versions 1.1 or earlier. .TP -.BI \-U " none|type" +.BI \-U " none|type|'number'" Selects code splitting mode for the generated C++ code. +The 'number' should be a positive number between 1 and 999999. +If the 'number' is present the files will be sliced into 'number' files. .TP .B \-v Prints diff --git a/compiler2/main.cc b/compiler2/main.cc index f01d98e2e466dc4dbce5c8bd91ab3db43c30645a..f6ad7efcf43234f518cf734977b03b25131f99d0 100644 --- a/compiler2/main.cc +++ b/compiler2/main.cc @@ -95,7 +95,7 @@ boolean generate_skeleton = FALSE, force_overwrite = FALSE, implicit_json_encoding = FALSE, json_refs_for_all_types = TRUE, force_gen_seof = FALSE, omit_in_value_list = FALSE, warnings_for_bad_variants = FALSE, debugger_active = FALSE, - legacy_unbound_union_fields = FALSE; + legacy_unbound_union_fields = FALSE, split_to_slices = FALSE; // Default code splitting mode is set to 'no splitting'. CodeGenHelper::split_type code_splitting_mode = CodeGenHelper::SPLIT_NONE; @@ -385,7 +385,7 @@ static void usage() { fprintf(stderr, "\n" "usage: %s [-abcdEfgijlLMnOpqrRsStuwxXyY] [-K file] [-z file] [-V verb_level]\n" - " [-o dir] [-U none|type] [-P modulename.top_level_pdu_name] [-Q number] ...\n" + " [-o dir] [-U none|type|'number'] [-P modulename.top_level_pdu_name] [-Q number] ...\n" " [-T] module.ttcn [-A] module.asn ...\n" " or %s -v\n" " or %s --ttcn2json [-jf] ... [-T] module.ttcn [-A] module.asn ... [- schema.json]\n" @@ -417,7 +417,7 @@ static void usage() " -S: suppress context information\n" " -t: generate Test Port skeleton\n" " -u: duplicate underscores in file names\n" - " -U none|type: select code splitting mode for the generated C++ code\n" + " -U none|type|'number': select code splitting mode for the generated C++ code\n" " -V verb_level: set verbosity level bitmask (decimal)\n" " -w: suppress warnings\n" " -x: disable TEXT encoder/decoder functions\n" @@ -483,7 +483,7 @@ int main(int argc, char *argv[]) s0flag = false, Cflag = false, yflag = false, Uflag = false, Qflag = false, Sflag = false, Kflag = false, jflag = false, zflag = false, Fflag = false, Mflag = false, Eflag = false, nflag = false, Bflag = false, errflag = false, - print_usage = false, ttcn2json = false; + print_usage = false, ttcn2json = false; CodeGenHelper cgh; @@ -702,10 +702,10 @@ int main(int argc, char *argv[]) SET_FLAG(U); if (!cgh.set_split_mode(optarg)) { ERROR("Wrong code splitting option: '%s'. Valid values are: 'none', " - "'type'.", optarg); + "'type', or a positive number.", optarg); errflag = true; } - break; + break; case 'v': SET_FLAG(v); break; diff --git a/compiler2/main.hh b/compiler2/main.hh index f9d554259a730d3c625b90af6ad2e587f56dd837..4bdb932e3a09365d6b286069ce35674559774bf7 100644 --- a/compiler2/main.hh +++ b/compiler2/main.hh @@ -15,6 +15,7 @@ * Kremer, Peter * Raduly, Csaba * Szabados, Kristof + * Szabo, Bence Janos * Szabo, Janos Zoltan – initial implementation * ******************************************************************************/ @@ -50,7 +51,7 @@ extern boolean generate_skeleton, force_overwrite, include_line_info, check_subtype, suppress_context, enable_set_bound_out_param, display_up_to_date, implicit_json_encoding, json_refs_for_all_types, force_gen_seof, omit_in_value_list, warnings_for_bad_variants, debugger_active, - legacy_unbound_union_fields; + legacy_unbound_union_fields, split_to_slices; extern const char *expected_platform; diff --git a/compiler2/makefile.c b/compiler2/makefile.c index 7bc8854ecda50997120e746cef17bbbd6168a7eb..629c5ec70c87b90c33b10b34d0bc5427db066408 100644 --- a/compiler2/makefile.c +++ b/compiler2/makefile.c @@ -1675,14 +1675,21 @@ static void print_shared_object_name(FILE *fp, const struct user_struct *user) } /** Prints the splitted files' names for a given module. */ static void print_splitted_file_names(FILE *fp, - const struct makefile_struct *makefile, const struct module_struct *module) + const struct makefile_struct *makefile, const struct module_struct *module, const boolean dir) { + int n_slices; if (strcmp(makefile->code_splitting_mode, "-U type") == 0) { - print_generated_file_name(fp, module, FALSE, "_seq.cc"); - print_generated_file_name(fp, module, FALSE, "_set.cc"); - print_generated_file_name(fp, module, FALSE, "_seqof.cc"); - print_generated_file_name(fp, module, FALSE, "_setof.cc"); - print_generated_file_name(fp, module, FALSE, "_union.cc"); + print_generated_file_name(fp, module, dir, "_seq.cc"); + print_generated_file_name(fp, module, dir, "_set.cc"); + print_generated_file_name(fp, module, dir, "_seqof.cc"); + print_generated_file_name(fp, module, dir, "_setof.cc"); + print_generated_file_name(fp, module, dir, "_union.cc"); + } else if(makefile->code_splitting_mode != NULL && (n_slices = atoi(makefile->code_splitting_mode + 2))) { + for (int i = 1; i < n_slices; i++) { + char buffer[16]; // 6 digits + 4 chars + _part + sprintf(buffer, "_part_%i.cc", i); + print_generated_file_name(fp, module, dir, buffer); + } } } @@ -2267,7 +2274,7 @@ static void print_makefile(struct makefile_struct *makefile) for (i = 0; i < makefile->nTTCN3Modules; i++) { const struct module_struct *module = makefile->TTCN3Modules + i; if (module->dir_name == NULL || !makefile->central_storage) - print_splitted_file_names(fp, makefile, module); + print_splitted_file_names(fp, makefile, module, FALSE); } } if (makefile->preprocess) { @@ -2276,7 +2283,7 @@ static void print_makefile(struct makefile_struct *makefile) for (i = 0; i < makefile->nTTCN3PPModules; i++) { const struct module_struct *module = makefile->TTCN3PPModules + i; if (module->dir_name == NULL || !makefile->central_storage) - print_splitted_file_names(fp, makefile, module); + print_splitted_file_names(fp, makefile, module, FALSE); } } } @@ -2286,7 +2293,7 @@ static void print_makefile(struct makefile_struct *makefile) if (module->dir_name == NULL || !makefile->central_storage) { print_generated_file_name(fp, module, FALSE, ".cc"); if (makefile->code_splitting_mode) - print_splitted_file_names(fp, makefile, module); + print_splitted_file_names(fp, makefile, module, FALSE); } } if (makefile->preprocess) { @@ -2295,7 +2302,7 @@ static void print_makefile(struct makefile_struct *makefile) if (module->dir_name == NULL || !makefile->central_storage) { print_generated_file_name(fp, module, FALSE, ".cc"); if (makefile->code_splitting_mode) - print_splitted_file_names(fp, makefile, module); + print_splitted_file_names(fp, makefile, module, FALSE); } } } @@ -2306,7 +2313,7 @@ static void print_makefile(struct makefile_struct *makefile) for (i = 0; i < makefile->nASN1Modules; i++) { const struct module_struct *module = makefile->ASN1Modules + i; if (module->dir_name == NULL || !makefile->central_storage) { - print_splitted_file_names(fp, makefile, module); + print_splitted_file_names(fp, makefile, module, FALSE); } } } @@ -2316,7 +2323,7 @@ static void print_makefile(struct makefile_struct *makefile) if (module->dir_name == NULL || !makefile->central_storage) { print_generated_file_name(fp, module, FALSE, ".cc"); if (makefile->code_splitting_mode) - print_splitted_file_names(fp, makefile, module); + print_splitted_file_names(fp, makefile, module, FALSE); } } } @@ -2356,7 +2363,7 @@ static void print_makefile(struct makefile_struct *makefile) for (i = 0; i < makefile->nTTCN3Modules; i++) { const struct module_struct *module = makefile->TTCN3Modules + i; if (module->dir_name != NULL) { - print_splitted_file_names(fp, makefile, module); + print_splitted_file_names(fp, makefile, module, TRUE); } } } @@ -2366,7 +2373,7 @@ static void print_makefile(struct makefile_struct *makefile) for (i = 0; i < makefile->nTTCN3PPModules; i++) { const struct module_struct *module = makefile->TTCN3PPModules + i; if (module->dir_name != NULL) { - print_splitted_file_names(fp, makefile, module); + print_splitted_file_names(fp, makefile, module, TRUE); } } } @@ -2377,7 +2384,7 @@ static void print_makefile(struct makefile_struct *makefile) if (module->dir_name != NULL) { print_generated_file_name(fp, module, TRUE, ".cc"); if (makefile->code_splitting_mode) - print_splitted_file_names(fp, makefile, module); + print_splitted_file_names(fp, makefile, module, TRUE); } } if (makefile->preprocess) { @@ -2386,7 +2393,7 @@ static void print_makefile(struct makefile_struct *makefile) if (module->dir_name != NULL) { print_generated_file_name(fp, module, TRUE, ".cc"); if (makefile->code_splitting_mode) - print_splitted_file_names(fp, makefile, module); + print_splitted_file_names(fp, makefile, module, TRUE); } } } @@ -2397,7 +2404,7 @@ static void print_makefile(struct makefile_struct *makefile) for (i = 0; i < makefile->nASN1Modules; i++) { const struct module_struct *module = makefile->ASN1Modules + i; if (module->dir_name != NULL) { - print_splitted_file_names(fp, makefile, module); + print_splitted_file_names(fp, makefile, module, TRUE); } } } @@ -2407,7 +2414,7 @@ static void print_makefile(struct makefile_struct *makefile) if (module->dir_name != NULL) { print_generated_file_name(fp, module, TRUE, ".cc"); if (makefile->code_splitting_mode) - print_splitted_file_names(fp, makefile, module); + print_splitted_file_names(fp, makefile, module, TRUE); } } } @@ -2573,14 +2580,22 @@ static void print_makefile(struct makefile_struct *makefile) const struct module_struct *module = makefile->TTCN3Modules + i; if (module->dir_name == NULL || !makefile->central_storage) { print_generated_file_name(fp, module, FALSE, ".so"); - if (makefile->code_splitting_mode != NULL) + if (makefile->code_splitting_mode != NULL) { + int n_slices; if (strcmp(makefile->code_splitting_mode, "-U type") == 0) { print_generated_file_name(fp, module, FALSE, "_seq.so"); print_generated_file_name(fp, module, FALSE, "_set.so"); print_generated_file_name(fp, module, FALSE, "_seqof.so"); print_generated_file_name(fp, module, FALSE, "_setof.so"); print_generated_file_name(fp, module, FALSE, "_union.so"); + } else if((n_slices = atoi(makefile->code_splitting_mode + 2))) { + for (int i = 1; i < n_slices; i++) { + char buffer[16]; // 6 digits + 4 chars + _part + sprintf(buffer, "_part_%i.so", i); + print_generated_file_name(fp, module, FALSE, buffer); + } } + } } } if (makefile->preprocess) { @@ -2588,14 +2603,22 @@ static void print_makefile(struct makefile_struct *makefile) const struct module_struct *module = makefile->TTCN3PPModules + i; if (module->dir_name == NULL || !makefile->central_storage) { print_generated_file_name(fp, module, FALSE, ".so"); - if (makefile->code_splitting_mode != NULL) + if (makefile->code_splitting_mode != NULL) { + int n_slices; if (strcmp(makefile->code_splitting_mode, "-U type") == 0) { print_generated_file_name(fp, module, FALSE, "_seq.so"); print_generated_file_name(fp, module, FALSE, "_set.so"); print_generated_file_name(fp, module, FALSE, "_seqof.so"); print_generated_file_name(fp, module, FALSE, "_setof.so"); print_generated_file_name(fp, module, FALSE, "_union.so"); + } else if((n_slices = atoi(makefile->code_splitting_mode + 2))) { + for (int i = 1; i < n_slices; i++) { + char buffer[16]; // 6 digits + 4 chars + _part + sprintf(buffer, "_part_%i.so", i); + print_generated_file_name(fp, module, FALSE, buffer); + } } + } } } } @@ -2603,14 +2626,22 @@ static void print_makefile(struct makefile_struct *makefile) const struct module_struct *module = makefile->ASN1Modules + i; if (module->dir_name == NULL || !makefile->central_storage) { print_generated_file_name(fp, module, FALSE, ".so"); - if (makefile->code_splitting_mode != NULL) + if (makefile->code_splitting_mode != NULL) { + int n_slices; if (strcmp(makefile->code_splitting_mode, "-U type") == 0) { print_generated_file_name(fp, module, FALSE, "_seq.so"); print_generated_file_name(fp, module, FALSE, "_set.so"); print_generated_file_name(fp, module, FALSE, "_seqof.so"); print_generated_file_name(fp, module, FALSE, "_setof.so"); print_generated_file_name(fp, module, FALSE, "_union.so"); + } else if((n_slices = atoi(makefile->code_splitting_mode + 2))) { + for (int i = 1; i < n_slices; i++) { + char buffer[16]; // 6 digits + 4 chars + _part + sprintf(buffer, "_part_%i.so", i); + print_generated_file_name(fp, module, FALSE, buffer); + } } + } } } } @@ -2637,14 +2668,22 @@ static void print_makefile(struct makefile_struct *makefile) const struct module_struct *module = makefile->TTCN3Modules + i; if (module->dir_name == NULL || !makefile->central_storage) { print_generated_file_name(fp, module, FALSE, ".o"); - if (makefile->code_splitting_mode != NULL) + if (makefile->code_splitting_mode != NULL) { + int n_slices; if (strcmp(makefile->code_splitting_mode, "-U type") == 0) { print_generated_file_name(fp, module, FALSE, "_seq.o"); print_generated_file_name(fp, module, FALSE, "_set.o"); print_generated_file_name(fp, module, FALSE, "_seqof.o"); print_generated_file_name(fp, module, FALSE, "_setof.o"); print_generated_file_name(fp, module, FALSE, "_union.o"); + } else if((n_slices = atoi(makefile->code_splitting_mode + 2))) { + for (int i = 1; i < n_slices; i++) { + char buffer[16]; // 6 digits + 4 chars + _part + sprintf(buffer, "_part_%i.o", i); + print_generated_file_name(fp, module, FALSE, buffer); + } } + } } } if (makefile->preprocess) { @@ -2652,14 +2691,22 @@ static void print_makefile(struct makefile_struct *makefile) const struct module_struct *module = makefile->TTCN3PPModules + i; if (module->dir_name == NULL || !makefile->central_storage) { print_generated_file_name(fp, module, FALSE, ".o"); - if (makefile->code_splitting_mode != NULL) + if (makefile->code_splitting_mode != NULL) { + int n_slices; if (strcmp(makefile->code_splitting_mode, "-U type") == 0) { print_generated_file_name(fp, module, FALSE, "_seq.o"); print_generated_file_name(fp, module, FALSE, "_set.o"); print_generated_file_name(fp, module, FALSE, "_seqof.o"); print_generated_file_name(fp, module, FALSE, "_setof.o"); print_generated_file_name(fp, module, FALSE, "_union.o"); + } else if((n_slices = atoi(makefile->code_splitting_mode + 2))) { + for (int i = 1; i < n_slices; i++) { + char buffer[16]; // 6 digits + 4 chars + _part + sprintf(buffer, "_part_%i.o", i); + print_generated_file_name(fp, module, FALSE, buffer); + } } + } } } } @@ -2667,14 +2714,22 @@ static void print_makefile(struct makefile_struct *makefile) const struct module_struct *module = makefile->ASN1Modules + i; if (module->dir_name == NULL || !makefile->central_storage) { print_generated_file_name(fp, module, FALSE, ".o"); - if (makefile->code_splitting_mode != NULL) + if (makefile->code_splitting_mode != NULL) { + int n_slices; if (strcmp(makefile->code_splitting_mode, "-U type") == 0) { print_generated_file_name(fp, module, FALSE, "_seq.o"); print_generated_file_name(fp, module, FALSE, "_set.o"); print_generated_file_name(fp, module, FALSE, "_seqof.o"); print_generated_file_name(fp, module, FALSE, "_setof.o"); print_generated_file_name(fp, module, FALSE, "_union.o"); + } else if((n_slices = atoi(makefile->code_splitting_mode + 2))) { + for (int i = 1; i < n_slices; i++) { + char buffer[16]; // 6 digits + 4 chars + _part + sprintf(buffer, "_part_%i.o", i); + print_generated_file_name(fp, module, FALSE, buffer); + } } + } } } } @@ -2769,14 +2824,36 @@ static void print_makefile(struct makefile_struct *makefile) else { for (i = 0; i < makefile->nTTCN3Modules; i++) { const struct module_struct *module = makefile->TTCN3Modules + i; - if (module->dir_name != NULL) + if (module->dir_name != NULL) { print_generated_file_name(fp, module, TRUE, ".o"); + if (makefile->code_splitting_mode != NULL) { + int n_slices; + if((n_slices = atoi(makefile->code_splitting_mode + 2))) { + for (int i = 1; i < n_slices; i++) { + char buffer[16]; // 6 digits + 4 chars + _part + sprintf(buffer, "_part_%i.o", i); + print_generated_file_name(fp, module, TRUE, buffer); + } + } + } + } } if (makefile->preprocess) { for (i = 0; i < makefile->nTTCN3PPModules; i++) { const struct module_struct *module = makefile->TTCN3PPModules + i; - if (module->dir_name != NULL) + if (module->dir_name != NULL) { print_generated_file_name(fp, module, TRUE, ".o"); + if (makefile->code_splitting_mode != NULL) { + int n_slices; + if((n_slices = atoi(makefile->code_splitting_mode + 2))) { + for (int i = 1; i < n_slices; i++) { + char buffer[16]; // 6 digits + 4 chars + _part + sprintf(buffer, "_part_%i.o", i); + print_generated_file_name(fp, module, TRUE, buffer); + } + } + } + } } } for (i = 0; i < makefile->nASN1Modules; i++) { @@ -4024,7 +4101,7 @@ static void usage(void) { fprintf(stderr, "\n" "usage: %s [-abc" C_flag "dDEfFglLmMnprRsStTVwWXZ] [-K file] [-z file ] [-P dir]" - " [-U none|type] [-e ets_name] [-o dir|file]\n" + " [-U none|type|'number'] [-e ets_name] [-o dir|file]\n" " [-t project_descriptor.tpd [-b buildconfig]]\n" " [-O file] ... module_name ... testport_name ...\n" " or %s -v\n" @@ -4053,7 +4130,7 @@ static void usage(void) " -R: use function test runtime (TITAN_RUNTIME_2)\n" " -s: generate Makefile for single mode\n" " -S: suppress makefilegen warnings\n" - " -U none|type: split generated code\n" + " -U none|type|'number': split generated code\n" " -v: show version\n" " -w: suppress warnings generated by TITAN\n" " -Y: Enforces legacy behaviour of the \"out\" function parameters (see refguide)\n" @@ -4289,11 +4366,26 @@ int main(int argc, char *argv[]) break; case 'U': SET_FLAG(U); + int n_slices = atoi(optarg); code_splitting_mode = optarg; - if (strcmp(optarg, "none") != 0 && - strcmp(optarg, "type") != 0) + if (!n_slices && + (strcmp(optarg, "none") != 0 && + strcmp(optarg, "type") != 0)) + { ERROR("Unrecognizable argument: '%s'. Valid options for -U switch are: " - "'none', 'type'", optarg); + "'none', 'type', or a number.", optarg); + } else { + size_t length = strlen(optarg); + for (int i=0;i<length; i++) { + if (!isdigit(optarg[i])) { + ERROR("The number argument of -U must be a valid number."); + break; + } + } + if (n_slices < 1 || n_slices > 999999) { + ERROR("The number argument of -U must be between 1 and 999999."); + } + } break; case 'v': SET_FLAG(v); diff --git a/compiler2/ttcn3/AST_ttcn3.cc b/compiler2/ttcn3/AST_ttcn3.cc index 45562f57bbd2acd8a791d7dde5d832d53d437d34..6a4a9a0fca982cdad9b2eba86974753f08c95175 100644 --- a/compiler2/ttcn3/AST_ttcn3.cc +++ b/compiler2/ttcn3/AST_ttcn3.cc @@ -14,6 +14,7 @@ * Kovacs, Ferenc * Raduly, Csaba * Szabados, Kristof + * Szabo, Bence Janos * Szalai, Gabor * Zalanyi, Balazs Andor * Pandi, Krisztian @@ -1866,7 +1867,10 @@ namespace Ttcn { void Definitions::generate_code(CodeGenHelper& cgh) { // FIXME: implement - for(size_t i = 0; i < ass_v.size(); i++) ass_v[i]->generate_code(cgh); + for(size_t i = 0; i < ass_v.size(); i++) { + ass_v[i]->generate_code(cgh); + CodeGenHelper::update_intervals(cgh.get_current_outputstruct()); + } } char* Definitions::generate_code_str(char *str) @@ -4446,7 +4450,7 @@ namespace Ttcn { } if (erroneous_attrs && erroneous_attrs->get_err_descr()) { function_body = erroneous_attrs->get_err_descr()-> - generate_code_str(function_body, string("ret_val")); + generate_code_str(function_body, target->header.global_vars, string("ret_val"), true); } function_body = body->generate_code_init(function_body, "ret_val"); if (template_restriction!=TR_NONE && gen_restriction_check) diff --git a/compiler2/ttcn3/Attributes.cc b/compiler2/ttcn3/Attributes.cc index 16485b86e1e46a57bab37200b87f33de9bdeb8f7..eb91cd9fb5c36c5af97058e481092b0ae41873d8 100644 --- a/compiler2/ttcn3/Attributes.cc +++ b/compiler2/ttcn3/Attributes.cc @@ -12,6 +12,7 @@ * Feher, Csaba * Raduly, Csaba * Szabados, Kristof + * Szabo, Bence Janos * Szabo, Janos Zoltan – initial implementation * Zalanyi, Balazs Andor * @@ -20,6 +21,7 @@ #include "../map.hh" #include "../CompilerError.hh" #include "../Type.hh" +#include "../main.hh" #include "TtcnTemplate.hh" namespace Ttcn { @@ -313,17 +315,21 @@ namespace Ttcn { return ""; } - char* ErroneousAttributeSpec::generate_code_str(char *str, string genname) + char* ErroneousAttributeSpec::generate_code_str(char *str, char *& def, string genname, const bool embedded) { if (get_is_omit()) return str; if (!type) FATAL_ERROR("ErroneousAttributeSpec::generate_code_str()"); if (!value) FATAL_ERROR("ErroneousAttributeSpec::generate_code_str()"); if (first_genname.empty()) { // this is the first use - str = mputprintf(str, "static %s %s;\n", + str = mputprintf(str, "%s%s %s;\n", split_to_slices && !embedded ? "" : "static ", type->get_genname_value(value->get_my_scope()).c_str(), genname.c_str()); first_genname = genname; + if (split_to_slices && !embedded) { + def = mputprintf(def, "extern %s %s;\n", + type->get_genname_value(value->get_my_scope()).c_str(), genname.c_str()); + } } else { - str = mputprintf(str, "static %s& %s = %s;\n", + str = mputprintf(str, "%s%s& %s = %s;\n", split_to_slices && !embedded ? "" : "static ", type->get_genname_value(value->get_my_scope()).c_str(), genname.c_str(), first_genname.c_str()); } @@ -358,21 +364,24 @@ namespace Ttcn { // ==== ErroneousValues ==== - char* ErroneousValues::generate_code_embedded_str(char *str, string genname) + char* ErroneousValues::generate_code_embedded_str(char *str, char *& def, string genname, const bool embedded) { - if (before) str = generate_code_embedded_str(str, genname+"_before", before); - if (value) str = generate_code_embedded_str(str, genname+"_value", value); - if (after) str = generate_code_embedded_str(str, genname+"_after", after); + if (before) str = generate_code_embedded_str(str, def, genname+"_before", before, embedded); + if (value) str = generate_code_embedded_str(str, def, genname+"_value", value, embedded); + if (after) str = generate_code_embedded_str(str, def, genname+"_after", after, embedded); return str; } - char* ErroneousValues::generate_code_embedded_str(char *str, string genname, ErroneousAttributeSpec* attr_spec) + char* ErroneousValues::generate_code_embedded_str(char *str, char *& def, string genname, ErroneousAttributeSpec* attr_spec, const bool embedded) { - str = attr_spec->generate_code_str(str, genname+"_errval"); - str = mputprintf(str, "static Erroneous_value_t %s = { %s, %s, %s };\n", genname.c_str(), + str = attr_spec->generate_code_str(str, def, genname+"_errval", embedded); + str = mputprintf(str, "%sErroneous_value_t %s = { %s, %s, %s };\n", split_to_slices && !embedded ? "" : "static ", genname.c_str(), attr_spec->get_is_raw() ? "true" : "false", attr_spec->get_is_omit() ? "NULL" : ("&"+genname+"_errval").c_str(), attr_spec->get_typedescriptor_str().c_str()); + if (split_to_slices && !embedded) { + def = mputprintf(def, "extern Erroneous_value_t %s;\n", genname.c_str()); + } return str; } @@ -403,35 +412,41 @@ namespace Ttcn { // ==== ErroneousDescriptor ==== - char* ErroneousDescriptor::generate_code_embedded_str(char *str, string genname) + char* ErroneousDescriptor::generate_code_embedded_str(char *str, char *& def, string genname, const bool embedded) { // values for (size_t i=0; i<values_m.size(); i++) { - str = values_m.get_nth_elem(i)->generate_code_embedded_str(str, genname+"_v"+Int2string((int)values_m.get_nth_key(i))); + str = values_m.get_nth_elem(i)->generate_code_embedded_str(str, def, genname+"_v"+Int2string((int)values_m.get_nth_key(i)), embedded); } // embedded descriptors for (size_t i=0; i<descr_m.size(); i++) { - str = descr_m.get_nth_elem(i)->generate_code_embedded_str(str, genname+"_d"+Int2string((int)descr_m.get_nth_key(i))); + str = descr_m.get_nth_elem(i)->generate_code_embedded_str(str, def, genname+"_d"+Int2string((int)descr_m.get_nth_key(i)), embedded); } // values vector if (values_m.size()>0) { - str = mputprintf(str, "static Erroneous_values_t %s_valsvec[%d] = { ", genname.c_str(), (int)values_m.size()); + str = mputprintf(str, "%sErroneous_values_t %s_valsvec[%d] = { ", split_to_slices && !embedded ? "" : "static ", genname.c_str(), (int)values_m.size()); for (size_t i=0; i<values_m.size(); i++) { if (i>0) str = mputstr(str, ", "); int key_i = (int)values_m.get_nth_key(i); str = values_m.get_nth_elem(i)->generate_code_struct_str(str, genname+"_v"+Int2string(key_i), key_i); } str = mputstr(str, " };\n"); + if (split_to_slices && !embedded) { + def = mputprintf(def, "extern Erroneous_values_t %s_valsvec[%d];\n", genname.c_str(), (int)values_m.size()); + } } // embedded descriptor vector if (descr_m.size()>0) { - str = mputprintf(str, "static Erroneous_descriptor_t %s_embvec[%d] = { ", genname.c_str(), (int)descr_m.size()); + str = mputprintf(str, "%sErroneous_descriptor_t %s_embvec[%d] = { ", split_to_slices && !embedded ? "" : "static ", genname.c_str(), (int)descr_m.size()); for (size_t i=0; i<descr_m.size(); i++) { if (i>0) str = mputstr(str, ", "); int key_i = (int)descr_m.get_nth_key(i); - str = descr_m.get_nth_elem(i)->generate_code_struct_str(str, genname+"_d"+Int2string(key_i), key_i); + str = descr_m.get_nth_elem(i)->generate_code_struct_str(str, def, genname+"_d"+Int2string(key_i), key_i); } str = mputstr(str, " };\n"); + if (split_to_slices && !embedded) { + def = mputprintf(def, "extern Erroneous_descriptor_t %s_embvec[%d];\n", genname.c_str(), (int)descr_m.size()); + } } return str; } @@ -447,7 +462,7 @@ namespace Ttcn { return str; } - char* ErroneousDescriptor::generate_code_struct_str(char *str, string genname, int field_index) + char* ErroneousDescriptor::generate_code_struct_str(char *str, char *& def, string genname, int field_index) { string genname_values_vec = genname + "_valsvec"; string genname_embedded_vec = genname + "_embvec"; @@ -465,18 +480,22 @@ namespace Ttcn { for (size_t i=0; i<values_m.size(); i++) { values_m.get_nth_elem(i)->chk_recursions(refch); } + for (size_t i=0; i<descr_m.size(); i++) { descr_m.get_nth_elem(i)->chk_recursions(refch); } } - char* ErroneousDescriptor::generate_code_str(char *str, string genname) + char* ErroneousDescriptor::generate_code_str(char *str, char *& def, string genname, const bool embedded) { genname += "_err_descr"; - str = generate_code_embedded_str(str, genname); - str = mputprintf(str, "static Erroneous_descriptor_t %s = ", genname.c_str()); - str = generate_code_struct_str(str, genname, -1); + str = generate_code_embedded_str(str, def, genname, embedded); + str = mputprintf(str, "%sErroneous_descriptor_t %s = ", split_to_slices && !embedded ? "" : "static ", genname.c_str()); + str = generate_code_struct_str(str, def, genname, -1); str = mputstr(str, ";\n"); + if (split_to_slices && !embedded) { + def = mputprintf(def, "extern Erroneous_descriptor_t %s;\n", genname.c_str()); + } return str; } diff --git a/compiler2/ttcn3/Attributes.hh b/compiler2/ttcn3/Attributes.hh index ee25fa81ebce1b3545de6fa6d0901936fcec0667..edb77e95a6f567413a647cb40e2809da55c24c53 100644 --- a/compiler2/ttcn3/Attributes.hh +++ b/compiler2/ttcn3/Attributes.hh @@ -10,6 +10,7 @@ * Delic, Adam * Raduly, Csaba * Szabados, Kristof + * Szabo, Bence Janos * Szabo, Janos Zoltan – initial implementation * Zalanyi, Balazs Andor * @@ -118,7 +119,7 @@ namespace Ttcn { bool get_is_raw() const { return is_raw; } bool get_is_omit() const; static const char* get_indicator_str(indicator_t i); - char* generate_code_str(char *str, string genname); + char* generate_code_str(char *str, char *& def, string genname, const bool embedded); char* generate_code_init_str(char *str, string genname); string get_typedescriptor_str(); void chk_recursions(ReferenceChain& refch); @@ -131,9 +132,9 @@ namespace Ttcn { ErroneousAttributeSpec *before, *value, *after; // NULL if not specified string field_name; // qualifier string ErroneousValues(const string& p_field_name): before(0), value(0), after(0), field_name(p_field_name) {} - char* generate_code_embedded_str(char *str, string genname); + char* generate_code_embedded_str(char *str, char *& def, string genname, const bool embedded); char* generate_code_init_str(char *str, string genname); - char* generate_code_embedded_str(char *str, string genname, ErroneousAttributeSpec* attr_spec); + char* generate_code_embedded_str(char *str, char *& def, string genname, ErroneousAttributeSpec* attr_spec, const bool embedded); char* generate_code_struct_str(char *str, string genname, int field_index); void chk_recursions(ReferenceChain& refch); }; @@ -151,10 +152,10 @@ namespace Ttcn { public: ErroneousDescriptor(): omit_before(-1), omit_after(-1) {} ~ErroneousDescriptor(); - char* generate_code_embedded_str(char *str, string genname); + char* generate_code_embedded_str(char *str, char *& def, string genname, const bool embedded); char* generate_code_init_str(char *str, string genname); - char* generate_code_struct_str(char *str, string genname, int field_index); - char* generate_code_str(char *str, string genname); + char* generate_code_struct_str(char *str, char *& def, string genname, int field_index); + char* generate_code_str(char *str, char *& def, string genname, const bool embedded); void chk_recursions(ReferenceChain& refch); }; diff --git a/compiler2/ttcn3/compiler.h b/compiler2/ttcn3/compiler.h index a8b02d92830a276c36261091723847726516cbe7..c3e5364dd799bacac747a01baa85b66641920638 100644 --- a/compiler2/ttcn3/compiler.h +++ b/compiler2/ttcn3/compiler.h @@ -14,6 +14,7 @@ * Kovacs, Ferenc * Kremer, Peter * Raduly, Csaba + * Szabo, Bence Janos * Szabo, Janos Zoltan – initial implementation * Tatarka, Gabor * Zalanyi, Balazs Andor @@ -65,6 +66,21 @@ extern "C" { char *start; /**< Code for start_ptc_function() */ char *control; /**< Code for module_control_part() */ } functions; + struct { + size_t pre_things_size; // Size of string_literals + global_vars + size_t *methods; + size_t methods_max_size; + size_t methods_size; + size_t *function_bodies; + size_t function_bodies_max_size; + size_t function_bodies_size; + size_t *static_function_bodies; + size_t static_function_bodies_max_size; + size_t static_function_bodies_size; + size_t *static_conversion_function_bodies; + size_t static_conversion_function_bodies_size; + size_t static_conversion_function_bodies_max_size; + } intervals; } output_struct; typedef struct expression_struct_t { diff --git a/regression_test/ASN1/Test303/Makefile b/regression_test/ASN1/Test303/Makefile index 69dd30b0d5755c358007250ff28a3bfe79906f20..3641956f945ee404e21ff7756431b2e15919f7c6 100644 --- a/regression_test/ASN1/Test303/Makefile +++ b/regression_test/ASN1/Test303/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test307/Makefile b/regression_test/ASN1/Test307/Makefile index 5a1337fce1942a52f2070c4fa91e42412d0e026f..73a51c03d3fc416b9980314d8b6ef78933f1e343 100644 --- a/regression_test/ASN1/Test307/Makefile +++ b/regression_test/ASN1/Test307/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test308/Makefile b/regression_test/ASN1/Test308/Makefile index 218ab203872f048801693692c611ae32d3db4209..38c2e17f7cebe3afa82a4882647c7f4edd830fb3 100644 --- a/regression_test/ASN1/Test308/Makefile +++ b/regression_test/ASN1/Test308/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test309/Makefile b/regression_test/ASN1/Test309/Makefile index 9d25248ddb5eaa6c7633dcd5fe9ab1c835d1a2ee..7789f92adb6455fbd1d3e0d81303aee492f904a7 100644 --- a/regression_test/ASN1/Test309/Makefile +++ b/regression_test/ASN1/Test309/Makefile @@ -12,6 +12,7 @@ # Kovacs, Ferenc # Kulcsar, Endre # Raduly, Csaba +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -32,6 +33,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test310/Makefile b/regression_test/ASN1/Test310/Makefile index d1d7cd7bbcf8fc834c4093488cd7e6dcbb359bfa..a7c6a150be948871eb2e0d29c2ba6f678175ba69 100644 --- a/regression_test/ASN1/Test310/Makefile +++ b/regression_test/ASN1/Test310/Makefile @@ -12,6 +12,7 @@ # Kovacs, Ferenc # Kulcsar, Endre # Raduly, Csaba +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -32,6 +33,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test330/Makefile b/regression_test/ASN1/Test330/Makefile index 326468f349ee089fc82c784590225af93539363f..ab2ba321e3ffd879776deb376b2fa40cb083e0fe 100644 --- a/regression_test/ASN1/Test330/Makefile +++ b/regression_test/ASN1/Test330/Makefile @@ -12,6 +12,7 @@ # Kovacs, Ferenc # Kulcsar, Endre # Raduly, Csaba +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -32,6 +33,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test332/Makefile b/regression_test/ASN1/Test332/Makefile index 063bf5bcc260095e9cf8ec7da5ebbd6155add8c8..819b477b84e8cfc5223fe77fb1428a2216ad716c 100644 --- a/regression_test/ASN1/Test332/Makefile +++ b/regression_test/ASN1/Test332/Makefile @@ -12,6 +12,7 @@ # Kovacs, Ferenc # Kulcsar, Endre # Raduly, Csaba +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -32,6 +33,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test338/Makefile b/regression_test/ASN1/Test338/Makefile index db473ffadcddf1ec21efb2ad9f024169e3a22526..3d2b6b650732cbcab6b071d1401005015917333e 100644 --- a/regression_test/ASN1/Test338/Makefile +++ b/regression_test/ASN1/Test338/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test340/Makefile b/regression_test/ASN1/Test340/Makefile index e6fa11d4f9f1f03d2b1154cf5379911882beb9e7..1e333ffc22f51e5dcf2fd881c373a4299425061c 100644 --- a/regression_test/ASN1/Test340/Makefile +++ b/regression_test/ASN1/Test340/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test342/Makefile b/regression_test/ASN1/Test342/Makefile index 160d13d876d1fbe4b737e613f550655f8dc43ee8..76c9319403b2a721f0959fe552f88fd03684ad64 100644 --- a/regression_test/ASN1/Test342/Makefile +++ b/regression_test/ASN1/Test342/Makefile @@ -12,6 +12,7 @@ # Kovacs, Ferenc # Kulcsar, Endre # Raduly, Csaba +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -32,6 +33,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test344/Makefile b/regression_test/ASN1/Test344/Makefile index 30a3398b638e01910eacda5e8ceb047dcd251d4b..87965bb9be5fdf37863827dbc2e21b83c40938e4 100644 --- a/regression_test/ASN1/Test344/Makefile +++ b/regression_test/ASN1/Test344/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test346/Makefile b/regression_test/ASN1/Test346/Makefile index 03747160e009144403e838e8e6afd6466587f4e9..0a0d1bbc175644c8ac0445c86deac55872cc8895 100644 --- a/regression_test/ASN1/Test346/Makefile +++ b/regression_test/ASN1/Test346/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test348/Makefile b/regression_test/ASN1/Test348/Makefile index a60a285d08388bbea5dfdae0564cc36db38f4945..1bcc9f4681be138f1089aaba40eab0fce76807e2 100644 --- a/regression_test/ASN1/Test348/Makefile +++ b/regression_test/ASN1/Test348/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test350/Makefile b/regression_test/ASN1/Test350/Makefile index 45182c17e8e80ef7f82a0f641ecfe5b1ec11600d..f6dbe28770b6d9769d664deb8a6c37b586b17024 100644 --- a/regression_test/ASN1/Test350/Makefile +++ b/regression_test/ASN1/Test350/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test352/Makefile b/regression_test/ASN1/Test352/Makefile index 9abc0180386609684cfb938f5019b87252a94f40..f99da118cd286dedc51c0795c492ee6d0e129ead 100644 --- a/regression_test/ASN1/Test352/Makefile +++ b/regression_test/ASN1/Test352/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test354/Makefile b/regression_test/ASN1/Test354/Makefile index c9854e00724d00b4ca0b824338aa30ccc4668012..818c98217fa2f58ab4c95ed78381f65645f2f7a1 100644 --- a/regression_test/ASN1/Test354/Makefile +++ b/regression_test/ASN1/Test354/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test356/Makefile b/regression_test/ASN1/Test356/Makefile index d8966bf29624b7d44976e5922bb374c6d27beb6e..46829949458b2dba529917de8a6efd8e4fb3c2b3 100644 --- a/regression_test/ASN1/Test356/Makefile +++ b/regression_test/ASN1/Test356/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test358/Makefile b/regression_test/ASN1/Test358/Makefile index 61b9774eaac98c4972b79aea51c4451b8d171106..e16e00f5ec09598969281ba18ecaf30b6bdd08a2 100644 --- a/regression_test/ASN1/Test358/Makefile +++ b/regression_test/ASN1/Test358/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test360/Makefile b/regression_test/ASN1/Test360/Makefile index 6ffb52c6ed2485491b359fc76756e274a54b558c..564c2b532555b9adeea85b4549ae3159ccd3bcbe 100644 --- a/regression_test/ASN1/Test360/Makefile +++ b/regression_test/ASN1/Test360/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/ASN1/Test38/Makefile b/regression_test/ASN1/Test38/Makefile index 1a1efdce5f863d85e437c1c7d95afe84cbad0053..197fb3d0212b8c82567a6796430b219b0b33d2d7 100644 --- a/regression_test/ASN1/Test38/Makefile +++ b/regression_test/ASN1/Test38/Makefile @@ -12,6 +12,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -29,6 +30,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif all: $(GENERATED_SOURCES) diff --git a/regression_test/ASN1/codeGeneration2/Makefile b/regression_test/ASN1/codeGeneration2/Makefile index 68b7aa84e83d8256a0774de6101ca6187d431251..2aa4f4c36db5a3ce03139a4c59653da811e8ba43 100644 --- a/regression_test/ASN1/codeGeneration2/Makefile +++ b/regression_test/ASN1/codeGeneration2/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -36,6 +37,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif all: $(GENERATED_SOURCES) diff --git a/regression_test/ASN1/enum1/Makefile b/regression_test/ASN1/enum1/Makefile index 7210879112196704cbddeb390b0994ffc6d8cbd5..aff38ce83b94cc738348cd2a5c216d3ea47e2158 100644 --- a/regression_test/ASN1/enum1/Makefile +++ b/regression_test/ASN1/enum1/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -30,6 +31,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif all: $(GENERATED_SOURCES) diff --git a/regression_test/ASN1/enum2/Makefile b/regression_test/ASN1/enum2/Makefile index cf752b7248d2e51763d5ea5f994f37e586e86bd4..22435255fd94df6eaec3d07a03835f39dde48b85 100644 --- a/regression_test/ASN1/enum2/Makefile +++ b/regression_test/ASN1/enum2/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -30,6 +31,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif all: $(GENERATED_SOURCES) diff --git a/regression_test/ASN1/hyphen/Makefile b/regression_test/ASN1/hyphen/Makefile index 742c61338a1350e627d7addaa712c0055c87f8fb..786d5d83d0b850677aa144a25df782760da19a1e 100644 --- a/regression_test/ASN1/hyphen/Makefile +++ b/regression_test/ASN1/hyphen/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -30,6 +31,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif all: $(GENERATED_SOURCES) diff --git a/regression_test/ASN1/hyphen/hyphen b/regression_test/ASN1/hyphen/hyphen index 8b058e401ead2166d9a537553f9f0bc111e76a87..f58676fb5aba4a977f0c8b720701bfadd7937ebc 100755 --- a/regression_test/ASN1/hyphen/hyphen +++ b/regression_test/ASN1/hyphen/hyphen @@ -13,7 +13,7 @@ then then if $GREP -q "extern const INTEGER& my__Integer__Value" ./Test284.hh then - if $GREP -q "const_my__Integer__Value = 9;" ./Test284.cc + if $GREP -q "const_my__Integer__Value = 9;" ./*.cc then Verdict="pass" else Verdict="fail 4" fi diff --git a/regression_test/ASN1/keyword/Makefile b/regression_test/ASN1/keyword/Makefile index 1f1627b24e95fcf48015060de20b867364d139f9..28da9153d116636f725fc5e7a4e0357221720e87 100644 --- a/regression_test/ASN1/keyword/Makefile +++ b/regression_test/ASN1/keyword/Makefile @@ -14,6 +14,7 @@ # Kovacs, Ferenc # Kulcsar, Endre # Raduly, Csaba +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -32,6 +33,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif all: $(GENERATED_SOURCES) diff --git a/regression_test/ASN1/transformations/Makefile b/regression_test/ASN1/transformations/Makefile index 8941d8feccb1c57a0001a2798ed4e20103ff4fba..c4c4db6010bc26d078b2844d0518239b9b5f0ea7 100644 --- a/regression_test/ASN1/transformations/Makefile +++ b/regression_test/ASN1/transformations/Makefile @@ -13,6 +13,7 @@ # Kulcsar, Endre # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -30,6 +31,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif all: $(GENERATED_SOURCES) diff --git a/regression_test/BER/Makefile b/regression_test/BER/Makefile index b273bc84ada7b59afdd9e8de85cfc67e0eea5771..70796e0c526b083f3b987b0f41dded8290b96b61 100644 --- a/regression_test/BER/Makefile +++ b/regression_test/BER/Makefile @@ -12,6 +12,7 @@ # Koppany, Csaba # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -30,6 +31,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(TTCN3_MODULES:.ttcn=.hh) $(ASN1_MODULES:.asn=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif # Source & header files of Test Ports and your other modules: diff --git a/regression_test/BER_x682/Makefile b/regression_test/BER_x682/Makefile index 8361c66dae9223018c9c2af4e6d5cde05c5da116..551dd9915721b3bf6297dee562addc2274dd79b1 100644 --- a/regression_test/BER_x682/Makefile +++ b/regression_test/BER_x682/Makefile @@ -12,6 +12,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -29,6 +30,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(TTCN3_MODULES:.ttcn=.hh) $(ASN1_MODULES:.asn=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = MyPort1.cc MyPort2.cc diff --git a/regression_test/BER_x682_wa/Makefile b/regression_test/BER_x682_wa/Makefile index d968cf7ffa585338fdbd0a4d90bcd2e1eaa3c9f6..eb06f8f3c990f69e9c3ad69ba75ca8c592e2a4b9 100644 --- a/regression_test/BER_x682_wa/Makefile +++ b/regression_test/BER_x682_wa/Makefile @@ -12,6 +12,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -30,6 +31,11 @@ GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(ASN1_MODULES:.asn=.hh) $(TTCN3_MODULES:.ttcn=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = MyPort1.cc MyPort2.cc diff --git a/regression_test/CRTR00015758/Makefile b/regression_test/CRTR00015758/Makefile index d39a4e07709099e34767b8c07457dade99a8bc66..3c910c5b11ae56e891d541542ca5587d80041609 100644 --- a/regression_test/CRTR00015758/Makefile +++ b/regression_test/CRTR00015758/Makefile @@ -9,6 +9,7 @@ # Baji, Laszlo # Balasko, Jeno # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -52,7 +53,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/ERC/Makefile b/regression_test/ERC/Makefile index d7fe9fb596815ad9eb665edf8e1acd9d84f3e45f..1ff73c4bb7256d8946ce02dca3cd9ac2eb69cbdb 100644 --- a/regression_test/ERC/Makefile +++ b/regression_test/ERC/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) @@ -35,14 +41,11 @@ PARALLEL_TARGET = erc_parallel$(EXESUFFIX) all: $(SINGLE_TARGET) $(PARALLEL_TARGET) -$(SINGLE_TARGET): $(OBJECTS) - $(CXX) $(LDFLAGS) -o $@ $(OBJECTS) -L$(TTCN3_DIR)/lib -lttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX) -L$(OPENSSL_DIR)/lib -lcrypto $($(PLATFORM)_LIBS) +$(SINGLE_TARGET): $(GENERATED_SOURCES) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(GENERATED_SOURCES) -L$(TTCN3_DIR)/lib -lttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX) -L$(OPENSSL_DIR)/lib -lcrypto $($(PLATFORM)_LIBS) -$(PARALLEL_TARGET): $(OBJECTS) - $(CXX) $(LDFLAGS) -o $@ $(OBJECTS) -L$(TTCN3_DIR)/lib -lttcn3$(RT2_SUFFIX)-parallel$(DYNAMIC_SUFFIX) -L$(OPENSSL_DIR)/lib -lcrypto $($(PLATFORM)_LIBS) - -.cc.o: - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< +$(PARALLEL_TARGET): $(GENERATED_SOURCES) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(GENERATED_SOURCES) -L$(TTCN3_DIR)/lib -lttcn3$(RT2_SUFFIX)-parallel$(DYNAMIC_SUFFIX) -L$(OPENSSL_DIR)/lib -lcrypto $($(PLATFORM)_LIBS) .ttcn.cc .ttcn.hh: $(TTCN3_COMPILER) $< diff --git a/regression_test/HQ16404/Makefile b/regression_test/HQ16404/Makefile index 25d30ecca43f0c877fb87614b3d5885ad54061ff..071d1d216a520ad06c3e7e65e0522bf91290f150 100644 --- a/regression_test/HQ16404/Makefile +++ b/regression_test/HQ16404/Makefile @@ -9,6 +9,7 @@ # Baji, Laszlo # Balasko, Jeno # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -60,7 +61,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/Makefile.regression b/regression_test/Makefile.regression index 71957f99dddb2b679a8d6863fa8c211ad3caf89d..ef142195e9f6a91c4d9b9f6f21f64a74999a4015 100644 --- a/regression_test/Makefile.regression +++ b/regression_test/Makefile.regression @@ -15,6 +15,7 @@ # Ormandi, Matyas # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## # @@ -48,7 +49,10 @@ TTCN3_COMPILER += -g -L #RT2 := true # Use code splitting when running the tests +# DO NOT enable both CODE_SPLIT and SPLIT_TO_SLICES #CODE_SPLIT := true +# Use code splitting into slices when running the tests +#SPLIT_TO_SLICES := 30 ifdef RT2 # add command line option to generate code for alternative runtime @@ -70,6 +74,13 @@ ifdef CODE_SPLIT SPLIT_FLAG = -Utype # No space between -U and type ! TTCN3_COMPILER += $(SPLIT_FLAG) +export SPLIT_FLAG +else ifdef SPLIT_TO_SLICES +SPLIT_FLAG := -U$(SPLIT_TO_SLICES) +TTCN3_COMPILER += $(SPLIT_FLAG) +SPLIT_TO_SLICES := $(shell echo $(SPLIT_TO_SLICES) - 1 | bc) +SPLIT_TO_SLICES := $(shell seq 1 ${SPLIT_TO_SLICES}) +export SPLIT_FLAG endif # Your platform. Allowed values: SOLARIS, SOLARIS8, LINUX, FREEBSD, WIN32 diff --git a/regression_test/RAW/Annex_E_variants/Makefile b/regression_test/RAW/Annex_E_variants/Makefile index 96232b0f4852d7842a6fb0d06e90f08ab1997f63..310bc96b3aaa0f897d189c78f778064e456039c9 100644 --- a/regression_test/RAW/Annex_E_variants/Makefile +++ b/regression_test/RAW/Annex_E_variants/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -23,6 +24,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = diff --git a/regression_test/RAW/Examples/Makefile b/regression_test/RAW/Examples/Makefile index 7082745be9b547447c0327d67bab3caee3d94607..f37ada9ba540d022fbae50fa01381de24af4230d 100644 --- a/regression_test/RAW/Examples/Makefile +++ b/regression_test/RAW/Examples/Makefile @@ -13,6 +13,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # Szalai, Gabor # @@ -30,6 +31,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = diff --git a/regression_test/RAW/HN25015/Makefile b/regression_test/RAW/HN25015/Makefile index 72bce473629f8a0a9f78d0bb3c950ea6fba597f9..e4e033c9255d5b1a98e4fca7d3b719819f9deb21 100644 --- a/regression_test/RAW/HN25015/Makefile +++ b/regression_test/RAW/HN25015/Makefile @@ -9,6 +9,7 @@ # Baji, Laszlo # Balasko, Jeno # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -57,7 +58,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/RAW/HQ26535/Makefile b/regression_test/RAW/HQ26535/Makefile index 9c61666ba396481fe0b0bfcd9d7562c88948e52b..77dceede53e14147f9615eb14c6ced95dc5709a4 100644 --- a/regression_test/RAW/HQ26535/Makefile +++ b/regression_test/RAW/HQ26535/Makefile @@ -9,6 +9,7 @@ # Baji, Laszlo # Balasko, Jeno # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -56,7 +57,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/RAW/HQ49956/Makefile b/regression_test/RAW/HQ49956/Makefile index a06c11b1a86f9dadbc2cd60fbf603cc907304ade..b7717462d9e127e65ebe8760ee0d43d1db62d303 100644 --- a/regression_test/RAW/HQ49956/Makefile +++ b/regression_test/RAW/HQ49956/Makefile @@ -9,6 +9,7 @@ # Baji, Laszlo # Balasko, Jeno # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -56,7 +57,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/RAW/HS16977/Makefile b/regression_test/RAW/HS16977/Makefile index e9aff4a4cee793462a53e732be60cf63ea49a038..3c74695e8728f4e08b0ccc54181b96e4d13f418c 100644 --- a/regression_test/RAW/HS16977/Makefile +++ b/regression_test/RAW/HS16977/Makefile @@ -9,6 +9,7 @@ # Baji, Laszlo # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -56,7 +57,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/RAW/ustr/Makefile b/regression_test/RAW/ustr/Makefile index 00783daab02d6a601cca92a74901bb514f5b41fc..103474bdcbd93b6f83f4344576abfc5690076760 100644 --- a/regression_test/RAW/ustr/Makefile +++ b/regression_test/RAW/ustr/Makefile @@ -7,6 +7,7 @@ # # Contributors: # Botond Baranyi – initial implementation +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -54,7 +55,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/XML/AbstractBlock/Makefile b/regression_test/XML/AbstractBlock/Makefile index 1bd8b830fa4a44718e049c17624231dc890c8a2c..2e9152656fae02a34d9e08b3c8c8f57baf1729bb 100644 --- a/regression_test/XML/AbstractBlock/Makefile +++ b/regression_test/XML/AbstractBlock/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR = ../.. @@ -59,7 +60,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/XML/EXER-whitepaper/Makefile b/regression_test/XML/EXER-whitepaper/Makefile index 922a5a9e6d07d019eb0e25e2367afcced52b6023..260899ddc0209b71950ba6b6f53eb64384253a64 100644 --- a/regression_test/XML/EXER-whitepaper/Makefile +++ b/regression_test/XML/EXER-whitepaper/Makefile @@ -10,6 +10,7 @@ # Balasko, Jeno # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## # @@ -82,6 +83,11 @@ GENERATED_SOURCES := $(TTCN3_MODULES:.ttcn=.cc) $(PREPROCESSED_TTCN3_MODULES:.tt GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif # C/C++ Source & header files of Test Ports, external functions and diff --git a/regression_test/XML/HM60295/Makefile b/regression_test/XML/HM60295/Makefile index dd345bd9f7905b4abed657dbc322cdac2ee6bdd1..88df207eb208d5238241d6e803906d64d4d89cc4 100644 --- a/regression_test/XML/HM60295/Makefile +++ b/regression_test/XML/HM60295/Makefile @@ -9,6 +9,7 @@ # Baji, Laszlo # Balasko, Jeno # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -36,6 +37,11 @@ GENERATED_SOURCES := $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = USER_HEADERS = $(USER_SOURCES:.cc=.hh) diff --git a/regression_test/XML/HN15589/Makefile b/regression_test/XML/HN15589/Makefile index 09742020e7b87a8d89ac00891dfda206249b8363..fd9e727c6a7ae5225a0a67afa343fc4ad197e91d 100644 --- a/regression_test/XML/HN15589/Makefile +++ b/regression_test/XML/HN15589/Makefile @@ -9,6 +9,7 @@ # Baji, Laszlo # Balasko, Jeno # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -71,6 +72,11 @@ GENERATED_SOURCES := $(TTCN3_MODULES:.ttcn=.cc) $(PREPROCESSED_TTCN3_MODULES:.tt GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif # C/C++ Source & header files of Test Ports, external functions and diff --git a/regression_test/XML/HQ30408/Makefile b/regression_test/XML/HQ30408/Makefile index 0d2a9ad1772ac0a59977b1f0e89fcde24c7bf488..0c2cbd386183e88dcc11da39a218cbc2c4d7dc6d 100644 --- a/regression_test/XML/HQ30408/Makefile +++ b/regression_test/XML/HQ30408/Makefile @@ -9,6 +9,7 @@ # Baji, Laszlo # Balasko, Jeno # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR = ../.. @@ -60,7 +61,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/XML/HR49727/Makefile b/regression_test/XML/HR49727/Makefile index bcc26d0aed5aef754f6f657785336bb811d43c1c..9f313ef345300f4a95ca6c14022703b7362d050a 100644 --- a/regression_test/XML/HR49727/Makefile +++ b/regression_test/XML/HR49727/Makefile @@ -9,6 +9,7 @@ # Baji, Laszlo # Balasko, Jeno # Ormandi, Matyas +# Szabo, Bence Janos # ############################################################################## TOPDIR = ../.. @@ -60,7 +61,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/XML/HU13380/Makefile b/regression_test/XML/HU13380/Makefile index 07796cfb5c0a29a820f617a9f66fc24f1de8a35a..edf8ebf9fac0daa385a6c1602ab8f52d6f3212ec 100644 --- a/regression_test/XML/HU13380/Makefile +++ b/regression_test/XML/HU13380/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR = ../.. @@ -59,7 +60,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/XML/NegativeTest/Makefile b/regression_test/XML/NegativeTest/Makefile index 9898ed77aecc98ac701d7685824ba02375738b19..1759c8b06bbf44a46211d1de6383cad4c7676627 100644 --- a/regression_test/XML/NegativeTest/Makefile +++ b/regression_test/XML/NegativeTest/Makefile @@ -10,6 +10,7 @@ # Balasko, Jeno # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## #only works with RT2 @@ -62,7 +63,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = ReadXmlImpl.cc diff --git a/regression_test/XML/TTCNandXML/Makefile b/regression_test/XML/TTCNandXML/Makefile index b382d2e05d2b8c49c3e786dc4243271fe29ca9a9..f9df9da9b3d6e72a5709481a5d8b36f17a77c800 100644 --- a/regression_test/XML/TTCNandXML/Makefile +++ b/regression_test/XML/TTCNandXML/Makefile @@ -11,6 +11,7 @@ # Baranyi, Botond # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -95,6 +96,11 @@ GENERATED_SOURCES := $(notdir $(TTCN3_MODULES:.ttcn=.cc) $(PREPROCESSED_TTCN3_MO GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif diff --git a/regression_test/XML/UseNilLong/Makefile b/regression_test/XML/UseNilLong/Makefile index b723b0646815264a605db94c1aa6c7c6d7e36fe8..0564c5f4c29e6841a1cec4670db78e1534fdb3b8 100644 --- a/regression_test/XML/UseNilLong/Makefile +++ b/regression_test/XML/UseNilLong/Makefile @@ -58,7 +58,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/XML/XER/Makefile b/regression_test/XML/XER/Makefile index 80715b9e444baea45c518857bb28c217404cdf6c..996f1f52e964c26a189c5754561050a6b03fbeac 100644 --- a/regression_test/XML/XER/Makefile +++ b/regression_test/XML/XER/Makefile @@ -10,6 +10,7 @@ # Balasko, Jeno # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -96,6 +97,11 @@ GENERATED_SOURCES := $(notdir $(TTCN3_MODULES:.ttcn=.cc) $(PREPROCESSED_TTCN3_MO GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif # C/C++ Source & header files of Test Ports, external functions and diff --git a/regression_test/XML/XMLqualif/Makefile b/regression_test/XML/XMLqualif/Makefile index a0c69c23f31f45e42d6aba1a2aa1b0448ab568e6..b435ad256cf88f84d4f46e990cc6097310300389 100644 --- a/regression_test/XML/XMLqualif/Makefile +++ b/regression_test/XML/XMLqualif/Makefile @@ -10,6 +10,7 @@ # Baji, Laszlo # Balasko, Jeno # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -96,6 +97,11 @@ GENERATED_SOURCES := $(TTCN3_MODULES:.ttcn=.cc) $(TTCN3_PP_MODULES:.ttcnpp=.cc) GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif # C/C++ Source & header files of Test Ports, external functions and diff --git a/regression_test/XML/XmlWorkflow/PIPEasp_CNL113334/test/Makefile b/regression_test/XML/XmlWorkflow/PIPEasp_CNL113334/test/Makefile index 9234bd1c3359beb900828f0949f6b378c006983f..9fc0bd331d35706afabc460f7926a95a084a4920 100644 --- a/regression_test/XML/XmlWorkflow/PIPEasp_CNL113334/test/Makefile +++ b/regression_test/XML/XmlWorkflow/PIPEasp_CNL113334/test/Makefile @@ -29,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = PIPEasp_PT.cc diff --git a/regression_test/XML/XmlWorkflow/bin/prj2mk.pl b/regression_test/XML/XmlWorkflow/bin/prj2mk.pl index 987bd6461651ac296630ed087a3e4704cc4241a9..fcb4b6454e94dab09e7f39ed41d0bab80e6798c8 100644 --- a/regression_test/XML/XmlWorkflow/bin/prj2mk.pl +++ b/regression_test/XML/XmlWorkflow/bin/prj2mk.pl @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Pandi, Krisztian # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################### @@ -44,7 +45,7 @@ do { } unless $prj_dir =~ s!/[^/]+$!/!; # Pick up parameters from the environment -my $split = defined $ENV{CODE_SPLIT} ? '-Utype' : ''; +my $split = defined $ENV{SPLIT_FLAG} ? $ENV{SPLIT_FLAG} : ''; my $rt2 = defined $ENV{RT2} ? '-R' : ''; my %files; diff --git a/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl b/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl index 4627d299784f04b36ec5f161302849801c01c977..271bbda8200b7611dab7addca99338b0c1695487 100644 --- a/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl +++ b/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl @@ -8,6 +8,7 @@ # # Contributors: # Balasko, Jeno +# Szabo, Bence Janos # ############################################################################### @@ -41,7 +42,7 @@ do { } unless $prj_dir =~ s!/[^/]+$!/!; # Pick up parameters from the environment -my $split = defined $ENV{CODE_SPLIT} ? '-Utype' : ''; +my $split = defined $ENV{SPLIT_FLAG} ? $ENV{SPLIT_FLAG} : ''; my $rt2 = defined $ENV{RT2} ? '-R' : ''; my %files; diff --git a/regression_test/XML/xsdConverter/Makefile.converter b/regression_test/XML/xsdConverter/Makefile.converter index b5ff34d4f04a06e4a53e085e9377804f39f00752..49f7be19989dfa3d38452cfef6e97a7a63efe782 100644 --- a/regression_test/XML/xsdConverter/Makefile.converter +++ b/regression_test/XML/xsdConverter/Makefile.converter @@ -22,6 +22,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif diff --git a/regression_test/acceptance_test/Fibonacci/Makefile b/regression_test/acceptance_test/Fibonacci/Makefile index 971d9bf927f8a9f81943376301eaf9ab317ce2d8..4498894ea2c497694495ac1c9143fd91cc712ed4 100644 --- a/regression_test/acceptance_test/Fibonacci/Makefile +++ b/regression_test/acceptance_test/Fibonacci/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Gecse, Roland # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## # This Makefile was generated by the compiler @@ -75,6 +76,11 @@ GENERATED_SOURCES = Fibonacci.cc GENERATED_HEADERS = Fibonacci.hh ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif # Source & header files of Test Ports and your other modules: diff --git a/regression_test/acceptance_test/chinese/Makefile b/regression_test/acceptance_test/chinese/Makefile index dab4861538400182a235e45dcc04fcfc491ac4db..1d6a2f1aff0944cc0813d5e012ec7c8dd627ab8b 100644 --- a/regression_test/acceptance_test/chinese/Makefile +++ b/regression_test/acceptance_test/chinese/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Gecse, Roland # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## # This Makefile was generated by the compiler @@ -76,6 +77,11 @@ GENERATED_SOURCES = chinese.cc GENERATED_HEADERS = chinese.hh ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif # Source & header files of Test Ports and your other modules: diff --git a/regression_test/acceptance_test/comptest/Makefile b/regression_test/acceptance_test/comptest/Makefile index e445fc98e9f59ac4cce8f058b437bca3a308fc17..bf8f8aa3790f4df8c071ea552937c93578f5bb78 100644 --- a/regression_test/acceptance_test/comptest/Makefile +++ b/regression_test/acceptance_test/comptest/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Gecse, Roland # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../../ @@ -46,6 +47,11 @@ GENERATED_SOURCES = comptest.cc GENERATED_HEADERS = comptest.hh ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif # Source & header files of Test Ports and your other modules: diff --git a/regression_test/acceptance_test/testerlanc/Makefile b/regression_test/acceptance_test/testerlanc/Makefile index 3e031e7fcf9cc90f2442bb15b82f96721c8ad2a9..3c2a500e1825dad3f3a0400e880e68e1aa3e524e 100644 --- a/regression_test/acceptance_test/testerlanc/Makefile +++ b/regression_test/acceptance_test/testerlanc/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Gecse, Roland # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## # This Makefile was generated by the compiler @@ -76,6 +77,11 @@ GENERATED_SOURCES = testerlanc.cc GENERATED_HEADERS = testerlanc.hh ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif # Source & header files of Test Ports and your other modules: diff --git a/regression_test/all_from/Makefile b/regression_test/all_from/Makefile index c0d381b5bb25b5d3ce8a8656a2a967ff9a5a3aed..08d6653bc46fc686d9d130d03c5f5d20f756d69d 100644 --- a/regression_test/all_from/Makefile +++ b/regression_test/all_from/Makefile @@ -10,6 +10,7 @@ # Balasko, Jeno # Baranyi, Botond # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -63,7 +64,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = f_ext.cc diff --git a/regression_test/anytype/Makefile b/regression_test/anytype/Makefile index 4f45e739ee3537b0465e2cde7de6659511f6adb4..844136f64a557e9f760371de05443c724dce7223 100644 --- a/regression_test/anytype/Makefile +++ b/regression_test/anytype/Makefile @@ -10,6 +10,7 @@ # Balasko, Jeno # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -85,6 +86,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(PREPROCESSED_TTCN3_MODULES:.ttc GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif # C/C++ Source & header files of Test Ports, external functions and diff --git a/regression_test/anytypeOper/Makefile b/regression_test/anytypeOper/Makefile index ae395cb71bd61d6f49c3fd9616973eb20963ddb6..6ba0b6e8caf08ef720f4191234836a224e7f5a0b 100644 --- a/regression_test/anytypeOper/Makefile +++ b/regression_test/anytypeOper/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -24,6 +25,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/arrayOper/Makefile b/regression_test/arrayOper/Makefile index cc424f45873db30b25d5271e099b2e3c01506116..821c7708aa77f2769198b53ce74ef66bb5775754 100644 --- a/regression_test/arrayOper/Makefile +++ b/regression_test/arrayOper/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/assignmentNotation/Makefile b/regression_test/assignmentNotation/Makefile index fb9e72998b2349e4fcbcbb681dc6f3c91efaeec0..299e61709a6afcd2fff759d8e7289eebcf866c41 100644 --- a/regression_test/assignmentNotation/Makefile +++ b/regression_test/assignmentNotation/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) ASN_Definitions.cc GENERATED_HEADERS = $(TTCN3_MODULES:.ttcn=.hh) ASN_Definitions.hh ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = diff --git a/regression_test/basicStatem/Makefile b/regression_test/basicStatem/Makefile index eb448e02604e8c9b7de6db7889c9ff46531b8cf7..754bf0dd3c4d79d05c93ee8e5d85a7c6d0e89324 100644 --- a/regression_test/basicStatem/Makefile +++ b/regression_test/basicStatem/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/bitstrOper/Makefile b/regression_test/bitstrOper/Makefile index c74ab85b7530db12e1dcd6da23f13a0d01c06a83..4203f661a3576d8d7e221b20238896968088edff 100644 --- a/regression_test/bitstrOper/Makefile +++ b/regression_test/bitstrOper/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/boolOper/Makefile b/regression_test/boolOper/Makefile index f1ba50f81e88bd732c3e53a257f1bc7bf9f38a9b..ba829315aec255cd843f292aee1a529d74ef1be7 100644 --- a/regression_test/boolOper/Makefile +++ b/regression_test/boolOper/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/cfgFile/define/macro_reference/Makefile b/regression_test/cfgFile/define/macro_reference/Makefile index 37842c4ac25436a0ea9d9cecdda26bf9c6c57431..5513772cceebbf3be87ee828b96c91d69ead2c89 100644 --- a/regression_test/cfgFile/define/macro_reference/Makefile +++ b/regression_test/cfgFile/define/macro_reference/Makefile @@ -10,6 +10,7 @@ # Beres, Szabolcs # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../../../ @@ -48,12 +49,12 @@ all: $(GENERATED_DIRS) $(DIR_SINGLE): mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) -s ./* && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -s ./* && $(MAKE_PROG) $(DIR_PARALLEL): mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) ./* && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) ./* && $(MAKE_PROG) run: $(GENERATED_DIRS) cd $(DIR_SINGLE) && ./$(RUNNABLE) $(CFG) diff --git a/regression_test/cfgFile/define/structured/Makefile b/regression_test/cfgFile/define/structured/Makefile index d131aedddfff5c9f2be8c2b931e8641c87c00b37..30617920baa52385a6304cddabb7e45ae6b946fa 100644 --- a/regression_test/cfgFile/define/structured/Makefile +++ b/regression_test/cfgFile/define/structured/Makefile @@ -10,6 +10,7 @@ # Beres, Szabolcs # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../../../ @@ -48,12 +49,12 @@ all: $(GENERATED_DIRS) $(DIR_SINGLE): mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) -s ./* && $(MAKE_PROG) 'CXXFLAGS=$(CXXFLAGS)' 'LDFLAGS=$(LDFLAGS)' + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -s ./* && $(MAKE_PROG) 'CXXFLAGS=$(CXXFLAGS)' 'LDFLAGS=$(LDFLAGS)' $(DIR_PARALLEL): mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) ./* && $(MAKE_PROG) 'CXXFLAGS=$(CXXFLAGS)' 'LDFLAGS=$(LDFLAGS)' + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) ./* && $(MAKE_PROG) 'CXXFLAGS=$(CXXFLAGS)' 'LDFLAGS=$(LDFLAGS)' run: $(GENERATED_DIRS) cd $(DIR_SINGLE) && ./$(RUNNABLE) $(CFG) diff --git a/regression_test/cfgFile/module_parameters/assignment/Makefile b/regression_test/cfgFile/module_parameters/assignment/Makefile index 97e3f6d6570880ad4060b2ec2c40a092ce6891b7..8a88a731c377b93e3ed6584e7ae89cb74e05bccf 100644 --- a/regression_test/cfgFile/module_parameters/assignment/Makefile +++ b/regression_test/cfgFile/module_parameters/assignment/Makefile @@ -10,6 +10,7 @@ # Beres, Szabolcs # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../../../ @@ -45,12 +46,12 @@ all: $(GENERATED_DIRS) dir_single_mode: mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) -s ./* && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -s ./* && $(MAKE_PROG) dir_parallel_mode: mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) ./* && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) ./* && $(MAKE_PROG) run: $(GENERATED_DIRS) cd $(DIR_SINGLE) && ./$(RUNNABLE) $(CFG) diff --git a/regression_test/cfgFile/module_parameters/concat/Makefile b/regression_test/cfgFile/module_parameters/concat/Makefile index 22e71edecb4f0d550a8490363cdcd1800c52ea41..73665316a15f410e53333fb23ae9192a9c757cc2 100644 --- a/regression_test/cfgFile/module_parameters/concat/Makefile +++ b/regression_test/cfgFile/module_parameters/concat/Makefile @@ -10,6 +10,7 @@ # Beres, Szabolcs # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../../../ @@ -45,12 +46,12 @@ all: $(GENERATED_DIRS) dir_single_mode: mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) -s ./* && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -s ./* && $(MAKE_PROG) dir_parallel_mode: mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) ./* && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) ./* && $(MAKE_PROG) run: $(GENERATED_DIRS) cd $(DIR_SINGLE) && ./$(RUNNABLE) $(CFG) diff --git a/regression_test/cfgFile/module_parameters/references/Makefile b/regression_test/cfgFile/module_parameters/references/Makefile index 9db9460761ab24dd41273b8feddcf8a8b4eb2a63..6337ff948c052fb339e59f7b5969a46260c3f55e 100644 --- a/regression_test/cfgFile/module_parameters/references/Makefile +++ b/regression_test/cfgFile/module_parameters/references/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../../../ @@ -43,12 +44,12 @@ all: $(GENERATED_DIRS) dir_single_mode: mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) -s ./* && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -s ./* && $(MAKE_PROG) dir_parallel_mode: mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) ./* && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) ./* && $(MAKE_PROG) run: $(GENERATED_DIRS) cd $(DIR_SINGLE) && ./$(RUNNABLE) $(CFG) diff --git a/regression_test/cfgFile/ordered_include/Makefile b/regression_test/cfgFile/ordered_include/Makefile index 281268697220e135a2b91bcd7922b6b230e34628..dfde53440c3557a89c5ac157fbee1ee2c1ee0eb9 100644 --- a/regression_test/cfgFile/ordered_include/Makefile +++ b/regression_test/cfgFile/ordered_include/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../../ @@ -46,12 +47,12 @@ all: $(GENERATED_DIRS) dir_single_mode: mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) -s ./* && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -s ./* && $(MAKE_PROG) dir_parallel_mode: mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) ./* && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) ./* && $(MAKE_PROG) run: clean run_single run_parallel diff --git a/regression_test/cfgFile/testport_parameters/Makefile b/regression_test/cfgFile/testport_parameters/Makefile index 1012a28697102dd85950f633d585bfbfa14b1362..4c0d3bd8de9a2092f5ec9defe0cc95146026ab85 100644 --- a/regression_test/cfgFile/testport_parameters/Makefile +++ b/regression_test/cfgFile/testport_parameters/Makefile @@ -9,6 +9,7 @@ # Balasko, Jeno # Baranyi, Botond # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../../ @@ -46,12 +47,12 @@ all: $(GENERATED_DIRS) dir_single_mode: mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) -s $(TTCN_MODULE) $(PORT) && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -s $(TTCN_MODULE) $(PORT) && $(MAKE_PROG) dir_parallel_mode: mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(TTCN_MODULE) $(PORT) && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) $(TTCN_MODULE) $(PORT) && $(MAKE_PROG) run: $(GENERATED_DIRS) cd $(DIR_SINGLE) && ./$(RUNNABLE) $(CFG) diff --git a/regression_test/charOper/Makefile b/regression_test/charOper/Makefile index 79abaf4c47b2df973a122ca4891a70c354398da2..54c96c321da9a55d36c75b107592ea5a3546f23e 100644 --- a/regression_test/charOper/Makefile +++ b/regression_test/charOper/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/charstrOper/Makefile b/regression_test/charstrOper/Makefile index 64699fbf1af2d20a49b2ac92e249bafd6f49a882..a3b093c8bd885d3e01c224c25fbe841a13be7bcc 100644 --- a/regression_test/charstrOper/Makefile +++ b/regression_test/charstrOper/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/checkstate/Makefile b/regression_test/checkstate/Makefile index 462c4d95d48014d314f60a204cd707fd98ebdcad..19a316328a4c0574139417fe99b64980d30fbc58 100644 --- a/regression_test/checkstate/Makefile +++ b/regression_test/checkstate/Makefile @@ -23,6 +23,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = diff --git a/regression_test/commMessage/Makefile b/regression_test/commMessage/Makefile index 58ad5023433e73e0f7a45b88d1d87d0cae9056ba..a9eaba9605119c479bba7d5fbae50405c4ac1e26 100644 --- a/regression_test/commMessage/Makefile +++ b/regression_test/commMessage/Makefile @@ -14,6 +14,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -34,6 +35,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(TTCN3_MODULES:.ttcn=.hh) $(ASN1_MODULES:.asn=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/commProcedure/Makefile b/regression_test/commProcedure/Makefile index 4fde71ec036d346d14ffa493ca40155cd0b0618e..4e61d442266af7cf424c37da0ed32a9973e30ba7 100644 --- a/regression_test/commProcedure/Makefile +++ b/regression_test/commProcedure/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # Tatarka, Gabor # @@ -29,6 +30,11 @@ GENERATED_SOURCES := $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif GENERATED_SOURCES += CompileOnlyPort.cc CompileOnlyPortAddress.cc GENERATED_HEADERS += CompileOnlyPort.hh CompileOnlyPortAddress.hh diff --git a/regression_test/compileonly/HT48786/Makefile b/regression_test/compileonly/HT48786/Makefile index 8fb30f7e3a7e4db6fb40c9d4a306e07410ddefa3..3d246df07064f5bfa18d685fec7bdd259ae97bff 100644 --- a/regression_test/compileonly/HT48786/Makefile +++ b/regression_test/compileonly/HT48786/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -25,6 +26,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/compileonly/assignmentNotation/Makefile b/regression_test/compileonly/assignmentNotation/Makefile index 4f0c3dd215f73e095ca1859c965a8a81c3c94e75..aa0f7f28d93af0c8e1743f4263d5317fe5f1b23f 100644 --- a/regression_test/compileonly/assignmentNotation/Makefile +++ b/regression_test/compileonly/assignmentNotation/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -25,6 +26,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/compileonly/attribQualif/Makefile b/regression_test/compileonly/attribQualif/Makefile index 1f6dd997b678530199c1bc977613dd3afc34b9a8..46502a795cafb8d072df8dac6ca25d07933367e7 100644 --- a/regression_test/compileonly/attribQualif/Makefile +++ b/regression_test/compileonly/attribQualif/Makefile @@ -9,6 +9,7 @@ # Balasko, Jeno # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -25,6 +26,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/compileonly/circularImport/Makefile b/regression_test/compileonly/circularImport/Makefile index bb2e9b2badd9b55556375413c4105f7f55c3b6a3..401007130b1f9bbe36e9e9c3e1151cf5ae762998 100644 --- a/regression_test/compileonly/circularImport/Makefile +++ b/regression_test/compileonly/circularImport/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -27,6 +28,11 @@ GENERATED_SOURCES := $(MODULES:.asn=.cc) GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS := $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/compileonly/circularImport2/Makefile b/regression_test/compileonly/circularImport2/Makefile index 04fbd8e9efc7bac586721656619d9b1fa790e0e8..eca4a90ae8b0ddc49a18e7fd10b0cdc63753fe73 100644 --- a/regression_test/compileonly/circularImport2/Makefile +++ b/regression_test/compileonly/circularImport2/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -23,6 +24,11 @@ GENERATED_SOURCES := $(MODULES:.asn=.cc) GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS := $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/compileonly/compareImported/Makefile b/regression_test/compileonly/compareImported/Makefile index cbc7e8e4115a80691ed5adee10c406173741a083..41e231f0c4c68f6c2b4c2cbd25e039820e5df701 100644 --- a/regression_test/compileonly/compareImported/Makefile +++ b/regression_test/compileonly/compareImported/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/compileonly/compoundif/Makefile b/regression_test/compileonly/compoundif/Makefile index 616d2243fb9c689680aac0c540915644fb621042..c2738282435f235ea809bf7b9359ba75f80709d9 100644 --- a/regression_test/compileonly/compoundif/Makefile +++ b/regression_test/compileonly/compoundif/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Forstner, Matyas # Kovacs, Ferenc +# Szabo, Bence Janos # Raduly, Csaba # ############################################################################## @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/compileonly/defaultParamUsageBeforeDecl/Makefile b/regression_test/compileonly/defaultParamUsageBeforeDecl/Makefile index 024abd7886ace03f05655b21779c366e8940b226..c0753022f8bf365caf5f963cec554f4f7323ce5b 100644 --- a/regression_test/compileonly/defaultParamUsageBeforeDecl/Makefile +++ b/regression_test/compileonly/defaultParamUsageBeforeDecl/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -27,6 +28,11 @@ GENERATED_SOURCES := $(MODULES:.ttcn=.cc) GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS := $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/compileonly/dynamicTemplate/Makefile b/regression_test/compileonly/dynamicTemplate/Makefile index 49b734b44e67c22a0c5f7bb9bb12f14868ed27ee..beb093b4fb9012d93afe00870f51c8cc4d91d275 100644 --- a/regression_test/compileonly/dynamicTemplate/Makefile +++ b/regression_test/compileonly/dynamicTemplate/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -29,6 +30,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = external.cc @@ -62,3 +68,4 @@ DynamicTemplate.o: DynamicTemplate.cc DynamicTemplate.hh vpath $(USER_SOURCES) $(ABS_SRC) + diff --git a/regression_test/compileonly/isbound/Makefile b/regression_test/compileonly/isbound/Makefile index 0324c0788a4abe6f359646b2bd738de97713dd45..cc13f9ccfa3756e0f5d9183d2af9a129b7e59d7a 100644 --- a/regression_test/compileonly/isbound/Makefile +++ b/regression_test/compileonly/isbound/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## #!/usr/bin/make -f @@ -50,6 +51,11 @@ GOOD_HH := $(GOOD_TTCN:.ttcn=.hh) ifdef CODE_SPLIT GOOD_CC := $(foreach file, $(GOOD_CC:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GOOD_CC:.cc=), $(addprefix $(file), $(POSTFIXES))) +GOOD_CC += $(GENERATED_SOURCES2) endif diff --git a/regression_test/compileonly/namedActualParameters/Makefile b/regression_test/compileonly/namedActualParameters/Makefile index 2acf70cf5271f9fccec92e12c2a8436013ada14b..2849455993d7383d052ffb2bfe60cf1ba52bbab8 100644 --- a/regression_test/compileonly/namedActualParameters/Makefile +++ b/regression_test/compileonly/namedActualParameters/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -25,6 +26,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/compileonly/openType/Makefile b/regression_test/compileonly/openType/Makefile index a49f48f39a4c44fc03b6515c6cfebaa3a1f9f8a4..529e4529e927edffa1846ed85fc941a49ac9747d 100644 --- a/regression_test/compileonly/openType/Makefile +++ b/regression_test/compileonly/openType/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -26,6 +27,11 @@ GENERATED_SOURCES := $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS := $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/compileonly/openTypeNames/Makefile b/regression_test/compileonly/openTypeNames/Makefile index 9f471831c06afb677697315d8f33aaf0fbf1d5e4..baf4892f1da26dfebcdcd3c4aee79924b62fd728 100644 --- a/regression_test/compileonly/openTypeNames/Makefile +++ b/regression_test/compileonly/openTypeNames/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -24,6 +25,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/compileonly/optionalAssignCompare/Makefile b/regression_test/compileonly/optionalAssignCompare/Makefile index 6ab5d74b5367aff645680a1e3e66aaeaf0f41166..3edd0dabe4c76d908563ad9e25f89d11aabe67f4 100644 --- a/regression_test/compileonly/optionalAssignCompare/Makefile +++ b/regression_test/compileonly/optionalAssignCompare/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/compileonly/portConstructor/Makefile b/regression_test/compileonly/portConstructor/Makefile index 264a2861cb874afa929d5c99dc3edcb276ff839d..c7fc1b56ad45c66ea8a0eec9599e75b32571aa48 100644 --- a/regression_test/compileonly/portConstructor/Makefile +++ b/regression_test/compileonly/portConstructor/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -27,6 +28,11 @@ GENERATED_SOURCES := $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif GENERATED_SOURCES += PT1.cc PT3.cc GENERATED_HEADERS += PT1.hh PT3.hh diff --git a/regression_test/compileonly/selectCase/Makefile b/regression_test/compileonly/selectCase/Makefile index 846e2da2adecee5f1ce64fb7538be67b76e6cd86..ddee69884f5e4221d0d782ccf72c92c50c59ae22 100644 --- a/regression_test/compileonly/selectCase/Makefile +++ b/regression_test/compileonly/selectCase/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -23,6 +24,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/compileonly/styleGuide/Makefile b/regression_test/compileonly/styleGuide/Makefile index ed9c3c4588f1a473e15cf059f1486d19cf328f06..3b010716ae81232b0e85487bcdebeb5690771f40 100644 --- a/regression_test/compileonly/styleGuide/Makefile +++ b/regression_test/compileonly/styleGuide/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -33,6 +34,11 @@ GENERATED_SOURCES := $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif GENERATED_SOURCES += $(TESTPORT_SOURCES) GENERATED_HEADERS += $(TESTPORT_SOURCES:.cc=.hh) diff --git a/regression_test/compileonly/topLevelPdu/Makefile b/regression_test/compileonly/topLevelPdu/Makefile index 1cb1457eb0a78475b0570f3678b6b6650ff36df8..410f705ca6419762bd058315f58b2c09c83fc94b 100644 --- a/regression_test/compileonly/topLevelPdu/Makefile +++ b/regression_test/compileonly/topLevelPdu/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -27,6 +28,11 @@ GENERATED_SOURCES := $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS := $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/compileonly/typeInstantiation/Makefile b/regression_test/compileonly/typeInstantiation/Makefile index 4bd5e8e61f1f57f18c532ac2d7666ecff6e08dcf..a147a05af5fe6d4d337eaf4c3befced6c7e99a1d 100644 --- a/regression_test/compileonly/typeInstantiation/Makefile +++ b/regression_test/compileonly/typeInstantiation/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -26,6 +27,11 @@ GENERATED_SOURCES := $(MODULES:.asn=.cc) GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS := $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/configOper/Makefile b/regression_test/configOper/Makefile index d68941030653b5453bbbbeb9b20f31203a9ffdaf..9531689f940e84446549ad9fdc4caed5e877883f 100644 --- a/regression_test/configOper/Makefile +++ b/regression_test/configOper/Makefile @@ -13,6 +13,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -30,6 +31,11 @@ GENERATED_SOURCES := $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES := configOper_port2.cc USER_HEADERS := $(USER_SOURCES:.cc=.hh) diff --git a/regression_test/controlTimer/Makefile b/regression_test/controlTimer/Makefile index 7d85d58dd08aab7dc1ad546d090d53987e278335..00cecf113e40b2e5194bc006fd66d358def539d9 100644 --- a/regression_test/controlTimer/Makefile +++ b/regression_test/controlTimer/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -27,6 +28,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/customEncoding/Makefile b/regression_test/customEncoding/Makefile index b5d37f282cacc68057d118ab448758717c0bf37a..5d4a4abab2e2bdbc66c64fd9d6b4da9cf12966b7 100644 --- a/regression_test/customEncoding/Makefile +++ b/regression_test/customEncoding/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) $(USER_SOURCES:.cc=.o) diff --git a/regression_test/defaultOper/Makefile b/regression_test/defaultOper/Makefile index 776aef805f4832a7fd3223f4b6809508b6ac67ef..093f8c295502be3324bca0d00da6102a570d7086 100644 --- a/regression_test/defaultOper/Makefile +++ b/regression_test/defaultOper/Makefile @@ -10,6 +10,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/enumOper/Makefile b/regression_test/enumOper/Makefile index 160226a5cae9530f22cc7911dcffae17dcd9d91e..edf0c4f044daf34602b8a5f54f33000f58dcc4a9 100644 --- a/regression_test/enumOper/Makefile +++ b/regression_test/enumOper/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/floatOper/Makefile b/regression_test/floatOper/Makefile index 99a45548c9a537da6cd8d590472d27f4af1c9dba..fc26c4fdca0ca0b9e4036d24583218ebeeca2a8d 100644 --- a/regression_test/floatOper/Makefile +++ b/regression_test/floatOper/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/functionReference/Makefile b/regression_test/functionReference/Makefile index 2d7704362fede3bc64f51a0c4f4343845743ba70..75ac7dd0f4a8002840c8505dcf2e29c69563caff 100644 --- a/regression_test/functionReference/Makefile +++ b/regression_test/functionReference/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/functionSubref/Makefile b/regression_test/functionSubref/Makefile index 9029e613e4f7f034ef89a83c36b1cb5a0658caa1..c90509f55ba1d8528669aafd7cf1798820aba51d 100644 --- a/regression_test/functionSubref/Makefile +++ b/regression_test/functionSubref/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -24,6 +25,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = USER_HEADERS = $(USER_SOURCES:.cc=.hh) diff --git a/regression_test/hexstrOper/Makefile b/regression_test/hexstrOper/Makefile index 228d715dc08ddc3f2888fc787fcbef5ba87a49d1..911b1cbd8c737d3c67005393b5028718482bb39a 100644 --- a/regression_test/hexstrOper/Makefile +++ b/regression_test/hexstrOper/Makefile @@ -9,6 +9,7 @@ # Balasko, Jeno # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -25,6 +26,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/hostid/Makefile b/regression_test/hostid/Makefile index 614df8fa455a0a24ef6b67865af3fdd277a51250..1f18f47801a15fce2c1c583cd715da8b83658a1a 100644 --- a/regression_test/hostid/Makefile +++ b/regression_test/hostid/Makefile @@ -23,6 +23,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = diff --git a/regression_test/iconv/Makefile b/regression_test/iconv/Makefile index e0520e5a3f0b08ece271250434369f59d515bce6..998809e8af9edc32dd9d5212c3df92ee9dcc2860 100644 --- a/regression_test/iconv/Makefile +++ b/regression_test/iconv/Makefile @@ -9,6 +9,7 @@ # Baji, Laszlo # Balasko, Jeno # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -51,6 +52,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif # C/C++ Source & header files of Test Ports, external functions and diff --git a/regression_test/implicitMsgEncoding/Makefile b/regression_test/implicitMsgEncoding/Makefile index c482b0ee03ed2935f118ca8ec51efcf8bb6d8a99..dc0e9bc6273661bd6bf881c3ed4d00bc1a9e368d 100644 --- a/regression_test/implicitMsgEncoding/Makefile +++ b/regression_test/implicitMsgEncoding/Makefile @@ -12,6 +12,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(TTCN3_MODULES:.ttcn=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif # Source & header files of Test Ports and your other modules: diff --git a/regression_test/implicitOmit/Makefile b/regression_test/implicitOmit/Makefile index e091c962c7d5bd508b0e5883d08a4d31fcb19f35..e5c50268a6c24720f7c3f6c4f3b49b7ce2bb34ae 100644 --- a/regression_test/implicitOmit/Makefile +++ b/regression_test/implicitOmit/Makefile @@ -11,6 +11,7 @@ # Balasko, Jeno # Baranyi, Botond # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -52,7 +53,12 @@ ASN1_MODULES = IOAsn.asn # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/intOper/Makefile b/regression_test/intOper/Makefile index 11be01670ad99431bf5463968b41487280224395..b07d020cf7204531700dcaf45e4128cf30b5cbd0 100644 --- a/regression_test/intOper/Makefile +++ b/regression_test/intOper/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = PCOType.cc USER_HEADERS = $(USER_SOURCES:.cc=.hh) diff --git a/regression_test/ipv6/Makefile b/regression_test/ipv6/Makefile index 8aa79d7fcb7b7cd3ad42620017c65769b58a9964..002985f16a56e2ba0c5f9cddf32f60504879f4c6 100644 --- a/regression_test/ipv6/Makefile +++ b/regression_test/ipv6/Makefile @@ -9,6 +9,7 @@ # Balasko, Jeno # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -25,6 +26,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = USER_HEADERS = $(USER_SOURCES:.cc=.hh) diff --git a/regression_test/ispresent/Makefile b/regression_test/ispresent/Makefile index dd4dc0dfbd855153633bbff6d6778424d12f2837..2307b098982f9860ba8ef291460cbd087a851d0c 100644 --- a/regression_test/ispresent/Makefile +++ b/regression_test/ispresent/Makefile @@ -7,6 +7,7 @@ # # Contributors: # Balasko, Jeno +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -23,6 +24,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/json/Makefile b/regression_test/json/Makefile index 2c69459f6c77de89e713a19a53d484ac699a134e..33a6423151deafee35bdf4b94ce730d0b5221717 100644 --- a/regression_test/json/Makefile +++ b/regression_test/json/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = diff --git a/regression_test/junitlogger/Makefile b/regression_test/junitlogger/Makefile index 98682c9ad0a23c6885bb808c85fee202e30f42f5..91eccd03f438c19c978ce0cffb6031e68385952d 100644 --- a/regression_test/junitlogger/Makefile +++ b/regression_test/junitlogger/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Lovassy, Arpad +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -25,6 +26,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/lazyEval/Makefile b/regression_test/lazyEval/Makefile index 20bae6e3361773b40e4770e410793f80b43745de..218091e4897d35c3364e3adccc70ee669f0d0a52 100644 --- a/regression_test/lazyEval/Makefile +++ b/regression_test/lazyEval/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../ @@ -44,12 +45,12 @@ all: $(GENERATED_DIRS) $(DIR_SINGLE): mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) -s -e $(RUNNABLE) ./* && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -s -e $(RUNNABLE) ./* && $(MAKE_PROG) $(DIR_PARALLEL): mkdir $@ cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) -e $(RUNNABLE) ./* && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -e $(RUNNABLE) ./* && $(MAKE_PROG) run: $(GENERATED_DIRS) cd $(DIR_SINGLE) && ./$(RUNNABLE) $(CFG) && grep "Overall verdict: pass" *.log diff --git a/regression_test/logFiles/Makefile b/regression_test/logFiles/Makefile index 8deeea6e513184db46a42b0acaaa8aa6db80b2ab..adeada1ccfaabe451f466dd7b145139b022cf8dd 100644 --- a/regression_test/logFiles/Makefile +++ b/regression_test/logFiles/Makefile @@ -39,6 +39,12 @@ GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +COMPILER_FLAGS += $(SPLIT_FLAG) +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES := $(ABS_SRC)/extfunc.cc diff --git a/regression_test/logger_control/Makefile b/regression_test/logger_control/Makefile index fa9f3cd2ed70b4fd3d837c442659dfff8ffd6da1..62797228c02a3b428ee42418cd5583af5ee2c6b4 100644 --- a/regression_test/logger_control/Makefile +++ b/regression_test/logger_control/Makefile @@ -9,6 +9,7 @@ # Baji, Laszlo # Balasko, Jeno # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -61,7 +62,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES := $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS := $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES := diff --git a/regression_test/logger_control/TitanLoggerControl.ttcn b/regression_test/logger_control/TitanLoggerControl.ttcn deleted file mode 120000 index c2f0bda9816f252d666e086c0d7ba7d6f184390f..0000000000000000000000000000000000000000 --- a/regression_test/logger_control/TitanLoggerControl.ttcn +++ /dev/null @@ -1 +0,0 @@ -../../core/TitanLoggerControl.ttcn \ No newline at end of file diff --git a/regression_test/loggerplugin/Makefile b/regression_test/loggerplugin/Makefile index 76730c380880f5d55b149e990d92583214d9cfbf..274049e22f93e88fb21828aea4a841eb0fd5384d 100644 --- a/regression_test/loggerplugin/Makefile +++ b/regression_test/loggerplugin/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Delic, Adam +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -24,6 +25,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/lostTimer/Makefile b/regression_test/lostTimer/Makefile index 97c3832fe4212288469179edbc44f3918a11cd63..40fe1efce47e6c198c85e5e0973d81236b166145 100644 --- a/regression_test/lostTimer/Makefile +++ b/regression_test/lostTimer/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/macros/Makefile b/regression_test/macros/Makefile index d77fac4d123999f3eaf1bae014eb1c9ce9b7a64e..33fb96cd4013ff562ac86f120ba68052518dc254 100644 --- a/regression_test/macros/Makefile +++ b/regression_test/macros/Makefile @@ -10,6 +10,7 @@ # Czerman, Oliver # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/modifiedTemplate/Makefile b/regression_test/modifiedTemplate/Makefile index 523cb8867a14d3261c8226ef4a991210bc45a64f..8350669c2d0c91b658f71733f84b7cc682fd3a96 100644 --- a/regression_test/modifiedTemplate/Makefile +++ b/regression_test/modifiedTemplate/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/namedActualParameters/Makefile b/regression_test/namedActualParameters/Makefile index 2a5c2b79d1a5f360a53ca6f00fc7041ca17016bc..33bd9c7b8403a059eea8277b88ae6952e59c3641 100644 --- a/regression_test/namedActualParameters/Makefile +++ b/regression_test/namedActualParameters/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -27,6 +28,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/negativeTest/Makefile b/regression_test/negativeTest/Makefile index 9560f992817b56c4e2d3a72e1b9a96df7b4ddddd..c7b0d0b24e06a6870686c405c501e458627a2ab5 100644 --- a/regression_test/negativeTest/Makefile +++ b/regression_test/negativeTest/Makefile @@ -11,6 +11,7 @@ # Delic, Adam # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## ifeq "$(MAKELEVEL)" "0" @@ -49,6 +50,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(TTCN3_MODULES:.ttcn=.hh) $(ASN1_MODULES:.asn=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = diff --git a/regression_test/nonMandatoryPar/Makefile b/regression_test/nonMandatoryPar/Makefile index 0f23d8dcd62d0c0a27786bf44b8aa82fda2de3fe..2705afeca5e7b8523d3eae544a6167ce75a18c09 100644 --- a/regression_test/nonMandatoryPar/Makefile +++ b/regression_test/nonMandatoryPar/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -27,6 +28,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = PCOType.cc USER_HEADERS = $(USER_SOURCES:.cc=.hh) diff --git a/regression_test/objidOper/Makefile b/regression_test/objidOper/Makefile index daa01c42494bf3310c4957e8e18a48a136dbb918..89fdd19ac0637f509fc5a7ea5e287b8ad974581b 100644 --- a/regression_test/objidOper/Makefile +++ b/regression_test/objidOper/Makefile @@ -9,6 +9,7 @@ # Balasko, Jeno # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -28,6 +29,11 @@ GENERATED_SOURCES := $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) $(USER_SOURCES:.cc=.o) diff --git a/regression_test/octetstrOper/Makefile b/regression_test/octetstrOper/Makefile index ad0f22d02e926d126b9c5c6060fc181d4af565e5..a6328e41796e45747c35cbe051e80c23d720c6f9 100644 --- a/regression_test/octetstrOper/Makefile +++ b/regression_test/octetstrOper/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/omitdef/Makefile b/regression_test/omitdef/Makefile index 1ce467064089f0b0549abf8212fa177c4b493132..72a2a4d8040d3ee6f45874f06002166dd3a1d478 100644 --- a/regression_test/omitdef/Makefile +++ b/regression_test/omitdef/Makefile @@ -10,6 +10,7 @@ # Delic, Adam # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # Szabados, Kristof # ############################################################################## @@ -30,6 +31,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(TTCN3_MODULES:.ttcn=.hh) $(ASN1_MODULES:.asn=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif # Source & header files of Test Ports and your other modules: diff --git a/regression_test/pattern_quadruples/Makefile b/regression_test/pattern_quadruples/Makefile index 215bfd2022a3b45827bc21d4534287bdd6d8faa2..9384a59b536ac06685ce5d831cc5035f024ad7c3 100644 --- a/regression_test/pattern_quadruples/Makefile +++ b/regression_test/pattern_quadruples/Makefile @@ -9,6 +9,7 @@ # Balasko, Jeno # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # Zalanyi, Balazs Andor # ############################################################################## @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/preCompilerFlags/Makefile b/regression_test/preCompilerFlags/Makefile index a1d15312c7cc8f15c89016319fb55099fb411fea..4b48737673e38eac908b4a035233d79e41d00f69 100644 --- a/regression_test/preCompilerFlags/Makefile +++ b/regression_test/preCompilerFlags/Makefile @@ -12,6 +12,7 @@ # Dimitrov, Peter # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -31,6 +32,11 @@ GENERATED_SOURCES = $(PREPROCESSED_TTCN:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/predefFunction/Makefile b/regression_test/predefFunction/Makefile index 527ff5a6d343a36b4a9a7c078ed73203907a2c76..48a991c313d7eac824acf0f1119d49da1d96b3c2 100644 --- a/regression_test/predefFunction/Makefile +++ b/regression_test/predefFunction/Makefile @@ -14,6 +14,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -82,6 +83,12 @@ GENERATED_SOURCES := $(notdir $(TTCN3_MODULES:.ttcn=.cc)) GENERATED_HEADERS := $(notdir $(TTCN3_MODULES:.ttcn=.hh)) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +COMPILER_FLAGS += $(SPLIT_FLAG) endif # Source & header files of Test Ports and your other modules: diff --git a/regression_test/profiler/Makefile b/regression_test/profiler/Makefile index dc51e7aa4b1569cbf57f3018661f87c86b9943c0..26e3607d854ce6a73b344a21db39bf35f4703c1a 100644 --- a/regression_test/profiler/Makefile +++ b/regression_test/profiler/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -25,6 +26,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = PIPEasp_PT.cc @@ -43,6 +49,12 @@ PROF_TTCN3_LIB = ttcn3$(RT2_SUFFIX)-parallel$(DYNAMIC_SUFFIX) PROF_GENERATED_SOURCES = $(PROF_MODULES:.ttcn=.cc) PROF_GENERATED_HEADERS = $(PROF_GENERATED_SOURCES:.cc=.hh) +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +PROF_GENERATED_SOURCES2 := $(foreach file, $(PROF_GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +PROF_GENERATED_SOURCES += $(PROF_GENERATED_SOURCES2) +endif PROF_OBJECTS = $(PROF_GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/recofOper/Makefile b/regression_test/recofOper/Makefile index 9b10e78c0963d89ce521e6a018fabcfde8f00a65..301277182f91f4634caf11cd15310fcbe0b931fa 100644 --- a/regression_test/recofOper/Makefile +++ b/regression_test/recofOper/Makefile @@ -12,6 +12,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -37,6 +38,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/recordOper/Makefile b/regression_test/recordOper/Makefile index a00d2a448a17b1c96ded586f811662b28914bf82..e30fb83293a42dbb0a524fccf51a416a145c864c 100644 --- a/regression_test/recordOper/Makefile +++ b/regression_test/recordOper/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/setOper/Makefile b/regression_test/setOper/Makefile index d4290fe8d03acf9c00739a77129a5d1759785a9a..a3fdbe88d31c7a1247837642e8a24f7368122b8c 100644 --- a/regression_test/setOper/Makefile +++ b/regression_test/setOper/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/setofMatch/Makefile b/regression_test/setofMatch/Makefile index 091a2658ab3de6c045cda778cb9d9f85f42fe572..8a5d1b626a8db75da2a098b8b4287166153cefe4 100644 --- a/regression_test/setofMatch/Makefile +++ b/regression_test/setofMatch/Makefile @@ -12,6 +12,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -29,6 +30,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/setofOper/Makefile b/regression_test/setofOper/Makefile index 6dc563a13d0fbc218b3c01dfea551210887daeaf..03266d33ba01684222781169020269904a383b14 100644 --- a/regression_test/setofOper/Makefile +++ b/regression_test/setofOper/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/slider/Makefile b/regression_test/slider/Makefile index ceb717e945f4b94a439856f39f12a4b37bb222f2..940293a19e0ee09b4ce364bf5fd45b83dd189d38 100644 --- a/regression_test/slider/Makefile +++ b/regression_test/slider/Makefile @@ -10,6 +10,7 @@ # Balasko, Jeno # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -64,7 +65,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = PT1.cc UNDER.cc diff --git a/regression_test/templateAnytype/Makefile b/regression_test/templateAnytype/Makefile index 2b82b56d8de3c15cb0d0e97eeed6852bedc70896..fe7ce46a36124d5278518d4df0d992367427864c 100644 --- a/regression_test/templateAnytype/Makefile +++ b/regression_test/templateAnytype/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -24,6 +25,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateBitstr/Makefile b/regression_test/templateBitstr/Makefile index fd94be3bacbfd4b7e2520e79efdac0f778ec2dbb..c934bada2e889857876af017047a56eca4b552df 100644 --- a/regression_test/templateBitstr/Makefile +++ b/regression_test/templateBitstr/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateBool/Makefile b/regression_test/templateBool/Makefile index 94c9c2be768d94ba0da10ee88829ebb4d94c9593..ba6004279cff0cd1191234cfe7e7a9506434b826 100644 --- a/regression_test/templateBool/Makefile +++ b/regression_test/templateBool/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateChar/Makefile b/regression_test/templateChar/Makefile index 52ff300b907cc82f20f5f78d154ccb3e513a95d9..1399d234c4b1eea5bfb3143c53ab4e56b4f5ee08 100644 --- a/regression_test/templateChar/Makefile +++ b/regression_test/templateChar/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateCharstr/Makefile b/regression_test/templateCharstr/Makefile index f8cff2327440fddacecc6e6e2f5bdba4a89a4a9c..72be5a21b77d848ef3f9f223d08265fc0c57087c 100644 --- a/regression_test/templateCharstr/Makefile +++ b/regression_test/templateCharstr/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateEnum/Makefile b/regression_test/templateEnum/Makefile index 77b3b7bfdb936e6ed3e91e06a7743d7b164608da..135a98e68cbd7bb1407beeeb17a2153b65db45ec 100644 --- a/regression_test/templateEnum/Makefile +++ b/regression_test/templateEnum/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateFloat/Makefile b/regression_test/templateFloat/Makefile index ae2d7b0eaded4c2bdbb5c346a5e5a5367bc7543d..87232cc0eed1afa767e37706efdf34641670568c 100644 --- a/regression_test/templateFloat/Makefile +++ b/regression_test/templateFloat/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateHexstr/Makefile b/regression_test/templateHexstr/Makefile index cdc6aae3b0b001c9fc3e1cefdd49a8f6993eb1ef..bd9213e1d2d05c926648e5b0039b81d1a3d53e37 100644 --- a/regression_test/templateHexstr/Makefile +++ b/regression_test/templateHexstr/Makefile @@ -7,6 +7,7 @@ # # Contributors: # Baranyi, Botond – initial implementation +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -23,6 +24,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateInt/Makefile b/regression_test/templateInt/Makefile index 6c1fc7444c20304eb9a78c89485cd86b99cc99fa..ecab0730c95f931190522a26d25fb92192476426 100644 --- a/regression_test/templateInt/Makefile +++ b/regression_test/templateInt/Makefile @@ -12,6 +12,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -29,6 +30,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateOctetstr/Makefile b/regression_test/templateOctetstr/Makefile index de278d95998b2f2cc87c9435bff233de5d71dc40..3950333fc152d5c09f0f1b809393da0725413f44 100644 --- a/regression_test/templateOctetstr/Makefile +++ b/regression_test/templateOctetstr/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateOmit/LegacyTests/Makefile b/regression_test/templateOmit/LegacyTests/Makefile index 6d7d5e4829b35ad0ed07488010d6ab482f80f12f..145258c29274c723906f37e5cca03c3176dcec55 100644 --- a/regression_test/templateOmit/LegacyTests/Makefile +++ b/regression_test/templateOmit/LegacyTests/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateOmit/NewTests/Makefile b/regression_test/templateOmit/NewTests/Makefile index c2d82294c2796ccd09d1d3345887b4ec7c9aefaa..92c148737ffa0d9b016c9cfc196b3742c1212d56 100644 --- a/regression_test/templateOmit/NewTests/Makefile +++ b/regression_test/templateOmit/NewTests/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR := ../.. @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateRec/Makefile b/regression_test/templateRec/Makefile index 10888b9df9965a253a7e1475ab370ada245d11bb..9ad7ee18c98c57c892cecd10af7567a4df981dcb 100644 --- a/regression_test/templateRec/Makefile +++ b/regression_test/templateRec/Makefile @@ -12,6 +12,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -34,6 +35,11 @@ COMPILER_FLAGS += -M ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateRecof/Makefile b/regression_test/templateRecof/Makefile index a583290b85dcc8a6cdd5334f0368928cbfffee64..ab64eeefc7a42e5740b85e8da0d4c348231fa7b8 100644 --- a/regression_test/templateRecof/Makefile +++ b/regression_test/templateRecof/Makefile @@ -12,6 +12,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -29,6 +30,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateSet/Makefile b/regression_test/templateSet/Makefile index b441625ff4509fb36e2d28b77be5d7d2338a5184..8d46b980f65313c421f81e3ea62afc026c271f26 100644 --- a/regression_test/templateSet/Makefile +++ b/regression_test/templateSet/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateSetof/Makefile b/regression_test/templateSetof/Makefile index b9154d56d48d14e80016c08d4061bc7d176d738b..9753461ebc3b01b694d85b818c4736ee63da5f0e 100644 --- a/regression_test/templateSetof/Makefile +++ b/regression_test/templateSetof/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateUnicharstr/Makefile b/regression_test/templateUnicharstr/Makefile index 9a99c779b00cefb20978bfbc8896e079f3d6c3fe..d299465811275ffdb051fe877afda672bee0306b 100644 --- a/regression_test/templateUnicharstr/Makefile +++ b/regression_test/templateUnicharstr/Makefile @@ -7,6 +7,7 @@ # # Contributors: # Botond, Baranyi – initial implementation +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -23,6 +24,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/templateUnion/Makefile b/regression_test/templateUnion/Makefile index ea2dc17b85306b2879720b7b0904efbbafcffcd3..4565c66c2d80055aae1664376d14f9689fb9982c 100644 --- a/regression_test/templateUnion/Makefile +++ b/regression_test/templateUnion/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/testcase_defparam/Makefile b/regression_test/testcase_defparam/Makefile index 63954cad311b9f38f6a8ea86362a9ed705a7d140..e2f7625d377560069e68e564c5a69af25ebb1c24 100644 --- a/regression_test/testcase_defparam/Makefile +++ b/regression_test/testcase_defparam/Makefile @@ -10,6 +10,7 @@ # Balasko, Jeno # Baranyi, Botond # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -62,7 +63,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/text2ttcn/Makefile b/regression_test/text2ttcn/Makefile index a643db2f5f95b48f1ba3460a37ea8116c86ea9ce..bf55c5beb973be8dd84690d20f0a0a4d5c878187 100644 --- a/regression_test/text2ttcn/Makefile +++ b/regression_test/text2ttcn/Makefile @@ -48,12 +48,12 @@ all: $(GENERATED_DIRS) $(DIR_SINGLE): mkdir $@ cd $@ && for file in $(SINGLE_FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) -sM -e $(RUNNABLE) ./* && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -sM -e $(RUNNABLE) ./* && $(MAKE_PROG) $(DIR_PARALLEL): mkdir $@ cd $@ && for file in $(PARALLEL_FILES); do ln -s ../$$file || exit; done - cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) -M -e $(RUNNABLE) ./* && $(MAKE_PROG) + cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -M -e $(RUNNABLE) ./* && $(MAKE_PROG) run: $(GENERATED_DIRS) cd $(DIR_SINGLE) && ./$(RUNNABLE) $(SINGLE_CFG) && grep "Overall verdict: pass" *.log diff --git a/regression_test/transparent/Makefile b/regression_test/transparent/Makefile index 4c7456be9a37797fb663b1f9fb970ac4777437bd..e1842b782e468f4fd34e2811dc53bf30a18b2686 100644 --- a/regression_test/transparent/Makefile +++ b/regression_test/transparent/Makefile @@ -9,6 +9,7 @@ # Baji, Laszlo # Balasko, Jeno # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -71,7 +72,12 @@ ASN1_MODULES = # this project: GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) - +ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) +endif # C/C++ Source & header files of Test Ports, external functions and # other modules: USER_SOURCES = diff --git a/regression_test/tryCatch/Makefile b/regression_test/tryCatch/Makefile index 032c5a96561e89dc1a5f9691dc95ccff634e3c8e..fa23d0391a2d8aca105aca5f1804927ef95405fd 100644 --- a/regression_test/tryCatch/Makefile +++ b/regression_test/tryCatch/Makefile @@ -7,6 +7,7 @@ # # Contributors: # Balasko, Jeno +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(TTCN3_MODULES:.ttcn=.hh) $(ASN1_MODULES:.asn=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = external_function.cc PCOType.cc diff --git a/regression_test/ttcn2json/Makefile b/regression_test/ttcn2json/Makefile index 751baf1cd6ae02336c847fa23f3301dd9cb35c8d..9f87fc117a6d3a3233ef9ca73816410015c9f307 100644 --- a/regression_test/ttcn2json/Makefile +++ b/regression_test/ttcn2json/Makefile @@ -8,6 +8,7 @@ # Contributors: # Balasko, Jeno # Baranyi, Botond +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = PIPEasp_PT.cc f_ext_import_schema.cc diff --git a/regression_test/typeCompat/Makefile b/regression_test/typeCompat/Makefile index f8733648c4376dd2d340cd534f6ff81b2a8e4635..c11d5d8622ab03b8d377b94e74f098f7b7b88f90 100644 --- a/regression_test/typeCompat/Makefile +++ b/regression_test/typeCompat/Makefile @@ -10,6 +10,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -33,6 +34,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) GENERATED_HEADERS = $(TTCN3_MODULES:.ttcn=.hh) $(ASN1_MODULES:.asn=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = diff --git a/regression_test/ucharstrOper/Makefile b/regression_test/ucharstrOper/Makefile index bdc679af67641f1e9cfbce3ccc70cebf606ebdfe..134d46fa8141da998f82cae9997068a63add32a5 100644 --- a/regression_test/ucharstrOper/Makefile +++ b/regression_test/ucharstrOper/Makefile @@ -28,6 +28,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = external.cc diff --git a/regression_test/uidChars/Makefile b/regression_test/uidChars/Makefile index 940f663de83b71563efcbe016cf1bc17f7a986a7..1d6671eea96fe43c4619597f20a2db9a3797d665 100644 --- a/regression_test/uidChars/Makefile +++ b/regression_test/uidChars/Makefile @@ -23,6 +23,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif USER_SOURCES = diff --git a/regression_test/unionOper/Makefile b/regression_test/unionOper/Makefile index 0ff192cfc9133c83ef87e7f1eb38450c7d7685a2..95d6861ce46d48d416f010516457746deaf18b70 100644 --- a/regression_test/unionOper/Makefile +++ b/regression_test/unionOper/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/verdictOper/Makefile b/regression_test/verdictOper/Makefile index 72a88aa314211fb0962887f8b6924e2d611e8f47..1e480b612f5e737274692680eb208d006b933ad5 100644 --- a/regression_test/verdictOper/Makefile +++ b/regression_test/verdictOper/Makefile @@ -11,6 +11,7 @@ # Kovacs, Ferenc # Raduly, Csaba # Szabados, Kristof +# Szabo, Bence Janos # Szabo, Janos Zoltan – initial implementation # ############################################################################## @@ -28,6 +29,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/regression_test/visibility/Makefile b/regression_test/visibility/Makefile index d66454e132bd47dccc1af770aaf9c37bb03ad7b8..3718c74ff4b3246248ae7680b0805def7c715551 100644 --- a/regression_test/visibility/Makefile +++ b/regression_test/visibility/Makefile @@ -10,6 +10,7 @@ # Czerman, Oliver # Kovacs, Ferenc # Raduly, Csaba +# Szabo, Bence Janos # ############################################################################## TOPDIR := .. @@ -26,6 +27,11 @@ GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) ifdef CODE_SPLIT GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc _seqof.cc _setof.cc _union.cc)) +else ifdef SPLIT_TO_SLICES +POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_)) +POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc)) +GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES))) +GENERATED_SOURCES += $(GENERATED_SOURCES2) endif OBJECTS = $(GENERATED_SOURCES:.cc=.o) diff --git a/usrguide/referenceguide.doc b/usrguide/referenceguide.doc index b10a84cac88c9b07aa60bed6b64280a25a765140..5fb6ad7ba2f806cdc0c3f72b50bd1c862b1864f8 100644 Binary files a/usrguide/referenceguide.doc and b/usrguide/referenceguide.doc differ