From 0544765abd61ca13b76fedbee56c836efb8289a2 Mon Sep 17 00:00:00 2001
From: Simon Marchetto <simon.marchetto@scilab-enterprises.com>
Date: Mon, 26 Jan 2015 12:29:40 +0100
Subject: [PATCH] remove -nobuilder option

---
 Doc/Manual/Scilab.html    | 5 -----
 Examples/Makefile.in      | 4 ++--
 Source/Modules/scilab.cxx | 5 -----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/Doc/Manual/Scilab.html b/Doc/Manual/Scilab.html
index 2aa1c8933..c2d5ff094 100644
--- a/Doc/Manual/Scilab.html
+++ b/Doc/Manual/Scilab.html
@@ -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>
 </tr>
 
-<tr>
-<td><tt>-nobuilder</tt></td>
-<td>Do not generate the Scilab builder script (default)</td>
-</tr>
-
 <tr>
 <td><tt>-gatewayxml &lt;gateway_id&gt;</tt></td>
 <td>Generate the gateway XML with the given &lt;gateway_id&gt;</td>
diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 7ac291cbf..6520f6e2b 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1710,7 +1710,7 @@ SCILAB_LIBPREFIX = lib
 # ----------------------------------------------------------------
 
 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)
 	$(LDSHARED) $(CFLAGS) $(LDFLAGS) $(IOBJS) $(OBJS) $(LIBS) -o $(SCILAB_LIBPREFIX)$(TARGET)$(SO)
 
@@ -1719,7 +1719,7 @@ scilab:
 # ----------------------------------------------------------------
 
 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)
 	$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(IOBJS) $(OBJS) $(LIBS) $(CPP_DLLIBS) -o $(SCILAB_LIBPREFIX)$(TARGET)$(SO)
 
diff --git a/Source/Modules/scilab.cxx b/Source/Modules/scilab.cxx
index ad66256b0..18bfa15d3 100644
--- a/Source/Modules/scilab.cxx
+++ b/Source/Modules/scilab.cxx
@@ -25,7 +25,6 @@ Scilab options (available with -scilab)\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 \
      -gatewayxml <gateway_id>        - Generate gateway xml with the given <gateway_id>\n \
-     -nobuilder                      - Do not generate the Scilab builder script (default)\n \
 \n";
 
 
@@ -132,10 +131,6 @@ public:
 	  Swig_mark_arg(argIndex);
 	  buildFlagsScript = NewString(argv[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) {
 	  Swig_mark_arg(argIndex);
 	  createGatewayXML = true;