helptools module enable within YaSp 77/3577/7
Bruno JOFRET [Fri, 18 Mar 2011 18:16:03 +0000 (19:16 +0100)]
Change-Id: Icaf26ae2083ac9ecb139d6ed65a0ba64071304ea

12 files changed:
scilab/Scilab.sln
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/functions_manager/includes/module_declaration.hxx
scilab/modules/functions_manager/src/cpp/funcmanager.cpp
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/includes/helptools_gw.hxx [new file with mode: 0644]
scilab/modules/helptools/sci_gateway/cpp/helptools_gw.cpp [new file with mode: 0644]
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/helptools/sci_gateway/nogui/nogui.cpp [moved from scilab/modules/helptools/sci_gateway/nogui/nogui.c with 84% similarity]
scilab/modules/helptools/src/c/helptools.vcproj

index 23d25bb..951fa73 100644 (file)
@@ -1088,12 +1088,14 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "helptools", "modules\helptools\src\c\helptools.vcproj", "{BED4A0F2-5129-487F-9F94-EC09480F04D7}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
                {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
                {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+               {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
                {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
        EndProjectSection
 EndProject
@@ -1253,6 +1255,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_manager", "module
                {215274D7-05EC-4D1E-B7BB-B2C957DA960B} = {215274D7-05EC-4D1E-B7BB-B2C957DA960B}
                {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
                {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
+               {BED4A0F2-5129-487F-9F94-EC09480F04D7} = {BED4A0F2-5129-487F-9F94-EC09480F04D7}
                {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420} = {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}
                {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74} = {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}
                {C000FDF7-4D32-4630-9595-560D9CC66D11} = {C000FDF7-4D32-4630-9595-560D9CC66D11}
index a691a57..842aca2 100644 (file)
@@ -33,5 +33,6 @@
     <module name="localization" activate="yes"/>
     <module name="jvm" activate="@JAVA_ENABLE@"/>
     <module name="functions" activate="yes"/>
+    <module name="helptools" activate="@HELP_ENABLE@"/>
 </modules>
 
index 4715591..743e7e9 100644 (file)
@@ -33,5 +33,6 @@
     <module name="localization" activate="yes"/>
     <module name="windows_tools" activate="yes"/>
     <module name="jvm" activate="yes"/>
+    <module name="helptools" activate="yes"/>
 </modules>
 
index 2e60295..c91fd55 100644 (file)
@@ -30,5 +30,6 @@
 #include "../../localization/includes/localization_gw.hxx"
 #include "../../windows_tools/includes/windows_tools_gw.hxx"
 #include "../../jvm/includes/jvm_gw.hxx"
+#include "../../helptools/includes/helptools_gw.hxx"
 
 #endif /* !__MODULE_DECLARATION_HXX__ */
index 3907e08..14addfd 100644 (file)
@@ -298,6 +298,7 @@ bool FuncManager::CreateModuleList(void)
     m_ModuleMap.insert(pair<wstring, GW_MOD>(L"string", &StringModule::Load));
     m_ModuleMap.insert(pair<wstring, GW_MOD>(L"scinotes", &ScinotesModule::Load));
     m_ModuleMap.insert(pair<wstring, GW_MOD>(L"localization", &LocalizationModule::Load));
+    m_ModuleMap.insert(pair<wstring, GW_MOD>(L"helptools", &HelptoolsModule::Load));
     if (ConfigVariable::getScilabMode() != SCILAB_NWNI)
     {
         m_ModuleMap.insert(pair<wstring, GW_MOD>(L"jvm", &JvmModule::Load));
index 8218cd0..f0f3664 100644 (file)
@@ -15,7 +15,8 @@ HELPTOOLS_SOURCES = src/jni/BuildDocObject.cpp \
 GATEWAY_C_SOURCES = sci_gateway/c/gw_helptools.c
 
 GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_buildDoc.cpp \
-       sci_gateway/cpp/sci_buildDocv2.cpp
+       sci_gateway/cpp/sci_buildDocv2.cpp \
+       sci_gateway/cpp/helptools_gw.cpp
 
 GIWS_WRAPPERS = src/jni/BuildDocObject.giws.xml \
        src/jni/BuildDocObjectv2.giws.xml
@@ -27,14 +28,16 @@ BUILT_SOURCES=giws
 endif
 
 else
-GATEWAY_C_SOURCES = sci_gateway/nogui/nogui.c
+GATEWAY_CPP_SOURCES = sci_gateway/nogui/nogui.cpp
 endif
 
 else
-GATEWAY_C_SOURCES = sci_gateway/nogui/nogui.c
+GATEWAY_CPP_SOURCES = sci_gateway/nogui/nogui.cpp
 endif
 
-pkglib_LTLIBRARIES = libscihelptools.la
+HELPTOOLS_DISABLE_CPP_SOURCES = sci_gateway/nogui/nogui.cpp
+
+pkglib_LTLIBRARIES = libscihelptools.la libscihelptools-disable.la
 
 libscihelptools_la_CFLAGS=     -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
@@ -48,13 +51,20 @@ libscihelptools_la_CPPFLAGS= $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/system_env/includes/ \
                                -I$(top_srcdir)/modules/operations/includes/ \
-                               -I$(top_srcdir)/modules/api_scilab/includes/
+                               -I$(top_srcdir)/modules/api_scilab/includes/ \
+                               -I$(top_srcdir)/modules/symbol/includes/ \
+                               -I$(top_srcdir)/modules/types/includes/ \
+                               -I$(top_srcdir)/modules/abstractSyntaxTree/includes/
 
 
 libscihelptools_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
 libscihelptools_la_SOURCES =  $(GATEWAY_C_SOURCES) $(HELPTOOLS_SOURCES) $(GATEWAY_CPP_SOURCES)
 
+libscihelptools_disable_la_CPPFLAGS = $(libscihelptools_la_CPPFLAGS)
+
+libscihelptools_disable_la_SOURCES =  $(HELPTOOLS_DISABLE_CPP_SOURCES)
+
 # For the code check (splint)
 CHECK_SRC= $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscihelptools_la_CFLAGS)
index 5f64395..5c42b4f 100644 (file)
@@ -116,25 +116,32 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscihelptools_la_xsl_convertdir)" \
        "$(DESTDIR)$(libscihelptools_la_xsl_fodir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
+libscihelptools_disable_la_LIBADD =
+am__objects_1 = libscihelptools_disable_la-nogui.lo
+am_libscihelptools_disable_la_OBJECTS = $(am__objects_1)
+libscihelptools_disable_la_OBJECTS =  \
+       $(am_libscihelptools_disable_la_OBJECTS)
 @BUILD_HELP_TRUE@@GUI_TRUE@libscihelptools_la_DEPENDENCIES = $(top_builddir)/modules/jvm/libscijvm.la
-am__libscihelptools_la_SOURCES_DIST = sci_gateway/nogui/nogui.c \
-       sci_gateway/c/gw_helptools.c src/jni/BuildDocObject.cpp \
-       src/jni/SciDocMain.cpp src/jni/GiwsException.cpp \
+am__libscihelptools_la_SOURCES_DIST = sci_gateway/c/gw_helptools.c \
+       src/jni/BuildDocObject.cpp src/jni/SciDocMain.cpp \
+       src/jni/GiwsException.cpp sci_gateway/nogui/nogui.cpp \
        sci_gateway/cpp/sci_buildDoc.cpp \
-       sci_gateway/cpp/sci_buildDocv2.cpp
-@BUILD_HELP_FALSE@@GUI_TRUE@am__objects_1 =  \
-@BUILD_HELP_FALSE@@GUI_TRUE@   libscihelptools_la-nogui.lo
-@BUILD_HELP_TRUE@@GUI_TRUE@am__objects_1 =  \
+       sci_gateway/cpp/sci_buildDocv2.cpp \
+       sci_gateway/cpp/helptools_gw.cpp
+@BUILD_HELP_TRUE@@GUI_TRUE@am__objects_2 =  \
 @BUILD_HELP_TRUE@@GUI_TRUE@    libscihelptools_la-gw_helptools.lo
-@GUI_FALSE@am__objects_1 = libscihelptools_la-nogui.lo
-@BUILD_HELP_TRUE@@GUI_TRUE@am__objects_2 = libscihelptools_la-BuildDocObject.lo \
+@BUILD_HELP_TRUE@@GUI_TRUE@am__objects_3 = libscihelptools_la-BuildDocObject.lo \
 @BUILD_HELP_TRUE@@GUI_TRUE@    libscihelptools_la-SciDocMain.lo \
 @BUILD_HELP_TRUE@@GUI_TRUE@    libscihelptools_la-GiwsException.lo
-@BUILD_HELP_TRUE@@GUI_TRUE@am__objects_3 =  \
+@BUILD_HELP_FALSE@@GUI_TRUE@am__objects_4 =  \
+@BUILD_HELP_FALSE@@GUI_TRUE@   libscihelptools_la-nogui.lo
+@BUILD_HELP_TRUE@@GUI_TRUE@am__objects_4 =  \
 @BUILD_HELP_TRUE@@GUI_TRUE@    libscihelptools_la-sci_buildDoc.lo \
-@BUILD_HELP_TRUE@@GUI_TRUE@    libscihelptools_la-sci_buildDocv2.lo
-am_libscihelptools_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
-       $(am__objects_3)
+@BUILD_HELP_TRUE@@GUI_TRUE@    libscihelptools_la-sci_buildDocv2.lo \
+@BUILD_HELP_TRUE@@GUI_TRUE@    libscihelptools_la-helptools_gw.lo
+@GUI_FALSE@am__objects_4 = libscihelptools_la-nogui.lo
+am_libscihelptools_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
+       $(am__objects_4)
 libscihelptools_la_OBJECTS = $(am_libscihelptools_la_OBJECTS)
 libscihelptools_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -161,8 +168,10 @@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-SOURCES = $(libscihelptools_la_SOURCES)
-DIST_SOURCES = $(am__libscihelptools_la_SOURCES_DIST)
+SOURCES = $(libscihelptools_disable_la_SOURCES) \
+       $(libscihelptools_la_SOURCES)
+DIST_SOURCES = $(libscihelptools_disable_la_SOURCES) \
+       $(am__libscihelptools_la_SOURCES_DIST)
 DATA = $(libscihelptools_la_bin_DATA) \
        $(libscihelptools_la_data_configuration_DATA) \
        $(libscihelptools_la_data_css_DATA) \
@@ -438,18 +447,20 @@ yacc_present = @yacc_present@
 @BUILD_HELP_TRUE@@GUI_TRUE@    src/jni/SciDocMain.cpp \
 @BUILD_HELP_TRUE@@GUI_TRUE@    src/jni/GiwsException.cpp
 
-@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_FALSE@@GUI_TRUE@GATEWAY_CPP_SOURCES = sci_gateway/nogui/nogui.cpp
 @BUILD_HELP_TRUE@@GUI_TRUE@GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_buildDoc.cpp \
-@BUILD_HELP_TRUE@@GUI_TRUE@    sci_gateway/cpp/sci_buildDocv2.cpp
+@BUILD_HELP_TRUE@@GUI_TRUE@    sci_gateway/cpp/sci_buildDocv2.cpp \
+@BUILD_HELP_TRUE@@GUI_TRUE@    sci_gateway/cpp/helptools_gw.cpp
 
+@GUI_FALSE@GATEWAY_CPP_SOURCES = sci_gateway/nogui/nogui.cpp
 @BUILD_HELP_TRUE@@GUI_TRUE@GIWS_WRAPPERS = src/jni/BuildDocObject.giws.xml \
 @BUILD_HELP_TRUE@@GUI_TRUE@    src/jni/BuildDocObjectv2.giws.xml
 
 @BUILD_HELP_TRUE@@GUI_TRUE@libscihelptools_la_LIBADD = $(top_builddir)/modules/jvm/libscijvm.la
 @BUILD_HELP_TRUE@@GIWS_TRUE@@GUI_TRUE@BUILT_SOURCES = giws
-pkglib_LTLIBRARIES = libscihelptools.la
+HELPTOOLS_DISABLE_CPP_SOURCES = sci_gateway/nogui/nogui.cpp
+pkglib_LTLIBRARIES = libscihelptools.la libscihelptools-disable.la
 libscihelptools_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/jvm/includes
@@ -461,10 +472,15 @@ libscihelptools_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/system_env/includes/ \
                                -I$(top_srcdir)/modules/operations/includes/ \
-                               -I$(top_srcdir)/modules/api_scilab/includes/
+                               -I$(top_srcdir)/modules/api_scilab/includes/ \
+                               -I$(top_srcdir)/modules/symbol/includes/ \
+                               -I$(top_srcdir)/modules/types/includes/ \
+                               -I$(top_srcdir)/modules/abstractSyntaxTree/includes/
 
 libscihelptools_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscihelptools_la_SOURCES = $(GATEWAY_C_SOURCES) $(HELPTOOLS_SOURCES) $(GATEWAY_CPP_SOURCES)
+libscihelptools_disable_la_CPPFLAGS = $(libscihelptools_la_CPPFLAGS)
+libscihelptools_disable_la_SOURCES = $(HELPTOOLS_DISABLE_CPP_SOURCES)
 
 # For the code check (splint)
 CHECK_SRC = $(GATEWAY_C_SOURCES)
@@ -658,6 +674,8 @@ clean-pkglibLTLIBRARIES:
          echo "rm -f \"$${dir}/so_locations\""; \
          rm -f "$${dir}/so_locations"; \
        done
+libscihelptools-disable.la: $(libscihelptools_disable_la_OBJECTS) $(libscihelptools_disable_la_DEPENDENCIES) 
+       $(CXXLINK) -rpath $(pkglibdir) $(libscihelptools_disable_la_OBJECTS) $(libscihelptools_disable_la_LIBADD) $(LIBS)
 libscihelptools.la: $(libscihelptools_la_OBJECTS) $(libscihelptools_la_DEPENDENCIES) 
        $(libscihelptools_la_LINK) -rpath $(pkglibdir) $(libscihelptools_la_OBJECTS) $(libscihelptools_la_LIBADD) $(LIBS)
 
@@ -667,10 +685,12 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscihelptools_disable_la-nogui.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscihelptools_la-BuildDocObject.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscihelptools_la-GiwsException.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscihelptools_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-helptools_gw.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_buildDoc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscihelptools_la-sci_buildDocv2.Plo@am__quote@
@@ -696,13 +716,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
-libscihelptools_la-nogui.lo: sci_gateway/nogui/nogui.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(libscihelptools_la_CFLAGS) $(CFLAGS) -MT libscihelptools_la-nogui.lo -MD -MP -MF $(DEPDIR)/libscihelptools_la-nogui.Tpo -c -o libscihelptools_la-nogui.lo `test -f 'sci_gateway/nogui/nogui.c' || echo '$(srcdir)/'`sci_gateway/nogui/nogui.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscihelptools_la-nogui.Tpo $(DEPDIR)/libscihelptools_la-nogui.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/nogui/nogui.c' object='libscihelptools_la-nogui.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(libscihelptools_la_CFLAGS) $(CFLAGS) -c -o libscihelptools_la-nogui.lo `test -f 'sci_gateway/nogui/nogui.c' || echo '$(srcdir)/'`sci_gateway/nogui/nogui.c
-
 libscihelptools_la-gw_helptools.lo: sci_gateway/c/gw_helptools.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(libscihelptools_la_CFLAGS) $(CFLAGS) -MT libscihelptools_la-gw_helptools.lo -MD -MP -MF $(DEPDIR)/libscihelptools_la-gw_helptools.Tpo -c -o libscihelptools_la-gw_helptools.lo `test -f 'sci_gateway/c/gw_helptools.c' || echo '$(srcdir)/'`sci_gateway/c/gw_helptools.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscihelptools_la-gw_helptools.Tpo $(DEPDIR)/libscihelptools_la-gw_helptools.Plo
@@ -731,6 +744,13 @@ libscihelptools_la-gw_helptools.lo: sci_gateway/c/gw_helptools.c
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
 
+libscihelptools_disable_la-nogui.lo: sci_gateway/nogui/nogui.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscihelptools_disable_la-nogui.lo -MD -MP -MF $(DEPDIR)/libscihelptools_disable_la-nogui.Tpo -c -o libscihelptools_disable_la-nogui.lo `test -f 'sci_gateway/nogui/nogui.cpp' || echo '$(srcdir)/'`sci_gateway/nogui/nogui.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscihelptools_disable_la-nogui.Tpo $(DEPDIR)/libscihelptools_disable_la-nogui.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/nogui/nogui.cpp' object='libscihelptools_disable_la-nogui.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscihelptools_disable_la-nogui.lo `test -f 'sci_gateway/nogui/nogui.cpp' || echo '$(srcdir)/'`sci_gateway/nogui/nogui.cpp
+
 libscihelptools_la-BuildDocObject.lo: src/jni/BuildDocObject.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscihelptools_la-BuildDocObject.lo -MD -MP -MF $(DEPDIR)/libscihelptools_la-BuildDocObject.Tpo -c -o libscihelptools_la-BuildDocObject.lo `test -f 'src/jni/BuildDocObject.cpp' || echo '$(srcdir)/'`src/jni/BuildDocObject.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscihelptools_la-BuildDocObject.Tpo $(DEPDIR)/libscihelptools_la-BuildDocObject.Plo
@@ -752,6 +772,13 @@ libscihelptools_la-GiwsException.lo: src/jni/GiwsException.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscihelptools_la-GiwsException.lo `test -f 'src/jni/GiwsException.cpp' || echo '$(srcdir)/'`src/jni/GiwsException.cpp
 
+libscihelptools_la-nogui.lo: sci_gateway/nogui/nogui.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscihelptools_la-nogui.lo -MD -MP -MF $(DEPDIR)/libscihelptools_la-nogui.Tpo -c -o libscihelptools_la-nogui.lo `test -f 'sci_gateway/nogui/nogui.cpp' || echo '$(srcdir)/'`sci_gateway/nogui/nogui.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscihelptools_la-nogui.Tpo $(DEPDIR)/libscihelptools_la-nogui.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/nogui/nogui.cpp' object='libscihelptools_la-nogui.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscihelptools_la-nogui.lo `test -f 'sci_gateway/nogui/nogui.cpp' || echo '$(srcdir)/'`sci_gateway/nogui/nogui.cpp
+
 libscihelptools_la-sci_buildDoc.lo: sci_gateway/cpp/sci_buildDoc.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --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__mv) $(DEPDIR)/libscihelptools_la-sci_buildDoc.Tpo $(DEPDIR)/libscihelptools_la-sci_buildDoc.Plo
@@ -766,6 +793,13 @@ libscihelptools_la-sci_buildDocv2.lo: sci_gateway/cpp/sci_buildDocv2.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --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
 
+libscihelptools_la-helptools_gw.lo: sci_gateway/cpp/helptools_gw.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscihelptools_la-helptools_gw.lo -MD -MP -MF $(DEPDIR)/libscihelptools_la-helptools_gw.Tpo -c -o libscihelptools_la-helptools_gw.lo `test -f 'sci_gateway/cpp/helptools_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/helptools_gw.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscihelptools_la-helptools_gw.Tpo $(DEPDIR)/libscihelptools_la-helptools_gw.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/helptools_gw.cpp' object='libscihelptools_la-helptools_gw.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscihelptools_la-helptools_gw.lo `test -f 'sci_gateway/cpp/helptools_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/helptools_gw.cpp
+
 mostlyclean-libtool:
        -rm -f *.lo
 
diff --git a/scilab/modules/helptools/includes/helptools_gw.hxx b/scilab/modules/helptools/includes/helptools_gw.hxx
new file mode 100644 (file)
index 0000000..fc75533
--- /dev/null
@@ -0,0 +1,37 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2011-2011 - DIGITEO - Bruno JOFRET
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#ifndef __HELPTOOLS_GW_HXX__
+#define __HELPTOOLS_GW_HXX__
+
+#include "function.hxx"
+#include "context.hxx"
+
+extern "C"
+{
+#include "dynlib_helptools.h"
+}
+
+class HelptoolsModule
+{
+private :
+    HelptoolsModule() {};
+    ~HelptoolsModule() {};
+
+    static bool loadedDep;
+    static void LoadDeps(void);
+
+public :
+    HELPTOOLS_IMPEXP static bool Load();
+};
+
+#endif /* !__HELPTOOLS_GW_HXX__ */
diff --git a/scilab/modules/helptools/sci_gateway/cpp/helptools_gw.cpp b/scilab/modules/helptools/sci_gateway/cpp/helptools_gw.cpp
new file mode 100644 (file)
index 0000000..d4fc60c
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2011-2011 - DIGITEO - Bruno JOFRET
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#include "helptools_gw.hxx"
+
+extern "C"
+{
+#include "loadOnUseClassPath.h"
+}
+
+#define MODULE_NAME L"helptools"
+
+extern "C"
+{
+    #include "gw_helptools.h"
+}
+
+bool HelptoolsModule::loadedDep = false;
+
+void HelptoolsModule::LoadDeps(void)
+{
+    if (loadedDep == false)
+    {
+        loadOnUseClassPath("documentationGeneration");
+        loadedDep = true;
+    }
+}
+
+bool HelptoolsModule::Load()
+{
+    symbol::Context::getInstance()->AddFunction(types::Function::createFunction(L"buildDoc", &sci_buildDoc, &HelptoolsModule::LoadDeps, MODULE_NAME));
+    symbol::Context::getInstance()->AddFunction(types::Function::createFunction(L"buildDocv2", &sci_buildDocv2, &HelptoolsModule::LoadDeps, MODULE_NAME));
+    return true;
+}
index 1432eb2..8c3b291 100644 (file)
@@ -32,19 +32,19 @@ extern "C"
 #include "ConvertSlash.h"
 #endif
     /*--------------------------------------------------------------------------*/
-#define PATHTOCSS L"/modules/helptools/css/javahelp.css"
-#define PATHTOBUILDDOC L"/modules/helptools/build/doc/scilab_%s_help/"
-#define PATHTOMASTERXML L"/modules/helptools/master_%s_help.xml"
-#define DEFAULTEXPORT L"JH"
+#define PATHTOCSS "/modules/helptools/css/javahelp.css"
+#define PATHTOBUILDDOC "/modules/helptools/build/doc/scilab_%s_help/"
+#define PATHTOMASTERXML "/modules/helptools/master_%s_help.xml"
+#define DEFAULTEXPORT "JH"
 #ifdef _MSC_VER
-    static void __slashToAntislash(std::wstring *in)
+    static void __slashToAntislash(std::string *in)
     {
-        size_t found = in->rfind(L"/");
+        size_t found = in->rfind("/");
 
-        while (found != std::wstring::npos)
+        while (found != std::string::npos)
         {
-            in->replace (found, 1, L"\\");
-            found = in->rfind(L"/");
+            in->replace (found, 1, "\\");
+            found = in->find("/");
         }
     }
 #endif
@@ -56,14 +56,14 @@ extern "C"
         static int l3 = 0,n3 = 0,m3 = 0;
         static int l4 = 0,n4 = 0,m4 = 0;
         //     static int Row_Output = 0, Col_Output = 0;
-        std::wstring exportFormat;
-        std::wstring SciPath = getSCIW(); /* Scilab path */
-        std::wstring masterXML; /* Which file contains all the doc stuff */
-        std::wstring masterXMLTMP;
-        std::wstring outputDirectory; /* Working directory */
-        std::wstring outputDirectoryTMP;
-        std::wstring language;
-        std::wstring styleSheet; /* the CSS */
+        std::string exportFormat;
+        std::string SciPath = getSCI(); /* Scilab path */
+        std::string masterXML; /* Which file contains all the doc stuff */
+        std::string masterXMLTMP;
+        std::string outputDirectory; /* Working directory */
+        std::string outputDirectoryTMP;
+        std::string language;
+        std::string styleSheet; /* the CSS */
         //     std::string pathToGenerated;
         org_scilab_modules_helptools::SciDocMain *doc = NULL;
         SciErr sciErr;
@@ -102,14 +102,15 @@ extern "C"
                 freeAllocatedSingleString(pstData);
                 return iRet;
             }
-            exportFormat = std::wstring(to_wide_string(pstData));
+            exportFormat = std::string(pstData);
             freeAllocatedSingleString(pstData);
 
+
         }
 
         if ( Rhs < 3) /* Language not provided */
         {
-            language = getlanguage();
+            language = wide_string_to_UTF8(getlanguage());
         }
         else
         {
@@ -130,7 +131,7 @@ extern "C"
 
             if(!isScalar(_piKey, piAddr))
             {
-                language = getlanguage();
+                language = wide_string_to_UTF8(getlanguage());
             }
             else
             {
@@ -140,8 +141,9 @@ extern "C"
                     freeAllocatedSingleString(pstData);
                     return iRet;
                 }
-                language = std::wstring(to_wide_string(pstData));
+                language = std::string(pstData);
                 freeAllocatedSingleString(pstData);
+
             }
 
         }
@@ -149,7 +151,7 @@ extern "C"
         if (Rhs < 2)
         {
             /* Update the path with the localization */
-            masterXMLTMP = std::wstring(L"/modules/helptools/master_")+language+std::wstring(L"_help.xml");
+            masterXMLTMP = std::string("/modules/helptools/master_")+language+std::string("_help.xml");
             masterXML = SciPath + masterXMLTMP;
         }
         else
@@ -175,7 +177,7 @@ extern "C"
                 freeAllocatedSingleString(pstData);
                 return iRet;
             }
-            masterXML = std::wstring(to_wide_string(pstData));
+            masterXML = std::string(pstData);
             freeAllocatedSingleString(pstData);
         }
 
