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

remove -nobuilder option

Browse source
This commit is contained in:
Simon Marchetto 2015-01-26 12:29:40 +01:00
commit 0544765abd
3 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Doc/Manual/Scilab.html
View file

@ -274,11 +274,6 @@ The following table lists the Scilab specific command line options in addition t
<td>Use the Scilab script &lt;file&gt; to configure the compiler and linker flags</td> <td>Use the Scilab script &lt;file&gt; to configure the compiler and linker flags</td>
</tr> </tr>
<tr>
<td><tt>-nobuilder</tt></td>
<td>Do not generate the Scilab builder script (default)</td>
</tr>
<tr> <tr>
<td><tt>-gatewayxml &lt;gateway_id&gt;</tt></td> <td><tt>-gatewayxml &lt;gateway_id&gt;</tt></td>
<td>Generate the gateway XML with the given &lt;gateway_id&gt;</td> <td>Generate the gateway XML with the given &lt;gateway_id&gt;</td>

4
Examples/Makefile.in
View file

@ -1710,7 +1710,7 @@ SCILAB_LIBPREFIX = lib
# ---------------------------------------------------------------- # ----------------------------------------------------------------
scilab: scilab:
$(SWIG) -scilab -nobuilder $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH) $(SWIG) -scilab $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(CPPFLAGS) $(CFLAGS) $(SCILAB_INC) $(INCLUDES) $(ISRCS) $(SRCDIR_SRCS) $(SRCDIR_CSRCS) $(CC) -c $(CCSHARED) $(CPPFLAGS) $(CFLAGS) $(SCILAB_INC) $(INCLUDES) $(ISRCS) $(SRCDIR_SRCS) $(SRCDIR_CSRCS)
$(LDSHARED) $(CFLAGS) $(LDFLAGS) $(IOBJS) $(OBJS) $(LIBS) -o $(SCILAB_LIBPREFIX)$(TARGET)$(SO) $(LDSHARED) $(CFLAGS) $(LDFLAGS) $(IOBJS) $(OBJS) $(LIBS) -o $(SCILAB_LIBPREFIX)$(TARGET)$(SO)
@ -1719,7 +1719,7 @@ scilab:
# ---------------------------------------------------------------- # ----------------------------------------------------------------
scilab_cpp: scilab_cpp:
$(SWIG) -c++ -scilab -nobuilder $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH) $(SWIG) -c++ -scilab $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SCILAB_INC) $(INCLUDES) $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SCILAB_INC) $(INCLUDES) $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS)
$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(IOBJS) $(OBJS) $(LIBS) $(CPP_DLLIBS) -o $(SCILAB_LIBPREFIX)$(TARGET)$(SO) $(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(IOBJS) $(OBJS) $(LIBS) $(CPP_DLLIBS) -o $(SCILAB_LIBPREFIX)$(TARGET)$(SO)

5
Source/Modules/scilab.cxx
View file

@ -25,7 +25,6 @@ Scilab options (available with -scilab)\n \
-buildersources <files> - Add the (comma separated) files <files> to the builder sources\n \ -buildersources <files> - Add the (comma separated) files <files> to the builder sources\n \
-builderverbositylevel <level> - Set the builder verbosity level to <level> (default 0: off, 2: high)\n \ -builderverbositylevel <level> - Set the builder verbosity level to <level> (default 0: off, 2: high)\n \
-gatewayxml <gateway_id> - Generate gateway xml with the given <gateway_id>\n \ -gatewayxml <gateway_id> - Generate gateway xml with the given <gateway_id>\n \
-nobuilder - Do not generate the Scilab builder script (default)\n \
\n"; \n";
@ -132,10 +131,6 @@ public:
Swig_mark_arg(argIndex); Swig_mark_arg(argIndex);
buildFlagsScript = NewString(argv[argIndex + 1]); buildFlagsScript = NewString(argv[argIndex + 1]);
Swig_mark_arg(argIndex + 1); Swig_mark_arg(argIndex + 1);
} else if (strcmp(argv[argIndex], "-nobuilder") == 0) {
Swig_mark_arg(argIndex);
generateBuilder = false;
createLoader = true;
} else if (strcmp(argv[argIndex], "-gatewayxml") == 0) { } else if (strcmp(argv[argIndex], "-gatewayxml") == 0) {
Swig_mark_arg(argIndex); Swig_mark_arg(argIndex);
createGatewayXML = true; createGatewayXML = true;