Rename buildDocv2 to buildDoc 12/12912/3
Sylvestre Ledru [Mon, 14 Oct 2013 12:06:09 +0000 (14:06 +0200)]
Change-Id: Iff7006e30316c6667cb451f030b2350d7d5124a0

13 files changed:
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/data/configuration/scilab_primitives.txt
scilab/modules/helptools/includes/gw_helptools.h
scilab/modules/helptools/locales/helptools.pot
scilab/modules/helptools/macros/xmltoformat.sci
scilab/modules/helptools/sci_gateway/c/gw_helptools.c
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp [moved from scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp with 99% similarity]
scilab/modules/helptools/sci_gateway/helptools_gateway.xml
scilab/modules/helptools/src/c/helptools.vcxproj
scilab/modules/helptools/src/c/helptools.vcxproj.filters
scilab/modules/xcos/tests/nonreg_tests/bug_8223.dia.ref
scilab/modules/xcos/tests/nonreg_tests/bug_8223.tst

index e649be9..7da8fa1 100644 (file)
@@ -13,7 +13,7 @@ HELPTOOLS_SOURCES = src/jni/BuildDocObject.cpp \
 
 GATEWAY_C_SOURCES = sci_gateway/c/gw_helptools.c
 
-GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_buildDocv2.cpp
+GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_buildDoc.cpp
 
 GIWS_WRAPPERS = src/jni/BuildDocObject.giws.xml \
        src/jni/BuildDocObjectv2.giws.xml
index 4bb7d0d..36223e5 100644 (file)
@@ -185,13 +185,13 @@ am__v_lt_1 =
 @BUILD_HELP_TRUE@@GUI_TRUE@    libscihelptools-algo.la
 am__libscihelptools_la_SOURCES_DIST = sci_gateway/nogui/nogui.c \
        sci_gateway/c/gw_helptools.c \
-       sci_gateway/cpp/sci_buildDocv2.cpp
+       sci_gateway/cpp/sci_buildDoc.cpp
 @BUILD_HELP_FALSE@@GUI_TRUE@am__objects_2 =  \
 @BUILD_HELP_FALSE@@GUI_TRUE@   libscihelptools_la-nogui.lo
 @BUILD_HELP_TRUE@@GUI_TRUE@am__objects_2 =  \
 @BUILD_HELP_TRUE@@GUI_TRUE@    libscihelptools_la-gw_helptools.lo
 @GUI_FALSE@am__objects_2 = libscihelptools_la-nogui.lo
-@BUILD_HELP_TRUE@@GUI_TRUE@am__objects_3 = libscihelptools_la-sci_buildDocv2.lo
+@BUILD_HELP_TRUE@@GUI_TRUE@am__objects_3 = libscihelptools_la-sci_buildDoc.lo
 am_libscihelptools_la_OBJECTS = $(am__objects_2) $(am__objects_3)
 libscihelptools_la_OBJECTS = $(am_libscihelptools_la_OBJECTS)
 AM_V_P = $(am__v_P_@AM_V@)
@@ -559,7 +559,7 @@ top_srcdir = @top_srcdir@
 @BUILD_HELP_FALSE@@GUI_TRUE@GATEWAY_C_SOURCES = sci_gateway/nogui/nogui.c
 @BUILD_HELP_TRUE@@GUI_TRUE@GATEWAY_C_SOURCES = sci_gateway/c/gw_helptools.c
 @GUI_FALSE@GATEWAY_C_SOURCES = sci_gateway/nogui/nogui.c
-@BUILD_HELP_TRUE@@GUI_TRUE@GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_buildDocv2.cpp
+@BUILD_HELP_TRUE@@GUI_TRUE@GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_buildDoc.cpp
 @BUILD_HELP_TRUE@@GUI_TRUE@GIWS_WRAPPERS = src/jni/BuildDocObject.giws.xml \
 @BUILD_HELP_TRUE@@GUI_TRUE@    src/jni/BuildDocObjectv2.giws.xml
 
@@ -814,7 +814,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscihelptools_algo_la-SciDocMain.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscihelptools_la-gw_helptools.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscihelptools_la-nogui.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscihelptools_la-sci_buildDocv2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscihelptools_la-sci_buildDoc.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -886,12 +886,12 @@ libscihelptools_algo_la-SciDocMain.lo: src/jni/SciDocMain.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscihelptools_algo_la-SciDocMain.lo `test -f 'src/jni/SciDocMain.cpp' || echo '$(srcdir)/'`src/jni/SciDocMain.cpp
 
