diff --git a/compiler2/makefile.c b/compiler2/makefile.c
index a72983066d029f0c669661619542641a89081e20..e141b4dece065857d35c9fbdbfeb3f1abd16ea43 100644
--- a/compiler2/makefile.c
+++ b/compiler2/makefile.c
@@ -4023,7 +4023,7 @@ static void generate_makefile(size_t n_arguments, char *arguments[],
static void usage(void)
{
fprintf(stderr, "\n"
- "usage: %s [-abc" C_flag "dDEfFglLmMnprRstTVwWXZ] [-K file] [-z file ] [-P dir]"
+ "usage: %s [-abc" C_flag "dDEfFglLmMnprRsStTVwWXZ] [-K file] [-z file ] [-P dir]"
" [-U none|type] [-e ets_name] [-o dir|file]\n"
" [-t project_descriptor.tpd [-b buildconfig]]\n"
" [-O file] ... module_name ... testport_name ...\n"
@@ -4052,9 +4052,10 @@ static void usage(void)
" -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"
" -v: show version\n"
- " -w: suppress warnings\n"
+ " -w: suppress warnings generated by TITAN\n"
" -Y: Enforces legacy behaviour of the \"out\" function parameters (see refguide)\n"
" -z file: enable profiling and code coverage for the TTCN-3 files in the argument\n"
"Options for processing the Titan Project Descriptor file(s):\n"
@@ -4112,7 +4113,7 @@ int main(int argc, char *argv[])
dsflag = FALSE, dbflag = FALSE, drflag = FALSE, dtflag = FALSE,
dxflag = FALSE, fxflag = FALSE, doflag = FALSE,
gfflag = FALSE, lnflag = FALSE, isflag = FALSE, asflag = FALSE,
- swflag = FALSE, Vflag = FALSE, Dflag = FALSE, Wflag = FALSE,
+ Sflag = FALSE, Vflag = FALSE, Dflag = FALSE, Wflag = FALSE,
djflag = FALSE, Zflag = FALSE, Hflag = FALSE, Mflag = FALSE,
diflag = FALSE, zflag = FALSE, Eflag = FALSE, nflag = FALSE;
boolean error_flag = FALSE;
@@ -4171,7 +4172,7 @@ int main(int argc, char *argv[])
}
for ( ; ; ) {
- int c = getopt(argc, argv, "O:ab:c" C_flag "dDe:EfFgI:K:o:lLmMnpP:rRst:TU:vVwWXYz:ZH");
+ int c = getopt(argc, argv, "O:ab:c" C_flag "dDe:EfFgI:K:o:lLmMnpP:rRsSt:TU:vVwWXYz:ZH");
if (c == -1) break;
switch (c) {
case 'O':
@@ -4272,6 +4273,10 @@ int main(int argc, char *argv[])
case 's':
SET_FLAG(s);
break;
+ case 'S':
+ SET_FLAG(S);
+ suppress_warnings = TRUE;
+ break;
case 't':
SET_FLAG(t);
tpd_file_name = optarg;
@@ -4298,7 +4303,6 @@ int main(int argc, char *argv[])
break;
case 'w':
SET_FLAG(w);
- suppress_warnings = TRUE;
break;
case 'W':
SET_FLAG(W);
@@ -4379,6 +4383,11 @@ int main(int argc, char *argv[])
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 =
@@ -4511,7 +4520,7 @@ int main(int argc, char *argv[])
&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, &swflag, &Yflag, &Mflag, &Eflag, &nflag, &diflag, solspeclibraries, sol8speclibraries, linuxspeclibraries, freebsdspeclibraries, win32speclibraries, &ttcn3prep,
+ &asflag, &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);
@@ -4550,7 +4559,7 @@ int main(int argc, char *argv[])
Rflag, lflag, mflag, Cflag, code_splitting_mode, tcov_file_name, profiled_file_list,
Lflag, Zflag, Hflag, rflag ? sub_project_dirs : NULL, 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, swflag, Yflag, Mflag, Eflag, nflag, diflag, solspeclibraries,
+ drflag, dtflag, dxflag, djflag, fxflag, doflag, gfflag, lnflag, isflag, asflag, wflag, Yflag, Mflag, Eflag, nflag, diflag, solspeclibraries,
sol8speclibraries, linuxspeclibraries, freebsdspeclibraries, win32speclibraries, ttcn3prep, linkerlibraries, additionalObjects,
linkerlibsearchpath, generatorCommandOutput, target_placement_list);
}
diff --git a/compiler2/ttcn3_makefilegen.1 b/compiler2/ttcn3_makefilegen.1
index a99b01d834fc80900bba0a939bb437ef0ca1af17..2717aa4c6fadebc7abe01b06d0d7a76137153ad4 100644
--- a/compiler2/ttcn3_makefilegen.1
+++ b/compiler2/ttcn3_makefilegen.1
@@ -3,7 +3,7 @@
ttcn3_makefilegen \- Makefile Generator
.SH SYNOPSIS
.B ttcn3_makefilegen
-.RB "[\| " \-acdEfglMnpRsw " \|]"
+.RB "[\| " \-acdEfglMnpRsSw " \|]"
.RB "[\| " \-e
.IR " ETS_name" " \|]"
.RB "[\| " \-o
@@ -146,6 +146,11 @@ Generates a Makefile, which links the executable test suite with the
version of the base library. If this switch is omitted the executable is
built for parallel mode by default.
.TP
+.B \-S
+Supresses all
+.I makefilegen
+warning messages.
+.TP
.B \-v
Prints
.I version
@@ -154,7 +159,7 @@ and license key information and exits.
.B \-w
Suppresses all
.I warning
-messages.
+messages gerenated by TITAN.
.TP
.BI \-z " file"
Enables code coverage and profiling in the TTCN-3 files listed in the
diff --git a/usrguide/referenceguide.doc b/usrguide/referenceguide.doc
index 5bade5bcf13feaf27b12701829115d35a7dc6d71..91e79f883cfad220cdabb1da696a63ed1a311787 100644
Binary files a/usrguide/referenceguide.doc and b/usrguide/referenceguide.doc differ