@@ -201,16 +203,17 @@ extern "C"
                 freeAllocatedSingleString(pstData);
                 return iRet;
             }
-            outputDirectory = std::wstring(to_wide_string(pstData))+std::wstring(L"/scilab_")+language+std::wstring(L"_help/");
+            outputDirectory = std::string(pstData)+std::string("/scilab_")+language+std::string("_help/");
             freeAllocatedSingleString(pstData);
 
         }
         else /* Scilab help */
         {
             /* Update the path with the localization */
-            outputDirectoryTMP = std::wstring(L"/modules/helptools/")+std::wstring(exportFormat)+std::wstring(L"/scilab_")+language+std::wstring(L"_help/");
+            outputDirectoryTMP = std::string("/modules/helptools/")+std::string(exportFormat)+std::string("/scilab_")+language+std::string("_help/");
 
             outputDirectory = SciPath+outputDirectoryTMP;
+
         }
 
         try
@@ -229,7 +232,7 @@ extern "C"
             {
                 doc->setWorkingLanguage((char *) language.c_str());
                 doc->setExportFormat((char *) exportFormat.c_str());
-               doc->setIsToolbox(Rhs == 4);
+                doc->setIsToolbox(Rhs == 4);
                 doc->process((char *) masterXML.c_str(), (char *) styleSheet.c_str());
             }
             else
