jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scilab: rename build command line options

Browse source
This commit is contained in:
Simon Marchetto 2014-10-21 17:00:51 +02:00
commit fd1e387a0e
2 changed files with 44 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Doc/Manual/Scilab.html
View file

@ -256,33 +256,38 @@ The following table lists the Scilab specific command line options in addition t
<table summary="Scilab specific options">
<tr>
<td>-addcflags &lt;cflags&gt;</td>
<td>Add compiler flags &lt;cflags&gt;</td>
<td>-builder</td>
<td>Generate the Scilab builder script (default)</td>
</tr>
<tr>
<td>-addldflags &lt;ldflags&gt;</td>
<td>Add linker flags &lt;ldflags&gt;</td>
<td>-buildercflags &lt;cflags&gt;</td>
<td>Add &lt;cflags&gt; to the builder compiler flags</td>
</tr>
<tr>
<td>-addsources &lt;files&gt;</td>
<td>Add comma separated source files &lt;files&gt;</td>
<td>-builderldflags &lt;ldflags&gt;</td>
<td>Add &lt;ldlags&gt; to the builder linker flags</td>
</tr>
<tr>
<td>-buildverbositylevel &lt;level&gt;</td>
<td>Set the build verbosity &lt;level&gt; (default 0)</td>
<td>-buildersources &lt;files&gt;</td>
<td>Add the (comma separated) files &lt;files&gt; to the builder sources</td>
</tr>
<tr>
<td>-buildflags &lt;file&gt;</td>
<td>Use the Scilab script &lt;file&gt; to set build flags</td>
<td>-builderverbositylevel &lt;level&gt;</td>
<td>Set the build verbosity level to &lt;level&gt; (default 0)</td>
</tr>
<tr>
<td>-builderflagscript &lt;file&gt;</td>
<td>Use the Scilab script &lt;file&gt; to configure the compiler and linker flags</td>
</tr>
<tr>
<td>-nobuilder</td>
<td>Do not generate builder script</td>
<td>Do not generate the Scilab builder script</td>
</tr>
<tr>
@ -305,9 +310,9 @@ Some examples:
</p>
<div class="shell"><pre>
$ swig -scilab -addcflags -I/usr/includes example.i
$ swig -scilab -addldflags "-lm example.i"
$ swig -scilab -addsources file1.cxx,file2.cxx,example.i
$ swig -scilab -buildercflags -I/usr/includes example.i
$ swig -scilab -builderldflags "-lm example.i"
$ swig -scilab -buildersources file1.cxx,file2.cxx,example.i
</pre></div>
</p>
@ -1859,9 +1864,9 @@ To generate the code and the builder script, the following options may be used w
</p>
<ul>
<li><tt><b>addsources</b></tt>: to add source files to build with</li>
<li><tt><b>addcflags</b></tt>: to add compiler flags (to set header include paths....)</li>
<li><tt><b>addldflags</b></tt>: to add linker flags (to set library paths and names...)</li>
<li><tt><b>buildersources</b></tt>: to add sources to the sources to the builder sources</li>
<li><tt><b>buildercflags</b></tt>: to add compiler flags to the builder (to add include paths, for example)</li>
<li><tt><b>builderldflags</b></tt>: to add linker flags to the builder (to add library dependencies, for example)</li>
</ul>
<p>
@ -1869,7 +1874,7 @@ The SWIG command to use may be something like this:
</p>
<div class="shell"><pre>
swig -scilab -addcflags "-I[inc_path]..." -addsources [source],... -addldflags "-L[lib_path] -l[lib_name]" [module_name].i
swig -scilab -buildercflags "-I[inc_path]..." -buildersources [source],... -builderldflags "-L[lib_path] -l[lib_name]" [module_name].i
</pre></div>
<H3><a name="Scilab_module_builder"></a>37.5.4 Builder script</H3>

35
Source/Modules/scilab.cxx
View file

@ -19,15 +19,17 @@
#define SCILAB_VARIABLE_NAME_CHAR_MAX SCILAB_IDENTIFIER_NAME_CHAR_MAX - 4
static const char *usage = (char *) "\
Scilab options (available with -scilab)\n\
-addcflags <cflags> - Add compiler flags <cflags>\n\
-addldflags <ldflags> - Add linker flags <ldflags>\n\
-addsources <files> - Add comma separated source files <files>\n\
-buildflags <file> - Use the Scilab script <file> to set build flags\n\
-buildverbositylevel <level> - Set the build verbosity <level> (default 0)\n\
-gatewayxml <gateway_id> - Generate gateway xml with the given <gateway_id>\n\
-nobuilder - Do not generate builder script\n\n";
static const char *usage = (char *) " \
Scilab options (available with -scilab)\n \
-builder - Generate a Scilab builder script (default)\n \
-buildercflags <cflags> - Add <cflags> to the builder compiler flags\n \
-builderldflags <ldflags> - Add <ldflags> to the builder linker flags\n \
-buildersources <files> - Add the (comma separated) files <files> to the builder sources\n \
-builderflagscript <file> - Set the Scilab script <file> to use by builder to configure the build flags\n \
-builderverbositylevel <level> - Set the builder verbosity level to <level> (default 0)\n \
-nobuilder - Do not generate the Scilab builder script\n \
-gatewayxml <gateway_id> - Generate gateway xml with the given <gateway_id>\n\n";
class SCILAB:public Language {
protected:
@ -100,7 +102,12 @@ public:
if (argv[argIndex] != NULL) {
if (strcmp(argv[argIndex], "-help") == 0) {
Printf(stdout, "%s\n", usage);
} else if (strcmp(argv[argIndex], "-addsources") == 0) {
} else if (strcmp(argv[argIndex], "-builder") == 0) {
Swig_mark_arg(argIndex);
generateBuilder = true;
createGatewaySource = false;
createLoader = false;
} else if (strcmp(argv[argIndex], "-buildersources") == 0) {
if (argv[argIndex + 1] != NULL) {
Swig_mark_arg(argIndex);
char *sourceFile = strtok(argv[argIndex + 1], ",");
@ -110,23 +117,23 @@ public:
}
Swig_mark_arg(argIndex + 1);
}
} else if (strcmp(argv[argIndex], "-addcflags") == 0) {
} else if (strcmp(argv[argIndex], "-buildercflags") == 0) {
Swig_mark_arg(argIndex);
if (argv[argIndex + 1] != NULL) {
Insert(cflags, Len(cflags), argv[argIndex + 1]);
Swig_mark_arg(argIndex + 1);
}
} else if (strcmp(argv[argIndex], "-addldflags") == 0) {
} else if (strcmp(argv[argIndex], "-builderldflags") == 0) {
Swig_mark_arg(argIndex);
if (argv[argIndex + 1] != NULL) {
Insert(ldflags, Len(ldflags), argv[argIndex + 1]);
Swig_mark_arg(argIndex + 1);
}
} else if (strcmp(argv[argIndex], "-buildverbositylevel") == 0) {
} else if (strcmp(argv[argIndex], "-builderverbositylevel") == 0) {
Swig_mark_arg(argIndex);
verboseBuildLevel = NewString(argv[argIndex + 1]);
Swig_mark_arg(argIndex + 1);
} else if (strcmp(argv[argIndex], "-buildflags") == 0) {
} else if (strcmp(argv[argIndex], "-builderflagscript") == 0) {
Swig_mark_arg(argIndex);
buildFlagsScript = NewString(argv[argIndex + 1]);
Swig_mark_arg(argIndex + 1);