" -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"
+ " -S: suppress makefilegen warnings\n"
" -U none|type: split generated code\n"
" -v: show version\n"
" -w: suppress warnings generated by TITAN\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);
}
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) {