}
/** 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);
+ }
}
}
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) {
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);
}
}
}
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) {
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);
}
}
}
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);
}
}
}
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);
}
}
}
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);
}
}
}
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);
}
}
}
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) {
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);
}
}
}
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);
}
}
}
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);
}
}
}
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) {
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);
+ }
}
+ }
}
}
}
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);
+ }
}
+ }
}
}
}
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) {
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);
+ }
}
+ }
}
}
}
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);
+ }
}
+ }
}
}
}
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++) {
{
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"
" -p: generate Makefile with TTCN-3 preprocessing\n"
" -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"
+ " -S: suppress makefilegen warnings\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"
" -X: generate XML file that describes the TPD hierarchy, use with -r\n"
" -W: prefix working directories with project name\n"
" -Z: recursive Makefile generation from TPD using object files and dynamic libraries too\n"
- " -H: hierachical Makefile generation from TPD use with -Z\n"
+ " -H: hierarchical Makefile generation from TPD use with -Z\n"
, program_name, program_name);
}
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);
ERROR("Using the '-I' option requires use of the '-t' option.");
error_flag = TRUE;
}
-
- if (wflag && tflag) {
- ERROR("The usage of '-w' option is not allowed when the '-t' option is present.");
- error_flag = TRUE;
- }
for (size_t i = 0; i < n_search_paths; i++) {
boolean is_abs_path =
required_configs->str2 = NULL;
required_configs->next = NULL;
+ // This temp flag is used to get the value of suppressWarnings from the TPD
+ // while the wflag still holds the value of the command line parameter -w
+ boolean temp_wflag = FALSE;
+
tpd_processed = process_tpd(tpd_file_name, tpd_build_config, file_list_path,
&argc, &argv, &optind, &ets_name, &project_name,
&gflag, &sflag, &cflag, &aflag, &pflag,
&Rflag, &lflag, &mflag, &Pflag, &Lflag, rflag, Fflag, Tflag, output_file, &abs_work_dir, sub_project_dirs, program_name, prj_graph_fp,
create_symlink_list,ttcn3_prep_includes, ttcn3_prep_defines,ttcn3_prep_undefines, prep_includes, prep_defines, prep_undefines, &csflag,
&quflag, &dsflag, &cxxcompiler, &optlevel, &optflags, &dbflag, &drflag, &dtflag, &dxflag, &djflag, &fxflag, &doflag, &gfflag, &lnflag, &isflag,
- &asflag, &wflag, &Yflag, &Mflag, &Eflag, &nflag, &diflag, solspeclibraries, sol8speclibraries, linuxspeclibraries, freebsdspeclibraries, win32speclibraries, &ttcn3prep,
+ &asflag, &temp_wflag, &Yflag, &Mflag, &Eflag, &nflag, &diflag, solspeclibraries, sol8speclibraries, linuxspeclibraries, freebsdspeclibraries, win32speclibraries, &ttcn3prep,
linkerlibraries, additionalObjects, linkerlibsearchpath, Vflag, Dflag, &Zflag, &Hflag,
&generatorCommandOutput, target_placement_list, Wflag, run_command_list, required_configs, &profiled_file_list, search_paths, n_search_paths);
+
+ // wflag overrides temp_wflag
+ if (!wflag) {
+ wflag = temp_wflag;
+ }
Free(abs_work_dir);
if (prj_graph_fp) {
projects / deliverable / titan.core.git / blobdiff