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

Scilab: new option to use a script to set build flags

Browse source
This commit is contained in:
Simon Marchetto 2013-09-11 18:50:36 +02:00
commit 565dd5661e
1 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Source/Modules/scilab.cxx
View file

@ -21,7 +21,8 @@ Scilab options (available with -scilab)\n\
-addcflag <opt> - Additional include options <opt> to include in build script\n\ -addcflag <opt> - Additional include options <opt> to include in build script\n\
-addldflag <opt> - Additional link options <opt> to include in build script\n\ -addldflag <opt> - Additional link options <opt> to include in build script\n\
-addsrc <files> - Additional comma separated source <files> to include in build script\n\ -addsrc <files> - Additional comma separated source <files> to include in build script\n\
-vbl <level> - Sets the build verbose <level> (default 0)\n\n"; -vbl <level> - Sets the build verbose <level> (default 0)\n\
-flagscript <file> - Uses a Scilab script to set build flags\n\n";
static const char *SWIG_INIT_FUNCTION_NAME = "SWIG_Init"; static const char *SWIG_INIT_FUNCTION_NAME = "SWIG_Init";
static const char *SWIG_CREATE_VARIABLES_FUNCTION_NAME = "SWIG_CreateScilabVariables"; static const char *SWIG_CREATE_VARIABLES_FUNCTION_NAME = "SWIG_CreateScilabVariables";
@ -46,6 +47,7 @@ protected:
String *ldflag; String *ldflag;
String *verboseBuildLevel; String *verboseBuildLevel;
String *buildFlagsScript;
public: public:
/* ------------------------------------------------------------------------ /* ------------------------------------------------------------------------
* main() * main()
@ -56,6 +58,7 @@ public:
ldflag = NULL; ldflag = NULL;
cflag = NULL; cflag = NULL;
verboseBuildLevel = NULL; verboseBuildLevel = NULL;
buildFlagsScript = NULL;
/* Manage command line arguments */ /* Manage command line arguments */
for (int argIndex = 1; argIndex < argc; argIndex++) { for (int argIndex = 1; argIndex < argc; argIndex++) {
@ -88,6 +91,10 @@ public:
Swig_mark_arg(argIndex); Swig_mark_arg(argIndex);
verboseBuildLevel = NewString(argv[argIndex + 1]); verboseBuildLevel = NewString(argv[argIndex + 1]);
Swig_mark_arg(argIndex + 1); Swig_mark_arg(argIndex + 1);
} else if (strcmp(argv[argIndex], "-flagscript") == 0) {
Swig_mark_arg(argIndex);
buildFlagsScript = NewString(argv[argIndex + 1]);
Swig_mark_arg(argIndex + 1);
} }
} }
} }
@ -159,19 +166,28 @@ public:
Printf(builderCode, "ilib_name = \"%slib\";\n", moduleName); Printf(builderCode, "ilib_name = \"%slib\";\n", moduleName);
Printf(builderCode, "libs = [];\n"); Printf(builderCode, "libs = [];\n");
// Flags from command line arguments
Printf(builderCode, "cflags = \"-I\" + builddir;\n");
if (cflag != NULL) {
Printf(builderCode, "cflags = cflags + \" %s\";\n", cflag);
}
if (ldflag != NULL) { if (ldflag != NULL) {
Printf(builderCode, "ldflags = \"%s\";\n", ldflag); Printf(builderCode, "ldflags = \"%s\";\n", ldflag);
} else { }
Printf(builderCode, "ldflags = \"\";\n"); else {
Printf(builderCode, "ldflags = [];\n");
} }
Printf(builderCode, "cflags = [\"-g -I\" + builddir];\n"); // External script to set flags
if (cflag != NULL) { if (buildFlagsScript) {
Printf(builderCode, "includepath = \"%s\";\n", cflag); Printf(builderCode, "exec(\"%s\");\n", buildFlagsScript);
Printf(builderCode, "includepath = fullpath(part(includepath, 3:length(includepath)));\n"); Printf(builderCode, "cflags = cflags + getCompilationFlags();\n");
Printf(builderCode, "cflags = cflags + \" -I\" + includepath;\n"); Printf(builderCode, "ldflags = ldflags + getLinkFlags();\n");
} }
// Additional sources
DohInsertitem(sourceFileList, 0, outputFilename); DohInsertitem(sourceFileList, 0, outputFilename);
for (int i = 0; i < Len(sourceFileList); i++) { for (int i = 0; i < Len(sourceFileList); i++) {
String *sourceFile = Getitem(sourceFileList, i); String *sourceFile = Getitem(sourceFileList, i);