-libscihelptools_la-sci_buildDocv2.lo: sci_gateway/cpp/sci_buildDocv2.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscihelptools_la-sci_buildDocv2.lo -MD -MP -MF $(DEPDIR)/libscihelptools_la-sci_buildDocv2.Tpo -c -o libscihelptools_la-sci_buildDocv2.lo `test -f 'sci_gateway/cpp/sci_buildDocv2.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_buildDocv2.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libscihelptools_la-sci_buildDocv2.Tpo $(DEPDIR)/libscihelptools_la-sci_buildDocv2.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_buildDocv2.cpp' object='libscihelptools_la-sci_buildDocv2.lo' libtool=yes @AMDEPBACKSLASH@
+libscihelptools_la-sci_buildDoc.lo: sci_gateway/cpp/sci_buildDoc.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscihelptools_la-sci_buildDoc.lo -MD -MP -MF $(DEPDIR)/libscihelptools_la-sci_buildDoc.Tpo -c -o libscihelptools_la-sci_buildDoc.lo `test -f 'sci_gateway/cpp/sci_buildDoc.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_buildDoc.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libscihelptools_la-sci_buildDoc.Tpo $(DEPDIR)/libscihelptools_la-sci_buildDoc.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_buildDoc.cpp' object='libscihelptools_la-sci_buildDoc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscihelptools_la-sci_buildDocv2.lo `test -f 'sci_gateway/cpp/sci_buildDocv2.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_buildDocv2.cpp
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscihelptools_la-sci_buildDoc.lo `test -f 'sci_gateway/cpp/sci_buildDoc.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_buildDoc.cpp
 
 mostlyclean-libtool:
        -rm -f *.lo
index 0f179cd..289699e 100644 (file)
@@ -19,7 +19,7 @@
 HELPTOOLS_IMPEXP int gw_helptools(void);
 
 /*--------------------------------------------------------------------------*/
-HELPTOOLS_IMPEXP int sci_buildDocv2(char *fname, unsigned long fname_len);
+HELPTOOLS_IMPEXP int sci_buildDoc(char *fname, unsigned long fname_len);
 
 /*--------------------------------------------------------------------------*/
 #endif /*  __GW_HELPTOOLS__ */
index e7745b0..e32ce44 100644 (file)
@@ -22,43 +22,43 @@ msgid "Scilab '%s' module disabled in -nogui or -nwni mode.\n"
 msgstr ""
 
 #
-# File: sci_gateway/cpp/sci_buildDocv2.cpp, line: 83
-# File: sci_gateway/cpp/sci_buildDocv2.cpp, line: 117
-# File: sci_gateway/cpp/sci_buildDocv2.cpp, line: 160
-# File: sci_gateway/cpp/sci_buildDocv2.cpp, line: 188
+# File: sci_gateway/cpp/sci_buildDoc.cpp, line: 83
+# File: sci_gateway/cpp/sci_buildDoc.cpp, line: 117
+# File: sci_gateway/cpp/sci_buildDoc.cpp, line: 160
+# File: sci_gateway/cpp/sci_buildDoc.cpp, line: 188
 #, c-format
 msgid "%s: Can not read input argument #%d.\n"
 msgstr ""
 
 #
-# File: sci_gateway/cpp/sci_buildDocv2.cpp, line: 89
-# File: sci_gateway/cpp/sci_buildDocv2.cpp, line: 123
-# File: sci_gateway/cpp/sci_buildDocv2.cpp, line: 165
-# File: sci_gateway/cpp/sci_buildDocv2.cpp, line: 193
+# File: sci_gateway/cpp/sci_buildDoc.cpp, line: 89
+# File: sci_gateway/cpp/sci_buildDoc.cpp, line: 123
+# File: sci_gateway/cpp/sci_buildDoc.cpp, line: 165
+# File: sci_gateway/cpp/sci_buildDoc.cpp, line: 193
 #, c-format
 msgid "%s: Wrong type for input argument #%d: Single string expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/cpp/sci_buildDocv2.cpp, line: 244
+# File: sci_gateway/cpp/sci_buildDoc.cpp, line: 244
 #, c-format
 msgid "%s: Could find or create the working directory %s.\n"
 msgstr ""
 
 #
-# File: sci_gateway/cpp/sci_buildDocv2.cpp, line: 254
+# File: sci_gateway/cpp/sci_buildDoc.cpp, line: 254
 #, c-format
 msgid "%s: Error while building documentation: %s.\n"
 msgstr ""
 
 #
-# File: sci_gateway/cpp/sci_buildDocv2.cpp, line: 255
+# File: sci_gateway/cpp/sci_buildDoc.cpp, line: 255
 #, c-format
 msgid "%s: Execution Java stack: %s.\n"
 msgstr ""
 
 #
-# File: sci_gateway/cpp/sci_buildDocv2.cpp, line: 258
+# File: sci_gateway/cpp/sci_buildDoc.cpp, line: 258
 msgid ""
 "If Scilab is started in a chroot, you might want to try to set the two "
 "environment variables: SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1\n"
index 9d94bb8..832f969 100644 (file)
@@ -523,12 +523,12 @@ function generated_files = xmltoformat(output_format,dirs,titles,directory_langu
         end
 
         // process the build
-        fileToExec = buildDocv2(output_format,modules_tree("master_document"), my_wanted_language);
+        fileToExec = buildDoc(output_format,modules_tree("master_document"), my_wanted_language);
         if fileToExec ~= [] then
             exec(fileToExec, -1);
         end
         if ~isempty(second_pass_format) then
-            buildDocv2(second_pass_format,modules_tree("master_document"), my_wanted_language);
+            buildDoc(second_pass_format,modules_tree("master_document"), my_wanted_language);
         end
 
         check_move(buildDoc_file);
@@ -600,12 +600,12 @@ function generated_files = xmltoformat(output_format,dirs,titles,directory_langu
             end
 
             // process the build
-            fileToExec = buildDocv2(output_format,this_tree("master_document"),directory_language_c(k),dirs_c(k));
+            fileToExec = buildDoc(output_format,this_tree("master_document"),directory_language_c(k),dirs_c(k));
             if fileToExec ~= [] then
                 exec(fileToExec, -1);
             end
             if ~isempty(second_pass_format) then
-                buildDocv2(second_pass_format,this_tree("master_document"),directory_language_c(k),dirs_c(k));
+                buildDoc(second_pass_format,this_tree("master_document"),directory_language_c(k),dirs_c(k));
             end
 
             check_move(buildDoc_file);
@@ -701,12 +701,12 @@ function generated_files = xmltoformat(output_format,dirs,titles,directory_langu
             end
 
             // process the build
-            fileToExec = buildDocv2(output_format,this_tree("master_document"),directory_language(k),dirs(k));
+            fileToExec = buildDoc(output_format,this_tree("master_document"),directory_language(k),dirs(k));
             if fileToExec ~= [] then
                 exec(fileToExec, -1);
             end
             if ~isempty(second_pass_format) then
-                buildDocv2(second_pass_format,this_tree("master_document"),directory_language(k),dirs(k));
+                buildDoc(second_pass_format,this_tree("master_document"),directory_language(k),dirs(k));
             end
 
             check_move(buildDoc_file);
index 4017cd5..52c8bd9 100644 (file)
@@ -26,7 +26,7 @@ static BOOL loadedDep = FALSE;
 /*--------------------------------------------------------------------------*/
 static gw_generic_table Tab[] =
 {
-    {sci_buildDocv2, "buildDocv2"}
+    {sci_buildDoc, "buildDoc"}
 };
 
 /*--------------------------------------------------------------------------*/
@@ -48,7 +48,7 @@ extern "C"
     }
 #endif
     /*--------------------------------------------------------------------------*/
-    int sci_buildDocv2(char *fname, unsigned long l)
+    int sci_buildDoc(char *fname, unsigned long l)
     {
         std::string exportFormat;
         std::string SciPath = getSCIpath(); /* Scilab path */
index c438e72..f9ff170 100644 (file)
@@ -29,5 +29,5 @@
  Don't touch if you do not know what you are doing
 -->
     
-    <PRIMITIVE gatewayId="60" primitiveId="1" primitiveName="buildDocv2" />
+    <PRIMITIVE gatewayId="60" primitiveId="1" primitiveName="buildDoc" />
 </GATEWAY>
index 4876b39..d6f05de 100644 (file)
     <ClCompile Include="..\jni\BuildDocObject.cpp" />
     <ClCompile Include="DllmainHelptools.c" />
     <ClCompile Include="..\..\sci_gateway\c\gw_helptools.c" />
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_buildDocv2.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_buildDoc.cpp" />
     <ClCompile Include="..\jni\SciDocMain.cpp" />
   </ItemGroup>
   <ItemGroup>
index 8bc04f1..a5846fd 100644 (file)
@@ -32,7 +32,7 @@
     <ClCompile Include="..\..\sci_gateway\c\gw_helptools.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_buildDocv2.cpp">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_buildDoc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\jni\SciDocMain.cpp">
index 623a09a..e1f9a67 100644 (file)
@@ -13,7 +13,7 @@
 // <-- Short Description -->
 // Loading an Xcos file after building the doc did not work
 // loading the Saxon xml engine
-execstr("buildDocv2(1)", "errcatch");
+execstr("buildDoc(1)", "errcatch");
 // check that saxon is on the classpath
 CP = javaclasspath();
 if find(strstr(CP, "saxon") <> "") == [] then bugmes();quit;end
index 2f7ea50..b76910d 100644 (file)
@@ -16,7 +16,7 @@
 // Loading an Xcos file after building the doc did not work
 
 // loading the Saxon xml engine
-execstr("buildDocv2(1)", "errcatch");
+execstr("buildDoc(1)", "errcatch");
 
 // check that saxon is on the classpath
 CP = javaclasspath();