@@ -240,8 +243,8 @@ extern "C"
         }
         catch(GiwsException::JniException ex)
         {
-            Scierror(999,_("%s: Error while building documentation: %s.\n"), fname, ex.getJavaDescription().c_str());
-            Scierror(999,_("%s: Execution Java stack: %s.\n"), fname, ex.getJavaStackTrace().c_str());
+            ScierrorW(999,_W("%s: Error while building documentation: %s.\n"), fname, ex.getJavaDescription().c_str());
+            ScierrorW(999,_W("%s: Execution Java stack: %s.\n"), fname, ex.getJavaStackTrace().c_str());
             return FALSE;
         }
 
@@ -1,6 +1,7 @@
 /*
  *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  *  Copyright (C) 2008-2008 - DIGITEO - Simon LIPP
+ *  Copyright (C) 2011-2011 - DIGITEO - Bruno JOFRET
  *
  *  This file must be used under the terms of the CeCILL.
  *  This source file is licensed as described in the file COPYING, which
  *
  */
 
+#include "helptools_gw.hxx"
+
+extern "C"
+{
 #include "Scierror.h"
 #include "localization.h"
 #include "gw_helptools.h"
-
+}
 /*--------------------------------------------------------------------------*/
 int gw_helptools()
 {
@@ -26,3 +31,9 @@ int sci_buildDoc(char *fname, unsigned long l)
        return 0;
 }
 /*--------------------------------------------------------------------------*/
+
+bool HelptoolsModule::Load()
+{
+    /* Do Nothing */
+    return true;
+}
index f78dc7b..49b70c7 100644 (file)
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../system_env/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../system_env/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../system_env/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../system_env/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                >
                        </File>
                        <File
+                               RelativePath="..\..\sci_gateway\cpp\helptools_gw.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\sci_gateway\cpp\sci_buildDoc.cpp"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath="..\..\includes\helptools_gw.hxx"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\resource.h"
                                >
                        </File>