STRING_V2 => string
Pierre Marechal [Mon, 4 Feb 2008 15:19:54 +0000 (15:19 +0000)]
332 files changed:
scilab/Makefile.in
scilab/configure
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.am
scilab/modules/intersci/Makefile.in
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/string/Makefile.am [moved from scilab/modules/STRING_V2/Makefile.am with 93% similarity]
scilab/modules/string/Makefile.in [moved from scilab/modules/STRING_V2/Makefile.in with 99% similarity]
scilab/modules/string/STRING_V2.iss [moved from scilab/modules/STRING_V2/STRING_V2.iss with 94% similarity]
scilab/modules/string/changelog.txt [moved from scilab/modules/STRING_V2/changelog.txt with 100% similarity]
scilab/modules/string/etc/STRING_V2.quit [moved from scilab/modules/STRING_V2/etc/STRING_V2.quit with 100% similarity]
scilab/modules/string/etc/STRING_V2.start [moved from scilab/modules/STRING_V2/etc/STRING_V2.start with 83% similarity]
scilab/modules/string/help/en_US/addchapter.sce [moved from scilab/modules/STRING_V2/help/en_US/addchapter.sce with 85% similarity]
scilab/modules/string/help/en_US/ascii.xml [moved from scilab/modules/STRING_V2/help/en_US/ascii.xml with 100% similarity]
scilab/modules/string/help/en_US/blanks.xml [moved from scilab/modules/STRING_V2/help/en_US/blanks.xml with 100% similarity]
scilab/modules/string/help/en_US/code2str.xml [moved from scilab/modules/STRING_V2/help/en_US/code2str.xml with 100% similarity]
scilab/modules/string/help/en_US/convstr.xml [moved from scilab/modules/STRING_V2/help/en_US/convstr.xml with 100% similarity]
scilab/modules/string/help/en_US/emptystr.xml [moved from scilab/modules/STRING_V2/help/en_US/emptystr.xml with 100% similarity]
scilab/modules/string/help/en_US/fun2string.xml [moved from scilab/modules/STRING_V2/help/en_US/fun2string.xml with 100% similarity]
scilab/modules/string/help/en_US/grep.xml [moved from scilab/modules/STRING_V2/help/en_US/grep.xml with 100% similarity]
scilab/modules/string/help/en_US/isalphanum.xml [moved from scilab/modules/STRING_V2/help/en_US/isalphanum.xml with 100% similarity]
scilab/modules/string/help/en_US/isascii.xml [moved from scilab/modules/STRING_V2/help/en_US/isascii.xml with 100% similarity]
scilab/modules/string/help/en_US/isdigit.xml [moved from scilab/modules/STRING_V2/help/en_US/isdigit.xml with 100% similarity]
scilab/modules/string/help/en_US/isletter.xml [moved from scilab/modules/STRING_V2/help/en_US/isletter.xml with 100% similarity]
scilab/modules/string/help/en_US/isnum.xml [moved from scilab/modules/STRING_V2/help/en_US/isnum.xml with 100% similarity]
scilab/modules/string/help/en_US/justify.xml [moved from scilab/modules/STRING_V2/help/en_US/justify.xml with 100% similarity]
scilab/modules/string/help/en_US/length.xml [moved from scilab/modules/STRING_V2/help/en_US/length.xml with 100% similarity]
scilab/modules/string/help/en_US/part.xml [moved from scilab/modules/STRING_V2/help/en_US/part.xml with 100% similarity]
scilab/modules/string/help/en_US/regexp.xml [moved from scilab/modules/STRING_V2/help/en_US/regexp.xml with 100% similarity]
scilab/modules/string/help/en_US/sci2exp.xml [moved from scilab/modules/STRING_V2/help/en_US/sci2exp.xml with 100% similarity]
scilab/modules/string/help/en_US/str2code.xml [moved from scilab/modules/STRING_V2/help/en_US/str2code.xml with 100% similarity]
scilab/modules/string/help/en_US/strcat.xml [moved from scilab/modules/STRING_V2/help/en_US/strcat.xml with 100% similarity]
scilab/modules/string/help/en_US/strchr.xml [moved from scilab/modules/STRING_V2/help/en_US/strchr.xml with 100% similarity]
scilab/modules/string/help/en_US/strcmp.xml [moved from scilab/modules/STRING_V2/help/en_US/strcmp.xml with 100% similarity]
scilab/modules/string/help/en_US/strcmpi.xml [moved from scilab/modules/STRING_V2/help/en_US/strcmpi.xml with 100% similarity]
scilab/modules/string/help/en_US/strcspn.xml [moved from scilab/modules/STRING_V2/help/en_US/strcspn.xml with 100% similarity]
scilab/modules/string/help/en_US/strindex.xml [moved from scilab/modules/STRING_V2/help/en_US/strindex.xml with 100% similarity]
scilab/modules/string/help/en_US/string.xml [moved from scilab/modules/STRING_V2/help/en_US/string.xml with 100% similarity]
scilab/modules/string/help/en_US/strings.xml [moved from scilab/modules/STRING_V2/help/en_US/strings.xml with 100% similarity]
scilab/modules/string/help/en_US/stripblanks.xml [moved from scilab/modules/STRING_V2/help/en_US/stripblanks.xml with 100% similarity]
scilab/modules/string/help/en_US/strncpy.xml [moved from scilab/modules/STRING_V2/help/en_US/strncpy.xml with 100% similarity]
scilab/modules/string/help/en_US/strrchr.xml [moved from scilab/modules/STRING_V2/help/en_US/strrchr.xml with 100% similarity]
scilab/modules/string/help/en_US/strrev.xml [moved from scilab/modules/STRING_V2/help/en_US/strrev.xml with 100% similarity]
scilab/modules/string/help/en_US/strsplit.xml [moved from scilab/modules/STRING_V2/help/en_US/strsplit.xml with 100% similarity]
scilab/modules/string/help/en_US/strspn.xml [moved from scilab/modules/STRING_V2/help/en_US/strspn.xml with 100% similarity]
scilab/modules/string/help/en_US/strstr.xml [moved from scilab/modules/STRING_V2/help/en_US/strstr.xml with 100% similarity]
scilab/modules/string/help/en_US/strsubst.xml [moved from scilab/modules/STRING_V2/help/en_US/strsubst.xml with 100% similarity]
scilab/modules/string/help/en_US/strtod.xml [moved from scilab/modules/STRING_V2/help/en_US/strtod.xml with 100% similarity]
scilab/modules/string/help/en_US/strtok.xml [moved from scilab/modules/STRING_V2/help/en_US/strtok.xml with 100% similarity]
scilab/modules/string/help/en_US/tokenpos.xml [moved from scilab/modules/STRING_V2/help/en_US/tokenpos.xml with 100% similarity]
scilab/modules/string/help/en_US/tokens.xml [moved from scilab/modules/STRING_V2/help/en_US/tokens.xml with 100% similarity]
scilab/modules/string/help/en_US/tree2code.xml [moved from scilab/modules/STRING_V2/help/en_US/tree2code.xml with 100% similarity]
scilab/modules/string/includes/InitializeString.h [moved from scilab/modules/STRING_V2/includes/InitializeString.h with 100% similarity]
scilab/modules/string/includes/cvstr.h [moved from scilab/modules/STRING_V2/includes/cvstr.h with 100% similarity]
scilab/modules/string/includes/getfastcode.h [moved from scilab/modules/STRING_V2/includes/getfastcode.h with 100% similarity]
scilab/modules/string/includes/gw_string.h [moved from scilab/modules/STRING_V2/includes/gw_string.h with 100% similarity]
scilab/modules/string/includes/men_Sutils.h [moved from scilab/modules/STRING_V2/includes/men_Sutils.h with 100% similarity]
scilab/modules/string/includes/stricmp.h [moved from scilab/modules/STRING_V2/includes/stricmp.h with 100% similarity]
scilab/modules/string/license.txt [moved from scilab/modules/STRING_V2/license.txt with 100% similarity]
scilab/modules/string/locales/en_US/STRING_V2.pot [moved from scilab/modules/STRING_V2/locales/en_US/STRING_V2.pot with 99% similarity]
scilab/modules/string/locales/fr_FR/STRING_V2.po [moved from scilab/modules/STRING_V2/locales/fr_FR/STRING_V2.po with 99% similarity]
scilab/modules/string/macros/arobasestring2strings.sci [moved from scilab/modules/STRING_V2/macros/arobasestring2strings.sci with 100% similarity]
scilab/modules/string/macros/ascii2string.sci [moved from scilab/modules/STRING_V2/macros/ascii2string.sci with 100% similarity]
scilab/modules/string/macros/blanks.sci [moved from scilab/modules/STRING_V2/macros/blanks.sci with 100% similarity]
scilab/modules/string/macros/buildmacros.bat [moved from scilab/modules/STRING_V2/macros/buildmacros.bat with 100% similarity]
scilab/modules/string/macros/buildmacros.sce [moved from scilab/modules/STRING_V2/macros/buildmacros.sce with 83% similarity]
scilab/modules/string/macros/cat_code.sci [moved from scilab/modules/STRING_V2/macros/cat_code.sci with 100% similarity]
scilab/modules/string/macros/cleanmacros.bat [moved from scilab/modules/STRING_V2/macros/cleanmacros.bat with 100% similarity]
scilab/modules/string/macros/eval.sci [moved from scilab/modules/STRING_V2/macros/eval.sci with 100% similarity]
scilab/modules/string/macros/evstr.sci [moved from scilab/modules/STRING_V2/macros/evstr.sci with 100% similarity]
scilab/modules/string/macros/expression2code.sci [moved from scilab/modules/STRING_V2/macros/expression2code.sci with 100% similarity]
scilab/modules/string/macros/instruction2code.sci [moved from scilab/modules/STRING_V2/macros/instruction2code.sci with 100% similarity]
scilab/modules/string/macros/isnum.sci [moved from scilab/modules/STRING_V2/macros/isnum.sci with 100% similarity]
scilab/modules/string/macros/justify.sci [moved from scilab/modules/STRING_V2/macros/justify.sci with 100% similarity]
scilab/modules/string/macros/rhs2code.sci [moved from scilab/modules/STRING_V2/macros/rhs2code.sci with 100% similarity]
scilab/modules/string/macros/sci2exp.sci [moved from scilab/modules/STRING_V2/macros/sci2exp.sci with 100% similarity]
scilab/modules/string/macros/strcmpi.sci [moved from scilab/modules/STRING_V2/macros/strcmpi.sci with 100% similarity]
scilab/modules/string/macros/tokenpos.sci [moved from scilab/modules/STRING_V2/macros/tokenpos.sci with 100% similarity]
scilab/modules/string/macros/tree2code.sci [moved from scilab/modules/STRING_V2/macros/tree2code.sci with 100% similarity]
scilab/modules/string/readme.txt [moved from scilab/modules/STRING_V2/readme.txt with 100% similarity]
scilab/modules/string/sci_gateway/STRING_V2_gateway.xml [moved from scilab/modules/STRING_V2/sci_gateway/STRING_V2_gateway.xml with 98% similarity]
scilab/modules/string/sci_gateway/c/gw_string.c [moved from scilab/modules/STRING_V2/sci_gateway/c/gw_string.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_ascii.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_ascii.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_code2str.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_code2str.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_convstr.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_convstr.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_emptystr.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_emptystr.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_grep.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_grep.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_isalphanum.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_isalphanum.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_isascii.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_isascii.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_isdigit.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_isdigit.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_isletter.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_isletter.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_length.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_length.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_part.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_part.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_regexp.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_regexp.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_str2code.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_str2code.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_strcat.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_strcat.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_strchr.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_strchr.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_strcmp.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_strcmp.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_strcspn.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_strcspn.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_strindex.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_strindex.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_string.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_string.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_stripblanks.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_stripblanks.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_strncpy.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_strncpy.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_strrchr.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_strrchr.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_strrev.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_strrev.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_strsplit.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_strsplit.c with 99% similarity]
scilab/modules/string/sci_gateway/c/sci_strspn.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_strspn.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_strstr.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_strstr.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_strsubst.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_strsubst.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_strtod.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_strtod.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_strtok.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_strtok.c with 100% similarity]
scilab/modules/string/sci_gateway/c/sci_tokens.c [moved from scilab/modules/STRING_V2/sci_gateway/c/sci_tokens.c with 100% similarity]
scilab/modules/string/sci_gateway/fortran/sci_string.f [moved from scilab/modules/STRING_V2/sci_gateway/fortran/sci_string.f with 100% similarity]
scilab/modules/string/sci_gateway/fortran/strops.f [moved from scilab/modules/STRING_V2/sci_gateway/fortran/strops.f with 100% similarity]
scilab/modules/string/src/c/CreateEmptystr.c [moved from scilab/modules/STRING_V2/src/c/CreateEmptystr.c with 100% similarity]
scilab/modules/string/src/c/CreateEmptystr.h [moved from scilab/modules/STRING_V2/src/c/CreateEmptystr.h with 100% similarity]
scilab/modules/string/src/c/DllMainString.c [moved from scilab/modules/STRING_V2/src/c/DllMainString.c with 100% similarity]
scilab/modules/string/src/c/Get_length.c [moved from scilab/modules/STRING_V2/src/c/Get_length.c with 100% similarity]
scilab/modules/string/src/c/Get_length.h [moved from scilab/modules/STRING_V2/src/c/Get_length.h with 100% similarity]
scilab/modules/string/src/c/InitializeString.c [moved from scilab/modules/STRING_V2/src/c/InitializeString.c with 100% similarity]
scilab/modules/string/src/c/LibScilab_Import.def [moved from scilab/modules/STRING_V2/src/c/LibScilab_Import.def with 100% similarity]
scilab/modules/string/src/c/code2str.c [moved from scilab/modules/STRING_V2/src/c/code2str.c with 100% similarity]
scilab/modules/string/src/c/code2str.h [moved from scilab/modules/STRING_V2/src/c/code2str.h with 100% similarity]
scilab/modules/string/src/c/config.h [moved from scilab/modules/STRING_V2/src/c/config.h with 100% similarity]
scilab/modules/string/src/c/convstr.c [moved from scilab/modules/STRING_V2/src/c/convstr.c with 100% similarity]
scilab/modules/string/src/c/convstr.h [moved from scilab/modules/STRING_V2/src/c/convstr.h with 100% similarity]
scilab/modules/string/src/c/cvstr.c [moved from scilab/modules/STRING_V2/src/c/cvstr.c with 100% similarity]
scilab/modules/string/src/c/getfastcode.c [moved from scilab/modules/STRING_V2/src/c/getfastcode.c with 100% similarity]
scilab/modules/string/src/c/isalphanum.c [moved from scilab/modules/STRING_V2/src/c/isalphanum.c with 100% similarity]
scilab/modules/string/src/c/isalphanum.h [moved from scilab/modules/STRING_V2/src/c/isalphanum.h with 100% similarity]
scilab/modules/string/src/c/isdigit.c [moved from scilab/modules/STRING_V2/src/c/isdigit.c with 100% similarity]
scilab/modules/string/src/c/isdigit.h [moved from scilab/modules/STRING_V2/src/c/isdigit.h with 100% similarity]
scilab/modules/string/src/c/isletter.c [moved from scilab/modules/STRING_V2/src/c/isletter.c with 100% similarity]
scilab/modules/string/src/c/isletter.h [moved from scilab/modules/STRING_V2/src/c/isletter.h with 100% similarity]
scilab/modules/string/src/c/kmp.c [moved from scilab/modules/STRING_V2/src/c/kmp.c with 100% similarity]
scilab/modules/string/src/c/kmp.h [moved from scilab/modules/STRING_V2/src/c/kmp.h with 100% similarity]
scilab/modules/string/src/c/men_Sutils.c [moved from scilab/modules/STRING_V2/src/c/men_Sutils.c with 100% similarity]
scilab/modules/string/src/c/pcre_error.c [moved from scilab/modules/STRING_V2/src/c/pcre_error.c with 100% similarity]
scilab/modules/string/src/c/pcre_error.h [moved from scilab/modules/STRING_V2/src/c/pcre_error.h with 100% similarity]
scilab/modules/string/src/c/pcre_internal.h [moved from scilab/modules/STRING_V2/src/c/pcre_internal.h with 100% similarity]
scilab/modules/string/src/c/pcre_private.c [moved from scilab/modules/STRING_V2/src/c/pcre_private.c with 100% similarity]
scilab/modules/string/src/c/pcre_private.h [moved from scilab/modules/STRING_V2/src/c/pcre_private.h with 100% similarity]
scilab/modules/string/src/c/pcre_tables.c [moved from scilab/modules/STRING_V2/src/c/pcre_tables.c with 100% similarity]
scilab/modules/string/src/c/setScilabCharactersCodes.c [moved from scilab/modules/STRING_V2/src/c/setScilabCharactersCodes.c with 100% similarity]
scilab/modules/string/src/c/setScilabCharactersCodes.h [moved from scilab/modules/STRING_V2/src/c/setScilabCharactersCodes.h with 100% similarity]
scilab/modules/string/src/c/strcatfunction.c [moved from scilab/modules/STRING_V2/src/c/strcatfunction.c with 100% similarity]
scilab/modules/string/src/c/strcatfunction.h [moved from scilab/modules/STRING_V2/src/c/strcatfunction.h with 100% similarity]
scilab/modules/string/src/c/string.vcproj [moved from scilab/modules/STRING_V2/src/c/string.vcproj with 99% similarity]
scilab/modules/string/src/c/string_f_Import.def [moved from scilab/modules/STRING_V2/src/c/string_f_Import.def with 100% similarity]
scilab/modules/string/src/c/string_header.def [moved from scilab/modules/STRING_V2/src/c/string_header.def with 100% similarity]
scilab/modules/string/src/c/stringsCompare.c [moved from scilab/modules/STRING_V2/src/c/stringsCompare.c with 100% similarity]
scilab/modules/string/src/c/stringsCompare.h [moved from scilab/modules/STRING_V2/src/c/stringsCompare.h with 100% similarity]
scilab/modules/string/src/c/stringsstrrchr.c [moved from scilab/modules/STRING_V2/src/c/stringsstrrchr.c with 100% similarity]
scilab/modules/string/src/c/stringsstrrchr.h [moved from scilab/modules/STRING_V2/src/c/stringsstrrchr.h with 100% similarity]
scilab/modules/string/src/c/stringsstrrev.c [moved from scilab/modules/STRING_V2/src/c/stringsstrrev.c with 100% similarity]
scilab/modules/string/src/c/stringsstrrev.h [moved from scilab/modules/STRING_V2/src/c/stringsstrrev.h with 100% similarity]
scilab/modules/string/src/c/stripblanks.c [moved from scilab/modules/STRING_V2/src/c/stripblanks.c with 100% similarity]
scilab/modules/string/src/c/stripblanks.h [moved from scilab/modules/STRING_V2/src/c/stripblanks.h with 100% similarity]
scilab/modules/string/src/c/strsplit.c [moved from scilab/modules/STRING_V2/src/c/strsplit.c with 100% similarity]
scilab/modules/string/src/c/strsplit.h [moved from scilab/modules/STRING_V2/src/c/strsplit.h with 100% similarity]
scilab/modules/string/src/c/strsubst.c [moved from scilab/modules/STRING_V2/src/c/strsubst.c with 100% similarity]
scilab/modules/string/src/c/strsubst.h [moved from scilab/modules/STRING_V2/src/c/strsubst.h with 100% similarity]
scilab/modules/string/src/c/tokens.c [moved from scilab/modules/STRING_V2/src/c/tokens.c with 100% similarity]
scilab/modules/string/src/c/tokens.h [moved from scilab/modules/STRING_V2/src/c/tokens.h with 100% similarity]
scilab/modules/string/src/c/ucp.h [moved from scilab/modules/STRING_V2/src/c/ucp.h with 100% similarity]
scilab/modules/string/src/fortran/LibScilab_Import.def [moved from scilab/modules/STRING_V2/src/fortran/LibScilab_Import.def with 100% similarity]
scilab/modules/string/src/fortran/strdsp.f [moved from scilab/modules/STRING_V2/src/fortran/strdsp.f with 100% similarity]
scilab/modules/string/src/fortran/string_Import.def [moved from scilab/modules/STRING_V2/src/fortran/string_Import.def with 100% similarity]
scilab/modules/string/src/fortran/string_f.vfproj [moved from scilab/modules/STRING_V2/src/fortran/string_f.vfproj with 98% similarity]
scilab/modules/string/src/fortran/string_f2c.vcproj [moved from scilab/modules/STRING_V2/src/fortran/string_f2c.vcproj with 100% similarity]
scilab/modules/string/src/fortran/string_f_header.def [moved from scilab/modules/STRING_V2/src/fortran/string_f_header.def with 100% similarity]
scilab/modules/string/tests/benchmarks/ascii_code.txt [moved from scilab/modules/STRING_V2/tests/benchmarks/ascii_code.txt with 100% similarity]
scilab/modules/string/tests/benchmarks/ascii_text.txt [moved from scilab/modules/STRING_V2/tests/benchmarks/ascii_text.txt with 100% similarity]
scilab/modules/string/tests/benchmarks/bench_ascii_1.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_ascii_1.tst with 100% similarity]
scilab/modules/string/tests/benchmarks/bench_ascii_2.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_ascii_2.tst with 100% similarity]
scilab/modules/string/tests/benchmarks/bench_ascii_3.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_ascii_3.tst with 79% similarity]
scilab/modules/string/tests/benchmarks/bench_ascii_4.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_ascii_4.tst with 80% similarity]
scilab/modules/string/tests/benchmarks/bench_blanks.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_blanks.tst with 100% similarity]
scilab/modules/string/tests/benchmarks/bench_code2str.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_code2str.tst with 100% similarity]
scilab/modules/string/tests/benchmarks/bench_convstr.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_convstr.tst with 100% similarity]
scilab/modules/string/tests/benchmarks/bench_emptrystr.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_emptrystr.tst with 100% similarity]
scilab/modules/string/tests/benchmarks/bench_grep.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_grep.tst with 81% similarity]
scilab/modules/string/tests/benchmarks/bench_justify_1.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_justify_1.tst with 100% similarity]
scilab/modules/string/tests/benchmarks/bench_justify_2.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_justify_2.tst with 100% similarity]
scilab/modules/string/tests/benchmarks/bench_length.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_length.tst with 93% similarity]
scilab/modules/string/tests/benchmarks/bench_part.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_part.tst with 100% similarity]
scilab/modules/string/tests/benchmarks/bench_str2code.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_str2code.tst with 80% similarity]
scilab/modules/string/tests/benchmarks/bench_strcat.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_strcat.tst with 79% similarity]
scilab/modules/string/tests/benchmarks/bench_strindex.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_strindex.tst with 82% similarity]
scilab/modules/string/tests/benchmarks/bench_string.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_string.tst with 100% similarity]
scilab/modules/string/tests/benchmarks/bench_stripblanks_1.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_stripblanks_1.tst with 100% similarity]
scilab/modules/string/tests/benchmarks/bench_stripblanks_2.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_stripblanks_2.tst with 100% similarity]
scilab/modules/string/tests/benchmarks/bench_stripblanks_3.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_stripblanks_3.tst with 100% similarity]
scilab/modules/string/tests/benchmarks/bench_stripblanks_4.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_stripblanks_4.tst with 80% similarity]
scilab/modules/string/tests/benchmarks/bench_strrev.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_strrev.tst with 79% similarity]
scilab/modules/string/tests/benchmarks/bench_strsplit.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_strsplit.tst with 82% similarity]
scilab/modules/string/tests/benchmarks/bench_strsubst.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_strsubst.tst with 81% similarity]
scilab/modules/string/tests/benchmarks/bench_tokens.tst [moved from scilab/modules/STRING_V2/tests/benchmarks/bench_tokens.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/addstring.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/addstring.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/ascii.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/ascii.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/code2str.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/code2str.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/convstr.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/convstr.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/emptystr.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/emptystr.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/grep.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/grep.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/grep_new.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/grep_new.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/isascii.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/isascii.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/length.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/length.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/part.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/part.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/str2code.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/str2code.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/strcat.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/strcat.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/strcspn.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/strcspn.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/strindex.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/strindex.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/stripblanks.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/stripblanks.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/strncpy.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/strncpy.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/strrchr.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/strrchr.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/strsplit.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/strsplit.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/strsubst.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/strsubst.tst with 100% similarity]
scilab/modules/string/tests/memory_leak/tokens.tst [moved from scilab/modules/STRING_V2/tests/memory_leak/tokens.tst with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_1802.dia.ref [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_1802.dia.ref with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_1802.tst [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_1802.tst with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_1914.dia.ref [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_1914.dia.ref with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_1914.tst [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_1914.tst with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2322.dia.ref [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2322.dia.ref with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2322.tst [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2322.tst with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2410.dia.ref [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2410.dia.ref with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2410.tst [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2410.tst with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2414.dia.ref [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2414.dia.ref with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2414.tst [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2414.tst with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2637.dia.ref [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2637.dia.ref with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2637.tst [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2637.tst with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2656.dia.ref [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2656.dia.ref with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2656.tst [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2656.tst with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2665.dia.ref [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2665.dia.ref with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2665.tst [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2665.tst with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2674.tst [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2674.tst with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2675.dia.ref [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2675.dia.ref with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_2675.tst [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_2675.tst with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_55.dia.ref [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_55.dia.ref with 100% similarity]
scilab/modules/string/tests/nonreg_tests/bug_55.tst [moved from scilab/modules/STRING_V2/tests/nonreg_tests/bug_55.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/ascii.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/ascii.dia.ref with 99% similarity]
scilab/modules/string/tests/unit_tests/ascii.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/ascii.tst with 98% similarity]
scilab/modules/string/tests/unit_tests/base.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/base.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/base.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/base.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/blanks.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/blanks.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/blanks.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/blanks.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/code2str.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/code2str.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/code2str.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/code2str.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/convstr.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/convstr.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/convstr.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/convstr.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/emptystr.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/emptystr.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/emptystr.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/emptystr.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/fun2string.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/fun2string.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/fun2string.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/fun2string.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/grep.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/grep.dia.ref with 99% similarity]
scilab/modules/string/tests/unit_tests/grep.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/grep.tst with 99% similarity]
scilab/modules/string/tests/unit_tests/isalphanum.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/isalphanum.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/isalphanum.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/isalphanum.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/isascii.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/isascii.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/isascii.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/isascii.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/isdigit.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/isdigit.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/isdigit.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/isdigit.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/isletter.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/isletter.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/isletter.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/isletter.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/isnum.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/isnum.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/isnum.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/isnum.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/length.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/length.dia.ref with 97% similarity]
scilab/modules/string/tests/unit_tests/length.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/length.tst with 97% similarity]
scilab/modules/string/tests/unit_tests/mulf.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/mulf.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/mulf.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/mulf.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/part.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/part.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/part.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/part.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/regexp.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/regexp.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/regexp.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/regexp.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/str2code.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/str2code.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/str2code.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/str2code.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/strcat.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strcat.dia.ref with 95% similarity]
scilab/modules/string/tests/unit_tests/strcat.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strcat.tst with 95% similarity]
scilab/modules/string/tests/unit_tests/strchr.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strchr.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/strchr.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strchr.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/strcmp.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strcmp.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/strcmp.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strcmp.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/strcmpi.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strcmpi.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/strcmpi.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strcmpi.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/strcspn.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strcspn.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/strcspn.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strcspn.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/strindex.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strindex.dia.ref with 99% similarity]
scilab/modules/string/tests/unit_tests/strindex.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strindex.tst with 99% similarity]
scilab/modules/string/tests/unit_tests/string.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/string.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/string.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/string.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/stripblanks.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/stripblanks.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/stripblanks.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/stripblanks.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/strncpy.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strncpy.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/strncpy.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strncpy.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/strrchr.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strrchr.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/strrchr.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strrchr.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/strrev.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strrev.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/strrev.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strrev.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/strsplit.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strsplit.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/strsplit.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strsplit.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/strspn.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strspn.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/strspn.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strspn.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/strstr.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strstr.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/strstr.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strstr.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/strsubst.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strsubst.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/strsubst.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strsubst.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/strtod.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strtod.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/strtod.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strtod.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/strtok.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/strtok.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/strtok.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/strtok.tst with 100% similarity]
scilab/modules/string/tests/unit_tests/text.txt [moved from scilab/modules/STRING_V2/tests/unit_tests/text.txt with 100% similarity]
scilab/modules/string/tests/unit_tests/tokens.dia.ref [moved from scilab/modules/STRING_V2/tests/unit_tests/tokens.dia.ref with 100% similarity]
scilab/modules/string/tests/unit_tests/tokens.tst [moved from scilab/modules/STRING_V2/tests/unit_tests/tokens.tst with 100% similarity]
scilab/modules/string/version.xml [moved from scilab/modules/STRING_V2/version.xml with 100% similarity]

index 7e09c5e..3ad24b1 100644 (file)
@@ -49,7 +49,6 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
        $(top_srcdir)/configure $(top_srcdir)/etc/modules.xml.in \
        $(top_srcdir)/modules/core/includes/machine.h.in \
        $(top_srcdir)/modules/helptools/macros/xmlfiletohtml.sci.in \
-       $(top_srcdir)/modules/scicos/src/ocaml/Makefile.in \
        config/compile config/config.guess config/config.rpath \
        config/config.sub config/depcomp config/install-sh \
        config/ltmain.sh config/missing
@@ -73,8 +72,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
 CONFIG_CLEAN_FILES = modules/helptools/macros/xmlfiletohtml.sci \
-       modules/scicos/src/ocaml/Makefile etc/modules.xml \
-       scilab-lib.properties
+       etc/modules.xml scilab-lib.properties
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
        "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(rootdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -396,8 +394,6 @@ distclean-hdr:
        -rm -f modules/core/includes/machine.h modules/core/includes/stamp-h1
 modules/helptools/macros/xmlfiletohtml.sci: $(top_builddir)/config.status $(top_srcdir)/modules/helptools/macros/xmlfiletohtml.sci.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
-modules/scicos/src/ocaml/Makefile: $(top_builddir)/config.status $(top_srcdir)/modules/scicos/src/ocaml/Makefile.in
-       cd $(top_builddir) && $(SHELL) ./config.status $@
 etc/modules.xml: $(top_builddir)/config.status $(top_srcdir)/etc/modules.xml.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
 scilab-lib.properties: $(top_builddir)/config.status $(srcdir)/scilab-lib.properties.in
index 364f2bb..85fac22 100755 (executable)
@@ -979,8 +979,6 @@ TERM_ZTERM_FALSE
 TERM_VTE_TRUE
 TERM_VTE_FALSE
 tcldir
-STRING_V1_TRUE
-STRING_V1_FALSE
 LTLIBOBJS'
 ac_subst_files=''
       ac_precious_vars='build_alias
@@ -1639,7 +1637,6 @@ Optional Packages:
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-string-v1                Use the old version of the String
 
 Some influential environment variables:
   CC          C compiler command
@@ -9762,7 +9759,7 @@ echo "${ECHO_T}$ac_java_classpath" >&6; }
 echo $ECHO_N "checking to see if the java compiler works... $ECHO_C" >&6; }
 
     cat << \EOF > conftest.java
-// #line 9765 "configure"
+// #line 9762 "configure"
 
 
 public class conftest {
@@ -9812,7 +9809,7 @@ echo $ECHO_N "checking type of jvm... $ECHO_C" >&6; }
     if test "x$ac_java_jvm_name" = "x" ; then
 
     cat << \EOF > conftest.java
-// #line 9815 "configure"
+// #line 9812 "configure"
 import gnu.java.io.EncodingManager;
 
 public class conftest {
@@ -9860,7 +9857,7 @@ echo $ECHO_N "checking java API version... $ECHO_C" >&6; }
 
 
     cat << \EOF > conftest.java
-// #line 9863 "configure"
+// #line 9860 "configure"
 import java.nio.charset.Charset;
 
 public class conftest {
@@ -9887,7 +9884,7 @@ EOF
 
 
     cat << \EOF > conftest.java
-// #line 9890 "configure"
+// #line 9887 "configure"
 import java.lang.StringBuilder;
 
 public class conftest {
@@ -11103,7 +11100,7 @@ echo $ECHO_N "checking flexdock... $ECHO_C" >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11106 "configure"
+// #line 11103 "configure"
 import org.flexdock.docking.DockingManager;
 
 public class conftest {
@@ -11169,7 +11166,7 @@ echo $ECHO_N "checking jogl... $ECHO_C" >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11172 "configure"
+// #line 11169 "configure"
 import javax.media.opengl.glu.GLUnurbs;
 
 public class conftest {
@@ -11235,7 +11232,7 @@ echo $ECHO_N "checking gluegen-rt... $ECHO_C" >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11238 "configure"
+// #line 11235 "configure"
 import com.sun.gluegen.runtime.CPU;
 
 public class conftest {
@@ -11301,7 +11298,7 @@ echo $ECHO_N "checking jrosetta-API... $ECHO_C" >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11304 "configure"
+// #line 11301 "configure"
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
 
 public class conftest {
@@ -11367,7 +11364,7 @@ echo $ECHO_N "checking jrosetta-engine... $ECHO_C" >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11370 "configure"
+// #line 11367 "configure"
 import com.artenum.rosetta.core.action.AbstractConsoleAction;
 
 public class conftest {
@@ -11433,7 +11430,7 @@ echo $ECHO_N "checking commons-logging... $ECHO_C" >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11436 "configure"
+// #line 11433 "configure"
 import org.apache.commons.logging.LogFactory;
 
 public class conftest {
@@ -22064,7 +22061,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
 { echo "$as_me:$LINENO: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
 echo $ECHO_N "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... $ECHO_C" >&6; }
 cat > conftest.$ac_ext <<EOF
-#line 22067 "configure"
+#line 22064 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -22448,7 +22445,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
 echo $ECHO_N "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... $ECHO_C" >&6; }
 
 cat > conftest.$ac_ext <<EOF
-#line 22451 "configure"
+#line 22448 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -23642,13 +23639,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:23645: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:23642: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:23648: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:23645: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:23651: output\"" >&5)
+  (eval echo "\"\$as_me:23648: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -24733,7 +24730,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 24736 "configure"' > conftest.$ac_ext
+  echo '#line 24733 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -26366,11 +26363,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:26369: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:26366: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:26373: \$? = $ac_status" >&5
+   echo "$as_me:26370: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -26688,11 +26685,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:26691: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:26688: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:26695: \$? = $ac_status" >&5
+   echo "$as_me:26692: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -26793,11 +26790,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:26796: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:26793: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:26800: \$? = $ac_status" >&5
+   echo "$as_me:26797: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -26848,11 +26845,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:26851: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:26848: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:26855: \$? = $ac_status" >&5
+   echo "$as_me:26852: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -29677,7 +29674,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 29680 "configure"
+#line 29677 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -29777,7 +29774,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 29780 "configure"
+#line 29777 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -31815,11 +31812,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:31818: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:31815: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:31822: \$? = $ac_status" >&5
+   echo "$as_me:31819: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -31914,11 +31911,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:31917: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:31914: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:31921: \$? = $ac_status" >&5
+   echo "$as_me:31918: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -31966,11 +31963,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:31969: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:31966: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:31973: \$? = $ac_status" >&5
+   echo "$as_me:31970: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -33349,11 +33346,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:33352: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:33349: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:33356: \$? = $ac_status" >&5
+   echo "$as_me:33353: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -33448,11 +33445,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:33451: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:33448: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:33455: \$? = $ac_status" >&5
+   echo "$as_me:33452: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -33500,11 +33497,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:33503: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:33500: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:33507: \$? = $ac_status" >&5
+   echo "$as_me:33504: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -35717,25 +35714,6 @@ _ACEOF
 
 
 
-##############�TEMP Stuff ##################
-
-
-# Check whether --with-string-v1 was given.
-if test "${with_string_v1+set}" = set; then
-  withval=$with_string_v1;
-fi
-
-
- if test "$with_string_v1" = yes; then
-  STRING_V1_TRUE=
-  STRING_V1_FALSE='#'
-else
-  STRING_V1_TRUE='#'
-  STRING_V1_FALSE=
-fi
-
-
-
 #################
 ## stop on warning
 #################
@@ -35749,7 +35727,7 @@ if test "$enable_stop_on_warning" = yes; then
    CXXFLAGS="$CXXFLAGS -Werror -O0"
 fi
 
-ac_config_files="$ac_config_files libs/lapack/Makefile libs/blas/Makefile libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/metanet/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/STRING_V2/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/fftw/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/others/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/scipad/Makefile modules/scilab2fortran/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/Makefile libs/Makefile Makefile etc/modules.xml scilab-lib.properties"
+ac_config_files="$ac_config_files libs/lapack/Makefile libs/blas/Makefile libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/metanet/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/fftw/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/others/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/scipad/Makefile modules/scilab2fortran/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/Makefile libs/Makefile Makefile etc/modules.xml scilab-lib.properties"
 
 #Scicos stuff
 #modules/scicos/src/ocaml/Makefile
@@ -36039,13 +36017,6 @@ echo "$as_me: error: conditional \"TERM_VTE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${STRING_V1_TRUE}" && test -z "${STRING_V1_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"STRING_V1\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"STRING_V1\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -36964,7 +36935,6 @@ do
     "modules/fileio/Makefile") CONFIG_FILES="$CONFIG_FILES modules/fileio/Makefile" ;;
     "modules/spreadsheet/Makefile") CONFIG_FILES="$CONFIG_FILES modules/spreadsheet/Makefile" ;;
     "modules/string/Makefile") CONFIG_FILES="$CONFIG_FILES modules/string/Makefile" ;;
-    "modules/STRING_V2/Makefile") CONFIG_FILES="$CONFIG_FILES modules/STRING_V2/Makefile" ;;
     "modules/time/Makefile") CONFIG_FILES="$CONFIG_FILES modules/time/Makefile" ;;
     "modules/graphics/Makefile") CONFIG_FILES="$CONFIG_FILES modules/graphics/Makefile" ;;
     "modules/graphic_export/Makefile") CONFIG_FILES="$CONFIG_FILES modules/graphic_export/Makefile" ;;
@@ -37358,12 +37328,10 @@ TERM_ZTERM_FALSE!$TERM_ZTERM_FALSE$ac_delim
 TERM_VTE_TRUE!$TERM_VTE_TRUE$ac_delim
 TERM_VTE_FALSE!$TERM_VTE_FALSE$ac_delim
 tcldir!$tcldir$ac_delim
-STRING_V1_TRUE!$STRING_V1_TRUE$ac_delim
-STRING_V1_FALSE!$STRING_V1_FALSE$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 
 echo ""
 echo "TCL/TK configuration:"
-echo "  TK_INC_PATH ....... = $TK_INC_PATH"
-echo "  TCL_INC_PATH ...... = $TCL_INC_PATH"
-echo "  TCLTK_LIBS ........ = $TCLTK_LIBS"
-echo "  TCL_SERIAL_VERSION  = $TCL_SERIAL_VERSION"
-echo "  TK_SERIAL_VERSION . = $TK_SERIAL_VERSION"
+echo "  TK_INC_PATH ........ = $TK_INC_PATH"
+echo "  TCL_INC_PATH ....... = $TCL_INC_PATH"
+echo "  TCLTK_LIBS ......... = $TCLTK_LIBS"
+echo "  TCL_SERIAL_VERSION . = $TCL_SERIAL_VERSION"
+echo "  TK_SERIAL_VERSION .. = $TK_SERIAL_VERSION"
 
 echo ""
 echo "XML configuration:"
-echo "  XML_FLAGS ......... = $XML_FLAGS"
-echo "  XML_LIBS .......... = $XML_LIBS"
-echo "  XML_VERSION ....... = $XML_VERSION"
+echo "  XML_FLAGS .......... = $XML_FLAGS"
+echo "  XML_LIBS ........... = $XML_LIBS"
+echo "  XML_VERSION ........ = $XML_VERSION"
 
 echo ""
 echo "PCRE configuration:"
-echo "  PCRE_CFLAGS ....... = $PCRE_CFLAGS"
-echo "  PCRE_LIBS ......... = $PCRE_LIBS"
-echo "  PCRE_VERSION ...... = $PCRE_VERSION"
+echo "  PCRE_CFLAGS ........ = $PCRE_CFLAGS"
+echo "  PCRE_LIBS .......... = $PCRE_LIBS"
+echo "  PCRE_VERSION ....... = $PCRE_VERSION"
 
 
 echo ""
 echo "SWIG Configuration:"
 if test ! -z "$SWIG_BIN"; then
-echo "  SWIG_BIN .......... = $SWIG_BIN"
-echo "  SWIG_JAVA ......... = $SWIG_JAVA"
+echo "  SWIG_BIN ........... = $SWIG_BIN"
+echo "  SWIG_JAVA .......... = $SWIG_JAVA"
 else
 echo "  SWIG generation disabled"
 fi
@@ -38962,7 +38930,7 @@ fi
 echo ""
 echo "GIWS Configuration:"
 if test ! -z "$GIWS_BIN"; then
-echo "  GIWS_BIN .......... = $GIWS_BIN"
+echo "  GIWS_BIN ........... = $GIWS_BIN"
 else
 echo "  GIWS generation disabled"
 fi
index 34e4a3c..3ba8231 100644 (file)
@@ -1015,14 +1015,6 @@ AC_SUBST(tcldir)
 AC_DEFINE_UNQUOTED([SHARED_LIB_EXT],["$shrext_cmds"],[Extension of a shared library])
 
 
-##############�TEMP Stuff ##################
-
-AC_ARG_WITH(string-v1,
-    [  --with-string-v1                   Use the old version of the String  ])
-
-AM_CONDITIONAL(STRING_V1, test "$with_string_v1" = yes)
-
-
 #################
 ## stop on warning
 #################
@@ -1077,7 +1069,6 @@ modules/double/Makefile
 modules/fileio/Makefile
 modules/spreadsheet/Makefile
 modules/string/Makefile
-modules/STRING_V2/Makefile
 modules/time/Makefile
 modules/graphics/Makefile
 modules/graphic_export/Makefile
index 307a2c9..97622ce 100644 (file)
 <module name="signal_processing" activate="1"/>
 <module name="sparse" activate="1"/>
 <module name="special_functions" activate="1"/>
-<module name="STRING_V2" activate="1"/>
+<module name="string" activate="1"/>
 <module name="symbolic" activate="1"/>
 <module name="time" activate="1"/>
 <module name="statistics" activate="1"/>
-<!-- comments -->
 <module name="arnoldi" activate="1"/>
 <module name="compatibility_functions" activate="1"/>
 <module name="metanet" activate="1"/>
index f5f1c52..94fb2af 100644 (file)
 <module name="signal_processing" activate="1"/>
 <module name="sparse" activate="1"/>
 <module name="special_functions" activate="1"/>
-<!-- comments -->
-<!--
- If you want to use previous string,
- modify next lines with :
- module name="string" activate="1"
- module name="STRING_V2" activate="0"
- -->
- <!-- comments -->
-<module name="string" activate="0"/>
-<module name="STRING_V2" activate="1"/>
-<!-- comments -->
+<module name="string" activate="1"/>
 <module name="symbolic" activate="1"/>
 <module name="time" activate="1"/>
 <module name="windows_tools" activate="1"/>
index 3d3186f..58da2c7 100644 (file)
@@ -6,12 +6,8 @@
 # The order DOES matter !!!
 SUBDIRS = polynomials
 
-if STRING_V1
-SUBDIRS += string
-endif
-
 SUBDIRS += \
-STRING_V2 \
+string \
 intersci \
 cacsd \
 elementary_functions \
@@ -151,12 +147,7 @@ libscilab_la_LIBADD = \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la
 
 # Temp stuff
-if STRING_V1
 libscilab_la_LIBADD += $(top_builddir)/modules/string/libscistring.la
-else
-libscilab_la_LIBADD += $(top_builddir)/modules/STRING_V2/libscistring.la
-endif
-
 
 #if MPI
 #libscilab_la_LIBADD += $(top_builddir)/modules/mpi/libscimpi.la
index 8a8429a..ff411dc 100644 (file)
@@ -37,32 +37,27 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@STRING_V1_TRUE@am__append_1 = string
 
 #if MPI
 #SUBDIRS += mpi
 #endif
-@SCICOS_TRUE@am__append_2 = scicos_blocks
+@SCICOS_TRUE@am__append_1 = scicos_blocks
 
 # javasci should be compile at the end because it needs libscilab.la
 # Don't forget that the order in subdirs does matter !!!
-@JAVASCI_TRUE@am__append_3 = javasci
-@USE_EMBEDDED_LAPACK_FALSE@am__append_4 = $(LAPACK_LIBS)
-@USE_EMBEDDED_BLAS_FALSE@am__append_5 = $(BLAS_LIBS)
-
-# Temp stuff
-@STRING_V1_TRUE@am__append_6 = $(top_builddir)/modules/string/libscistring.la
-@STRING_V1_FALSE@am__append_7 = $(top_builddir)/modules/STRING_V2/libscistring.la
+@JAVASCI_TRUE@am__append_2 = javasci
+@USE_EMBEDDED_LAPACK_FALSE@am__append_3 = $(LAPACK_LIBS)
+@USE_EMBEDDED_BLAS_FALSE@am__append_4 = $(BLAS_LIBS)
 
 #if MPI
 #libscilab_la_LIBADD += $(top_builddir)/modules/mpi/libscimpi.la
 #endif
-@FFTW_TRUE@am__append_8 = $(top_builddir)/modules/fftw/libscifftw.la
-@SCICOS_TRUE@am__append_9 = $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la
-@USE_EMBEDDED_BLAS_TRUE@am__append_10 = \
+@FFTW_TRUE@am__append_5 = $(top_builddir)/modules/fftw/libscifftw.la
+@SCICOS_TRUE@am__append_6 = $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la
+@USE_EMBEDDED_BLAS_TRUE@am__append_7 = \
 @USE_EMBEDDED_BLAS_TRUE@$(top_builddir)/libs/blas/libsciblas.la
 
-@USE_EMBEDDED_LAPACK_TRUE@am__append_11 = \
+@USE_EMBEDDED_LAPACK_TRUE@am__append_8 = \
 @USE_EMBEDDED_LAPACK_TRUE@$(top_builddir)/libs/lapack/libscilapack.la
 
 subdir = modules
@@ -136,14 +131,14 @@ libscilab_la_DEPENDENCIES = $(top_builddir)/modules/mexlib/libmex.la \
        $(top_builddir)/modules/action_binding/libsciaction_binding.la \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(am__append_6) $(am__append_7) $(am__append_8) \
+       $(top_builddir)/modules/string/libscistring.la $(am__append_5) \
        $(top_builddir)/modules/jvm/libscijvm.la \
-       $(top_builddir)/modules/scicos/libsciscicos.la $(am__append_9) \
+       $(top_builddir)/modules/scicos/libsciscicos.la $(am__append_6) \
        $(top_builddir)/libs/hashtable/libscihashtable.la \
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
        $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
-       $(top_builddir)/libs/libst/libscilibst.la $(am__append_10) \
-       $(am__append_11)
+       $(top_builddir)/libs/libst/libscilibst.la $(am__append_7) \
+       $(am__append_8)
 am_libscilab_la_OBJECTS =
 libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS)
 libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -172,18 +167,17 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive   \
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = polynomials string STRING_V2 intersci cacsd \
-       elementary_functions arnoldi boolean output_stream \
-       dynamic_link linear_algebra differential_equations \
-       signal_processing fileio core metanet optimization \
-       interpolation localization sound statistics time integer \
-       special_functions double randlib data_structures mexlib \
-       symbolic tclsci sparse io shell completion history_manager \
-       action_binding console renderer graphic_export gui graphics \
-       windows_tools functions others overloading maple2scilab m2sci \
-       texmacs scipad scilab2fortran development_tools \
-       compatibility_functions helptools fftw pvm spreadsheet jvm \
-       demo_tools scicos_blocks scicos . javasci
+DIST_SUBDIRS = polynomials string intersci cacsd elementary_functions \
+       arnoldi boolean output_stream dynamic_link linear_algebra \
+       differential_equations signal_processing fileio core metanet \
+       optimization interpolation localization sound statistics time \
+       integer special_functions double randlib data_structures \
+       mexlib symbolic tclsci sparse io shell completion \
+       history_manager action_binding console renderer graphic_export \
+       gui graphics windows_tools functions others overloading \
+       maple2scilab m2sci texmacs scipad scilab2fortran \
+       development_tools compatibility_functions helptools fftw pvm \
+       spreadsheet jvm demo_tools scicos_blocks scicos . javasci
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -363,18 +357,18 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # The order DOES matter !!!
-SUBDIRS = polynomials $(am__append_1) STRING_V2 intersci cacsd \
-       elementary_functions arnoldi boolean output_stream \
-       dynamic_link linear_algebra differential_equations \
-       signal_processing fileio core metanet optimization \
-       interpolation localization sound statistics time integer \
-       special_functions double randlib data_structures mexlib \
-       symbolic tclsci sparse io shell completion history_manager \
-       action_binding console renderer graphic_export gui graphics \
-       windows_tools functions others overloading maple2scilab m2sci \
-       texmacs scipad scilab2fortran development_tools \
-       compatibility_functions helptools fftw pvm spreadsheet jvm \
-       demo_tools $(am__append_2) scicos . $(am__append_3)
+SUBDIRS = polynomials string intersci cacsd elementary_functions \
+       arnoldi boolean output_stream dynamic_link linear_algebra \
+       differential_equations signal_processing fileio core metanet \
+       optimization interpolation localization sound statistics time \
+       integer special_functions double randlib data_structures \
+       mexlib symbolic tclsci sparse io shell completion \
+       history_manager action_binding console renderer graphic_export \
+       gui graphics windows_tools functions others overloading \
+       maple2scilab m2sci texmacs scipad scilab2fortran \
+       development_tools compatibility_functions helptools fftw pvm \
+       spreadsheet jvm demo_tools $(am__append_1) scicos . \
+       $(am__append_2)
 modulename = 
 
 #### Basic files ####
@@ -383,9 +377,11 @@ libscilab_la_rootdir = $(mydatadir)
 #
 pkglib_LTLIBRARIES = libscilab.la
 libscilab_la_SOURCES = 
-libscilab_la_LDFLAGS = $(am__append_4) $(am__append_5)
+libscilab_la_LDFLAGS = $(am__append_3) $(am__append_4)
 
 # Core modules
+
+# Temp stuff
 libscilab_la_LIBADD = $(top_builddir)/modules/mexlib/libmex.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
        $(top_builddir)/modules/boolean/libsciboolean.la \
@@ -428,14 +424,14 @@ libscilab_la_LIBADD = $(top_builddir)/modules/mexlib/libmex.la \
        $(top_builddir)/modules/action_binding/libsciaction_binding.la \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(am__append_6) $(am__append_7) $(am__append_8) \
+       $(top_builddir)/modules/string/libscistring.la $(am__append_5) \
        $(top_builddir)/modules/jvm/libscijvm.la \
-       $(top_builddir)/modules/scicos/libsciscicos.la $(am__append_9) \
+       $(top_builddir)/modules/scicos/libsciscicos.la $(am__append_6) \
        $(top_builddir)/libs/hashtable/libscihashtable.la \
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
        $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
-       $(top_builddir)/libs/libst/libscilibst.la $(am__append_10) \
-       $(am__append_11)
+       $(top_builddir)/libs/libst/libscilibst.la $(am__append_7) \
+       $(am__append_8)
 all: all-recursive
 
 .SUFFIXES:
index 096acc0..833ae8b 100644 (file)
@@ -291,15 +291,9 @@ libscicore_la_CFLAGS=      -Iincludes/ \
                        -I$(top_srcdir)/modules/localization/includes \
                        -I$(top_srcdir)/modules/tclsci/includes \
                        -I$(top_srcdir)/modules/STRING_V2/includes \
-                       -I$(top_srcdir)/modules/dynamic_link/includes \
-                       -I$(top_srcdir)/modules/elementary_functions/includes
-
-
-if STRING_V1
-libscicore_la_CFLAGS += -I$(top_srcdir)/modules/string/includes
-else
-libscicore_la_CFLAGS += -I$(top_srcdir)/modules/STRING_V2/includes
-endif
+                   -I$(top_srcdir)/modules/dynamic_link/includes \
+                       -I$(top_srcdir)/modules/elementary_functions/includes \
+            -I$(top_srcdir)/modules/string/includes
 
 libscicore_la_LDFLAGS = $(XML_LIBS)
 pkglib_LTLIBRARIES = libscicore.la
@@ -314,13 +308,9 @@ libscicore_la_LIBADD = \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
        $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
-       $(top_builddir)/modules/fileio/libscifileio.la
+       $(top_builddir)/modules/fileio/libscifileio.la \
+    $(top_builddir)/modules/string/libscistring.la
 
-if STRING_V1
-libscicore_la_LIBADD += $(top_builddir)/modules/string/libscistring.la
-else
-libscicore_la_LIBADD += $(top_builddir)/modules/STRING_V2/libscistring.la
-endif
 
 #### Target ######
 modulename=core
index 4d82f26..46a4442 100644 (file)
@@ -47,15 +47,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@STRING_V1_TRUE@am__append_1 = -I$(top_srcdir)/modules/string/includes
-@STRING_V1_FALSE@am__append_2 = -I$(top_srcdir)/modules/STRING_V2/includes
-@STRING_V1_TRUE@am__append_3 = $(top_builddir)/modules/string/libscistring.la
-@STRING_V1_FALSE@am__append_4 = $(top_builddir)/modules/STRING_V2/libscistring.la
 DIST_COMMON = $(libscicore_la_include_HEADERS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_5 = java
-@SWIG_TRUE@am__append_6 = swig
-@GIWS_TRUE@am__append_7 = giws
+@GUI_TRUE@am__append_1 = java
+@SWIG_TRUE@am__append_2 = swig
+@GIWS_TRUE@am__append_3 = giws
 subdir = modules/core
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -98,8 +94,8 @@ libscicore_la_DEPENDENCIES =  \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
        $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
-       $(top_builddir)/modules/fileio/libscifileio.la $(am__append_3) \
-       $(am__append_4)
+       $(top_builddir)/modules/fileio/libscifileio.la \
+       $(top_builddir)/modules/string/libscistring.la
 am__objects_1 = libscicore_la-inffic.lo libscicore_la-cs2st.lo \
        libscicore_la-tmpdir.lo libscicore_la-intmacr2tree.lo \
        libscicore_la-fromjava.lo libscicore_la-run.lo \
@@ -693,29 +689,34 @@ sci_gateway/fortran/sci_debug.f \
 sci_gateway/fortran/sci_error.f \
 sci_gateway/fortran/sci_isglobal.f
 
-libscicore_la_CFLAGS = -Iincludes/ -Isrc/c/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ $(XML_FLAGS) \
-       -I$(top_srcdir)/libs/doublylinkedlist/includes \
-       -I$(top_srcdir)/modules/action_binding/includes \
-       -I$(top_srcdir)/modules/output_stream/includes \
-       -I$(top_srcdir)/modules/localization/includes \
-       -I$(top_srcdir)/modules/tclsci/includes \
-       -I$(top_srcdir)/modules/STRING_V2/includes \
-       -I$(top_srcdir)/modules/dynamic_link/includes \
-       -I$(top_srcdir)/modules/elementary_functions/includes \
-       $(am__append_1) $(am__append_2)
+libscicore_la_CFLAGS = -Iincludes/ \
+                       -Isrc/c/ \
+                       -I$(top_srcdir)/libs/MALLOC/includes/ \
+                       $(XML_FLAGS) \
+                       -I$(top_srcdir)/libs/doublylinkedlist/includes \
+                       -I$(top_srcdir)/modules/action_binding/includes \
+                       -I$(top_srcdir)/modules/output_stream/includes \
+                       -I$(top_srcdir)/modules/localization/includes \
+                       -I$(top_srcdir)/modules/tclsci/includes \
+                       -I$(top_srcdir)/modules/STRING_V2/includes \
+                   -I$(top_srcdir)/modules/dynamic_link/includes \
+                       -I$(top_srcdir)/modules/elementary_functions/includes \
+            -I$(top_srcdir)/modules/string/includes
+
 libscicore_la_LDFLAGS = $(XML_LIBS)
 pkglib_LTLIBRARIES = libscicore.la
 libscicore_la_SOURCES = $(CORE_C_SOURCES) $(CORE_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES) $(JNI_SOURCES)
-libscicore_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la \
+libscicore_la_LIBADD = \
+       $(top_builddir)/libs/MALLOC/libscimalloc.la \
        $(top_builddir)/modules/cacsd/libscicacsd.la \
        $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \
        $(top_builddir)/modules/polynomials/libscipolynomials.la \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
        $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
-       $(top_builddir)/modules/fileio/libscifileio.la $(am__append_3) \
-       $(am__append_4)
+       $(top_builddir)/modules/fileio/libscifileio.la \
+    $(top_builddir)/modules/string/libscistring.la
+
 
 #### Target ######
 modulename = core
@@ -805,7 +806,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_5) $(am__append_6) $(am__append_7)
+TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
 
 ################ MACROS ######################"
 # Rule to build a macro
index 6b8934c..7d2a6a7 100644 (file)
@@ -43,13 +43,8 @@ sci_gateway/fortran/sci_list.f
 
 libscidata_structures_la_CFLAGS=       -Iincludes/ \
                                        -I$(top_srcdir)/libs/MALLOC/includes/ \
-                                       -I$(top_srcdir)/modules/output_stream/includes 
-if STRING_V1
-libscidata_structures_la_CFLAGS += -I$(top_srcdir)/modules/STRING_V2/includes
-else
-libscidata_structures_la_CFLAGS += -I$(top_srcdir)/modules/string/includes
-endif                                  
-
+                                       -I$(top_srcdir)/modules/output_stream/includes \
+                    -I$(top_srcdir)/modules/string/includes
 
 pkglib_LTLIBRARIES = libscidata_structures.la
 
@@ -59,13 +54,9 @@ libscidata_structures_la_LIBADD = \
        $(top_builddir)/modules/polynomials/libscipolynomials.la \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/integer/libsciinteger.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la
+       $(top_builddir)/libs/MALLOC/libscimalloc.la \
+    $(top_builddir)/modules/string/libscistring.la
 
-if STRING_V1
-libscidata_structures_la_LIBADD += $(top_builddir)/modules/string/libscistring.la
-else
-libscidata_structures_la_LIBADD += $(top_builddir)/modules/STRING_V2/libscistring.la
-endif
 
 #### Target ######
 modulename=data_structures
index e0f5da6..6f1da2b 100644 (file)
@@ -47,16 +47,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@STRING_V1_TRUE@am__append_1 = -I$(top_srcdir)/modules/STRING_V2/includes
-@STRING_V1_FALSE@am__append_2 = -I$(top_srcdir)/modules/string/includes
-@STRING_V1_TRUE@am__append_3 = $(top_builddir)/modules/string/libscistring.la
-@STRING_V1_FALSE@am__append_4 = $(top_builddir)/modules/STRING_V2/libscistring.la
 DIST_COMMON = $(libscidata_structures_la_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_5 = java
-@SWIG_TRUE@am__append_6 = swig
-@GIWS_TRUE@am__append_7 = giws
+@GUI_TRUE@am__append_1 = java
+@SWIG_TRUE@am__append_2 = swig
+@GIWS_TRUE@am__append_3 = giws
 subdir = modules/data_structures
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -93,8 +89,8 @@ libscidata_structures_la_DEPENDENCIES =  \
        $(top_builddir)/modules/polynomials/libscipolynomials.la \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/integer/libsciinteger.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la $(am__append_3) \
-       $(am__append_4)
+       $(top_builddir)/libs/MALLOC/libscimalloc.la \
+       $(top_builddir)/modules/string/libscistring.la
 am__objects_1 = libscidata_structures_la-stcreate.lo \
        libscidata_structures_la-hmops.lo
 am__objects_2 = extractfields.lo forcerhs.lo intl_i.lo lsstyp.lo \
@@ -365,17 +361,19 @@ sci_gateway/fortran/sci_lstcat.f \
 sci_gateway/fortran/sci_list.f
 
 libscidata_structures_la_CFLAGS = -Iincludes/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
-       -I$(top_srcdir)/modules/output_stream/includes $(am__append_1) \
-       $(am__append_2)
+                                       -I$(top_srcdir)/libs/MALLOC/includes/ \
+                                       -I$(top_srcdir)/modules/output_stream/includes \
+                    -I$(top_srcdir)/modules/string/includes
+
 pkglib_LTLIBRARIES = libscidata_structures.la
 libscidata_structures_la_SOURCES = $(DATA_STRUCTURES_C_SOURCES) $(DATA_STRUCTURES_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
-libscidata_structures_la_LIBADD =  \
+libscidata_structures_la_LIBADD = \
        $(top_builddir)/modules/polynomials/libscipolynomials.la \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/integer/libsciinteger.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la $(am__append_3) \
-       $(am__append_4)
+       $(top_builddir)/libs/MALLOC/libscimalloc.la \
+    $(top_builddir)/modules/string/libscistring.la
+
 
 #### Target ######
 modulename = data_structures
@@ -406,7 +404,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_5) $(am__append_6) $(am__append_7)
+TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
 
 ################ MACROS ######################"
 # Rule to build a macro
index 7265ae1..d7d76d9 100644 (file)
@@ -70,26 +70,18 @@ sci_gateway/c/sci_createdir.c
 libscifileio_la_CFLAGS=                -Iincludes/ \
                                -Isrc/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
-                               -I$(top_srcdir)/modules/output_stream/includes 
-if STRING_V1
-libscifileio_la_CFLAGS += -I$(top_srcdir)/modules/STRING_V2/includes
-else
-libscifileio_la_CFLAGS += -I$(top_srcdir)/modules/STRING_V2/includes
-endif                                  
-
+                               -I$(top_srcdir)/modules/output_stream/includes \
+                -I$(top_srcdir)/modules/string/includes
+                
 pkglib_LTLIBRARIES = libscifileio.la
 
 libscifileio_la_SOURCES = $(FILEIO_SOURCES) $(GATEWAY_SOURCES)
 
 libscifileio_la_LIBADD = \
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
-    $(top_builddir)/libs/libst/libscilibst.la
-
-if STRING_V1
-libscifileio_la_LIBADD += $(top_builddir)/modules/string/libscistring.la
-else
-libscifileio_la_LIBADD += $(top_builddir)/modules/STRING_V2/libscistring.la
-endif
+    $(top_builddir)/libs/libst/libscilibst.la \
+    $(top_builddir)/modules/string/libscistring.la
+    
 
 #### Target ######
 modulename=fileio
index 9508794..ba28f64 100644 (file)
@@ -47,15 +47,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@STRING_V1_TRUE@am__append_1 = -I$(top_srcdir)/modules/STRING_V2/includes
-@STRING_V1_FALSE@am__append_2 = -I$(top_srcdir)/modules/STRING_V2/includes
-@STRING_V1_TRUE@am__append_3 = $(top_builddir)/modules/string/libscistring.la
-@STRING_V1_FALSE@am__append_4 = $(top_builddir)/modules/STRING_V2/libscistring.la
 DIST_COMMON = $(libscifileio_la_include_HEADERS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_5 = java
-@SWIG_TRUE@am__append_6 = swig
-@GIWS_TRUE@am__append_7 = giws
+@GUI_TRUE@am__append_1 = java
+@SWIG_TRUE@am__append_2 = swig
+@GIWS_TRUE@am__append_3 = giws
 subdir = modules/fileio
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -91,8 +87,8 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscifileio_la_DEPENDENCIES =  \
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/libs/libst/libscilibst.la $(am__append_3) \
-       $(am__append_4)
+       $(top_builddir)/libs/libst/libscilibst.la \
+       $(top_builddir)/modules/string/libscistring.la
 am__objects_1 = libscifileio_la-FileExist.lo libscifileio_la-fileio.lo \
        libscifileio_la-do_xxprintf.lo libscifileio_la-do_xxscanf.lo \
        libscifileio_la-findfiles.lo libscifileio_la-Status2Mode.lo \
@@ -403,15 +399,19 @@ sci_gateway/c/sci_isdir.c \
 sci_gateway/c/sci_removedir.c \
 sci_gateway/c/sci_createdir.c
 
-libscifileio_la_CFLAGS = -Iincludes/ -Isrc/c/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
-       -I$(top_srcdir)/modules/output_stream/includes $(am__append_1) \
-       $(am__append_2)
+libscifileio_la_CFLAGS = -Iincludes/ \
+                               -Isrc/c/ \
+                               -I$(top_srcdir)/libs/MALLOC/includes/ \
+                               -I$(top_srcdir)/modules/output_stream/includes \
+                -I$(top_srcdir)/modules/string/includes
+
 pkglib_LTLIBRARIES = libscifileio.la
 libscifileio_la_SOURCES = $(FILEIO_SOURCES) $(GATEWAY_SOURCES)
-libscifileio_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/libs/libst/libscilibst.la $(am__append_3) \
-       $(am__append_4)
+libscifileio_la_LIBADD = \
+       $(top_builddir)/libs/MALLOC/libscimalloc.la \
+    $(top_builddir)/libs/libst/libscilibst.la \
+    $(top_builddir)/modules/string/libscistring.la
+
 
 #### Target ######
 modulename = fileio
@@ -455,7 +455,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_5) $(am__append_6) $(am__append_7)
+TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
 
 ################ MACROS ######################"
 # Rule to build a macro
index 26b909e..666b755 100644 (file)
@@ -415,14 +415,9 @@ libscigraphics_la_SOURCES = $(GRAPHICS_C_SOURCES) $(GATEWAY_C_SOURCES) $(GRAPHIC
 
 libscigraphics_la_LIBADD = \
        $(top_builddir)/modules/intersci/libsciintersci.la \
-       $(top_builddir)/modules/data_structures/libscidata_structures.la \
-        $(top_builddir)/modules/tclsci/libscitclsci.la
-# Temp stuff
-if STRING_V1
-libscigraphics_la_LIBADD +=    $(top_builddir)/modules/string/libscistring.la
-else
-libscigraphics_la_LIBADD +=    $(top_builddir)/modules/STRING_V2/libscistring.la
-endif
+    $(top_builddir)/modules/data_structures/libscidata_structures.la \
+    $(top_builddir)/modules/tclsci/libscitclsci.la \
+    $(top_builddir)/modules/string/libscistring.la
 
 
 #### graphics : Conf files ####
index 8a8c34f..997cc93 100644 (file)
@@ -59,16 +59,13 @@ host_triplet = @host@
 @GUI_TRUE@                             -I$(top_srcdir)/modules/output_stream/includes \
 @GUI_TRUE@                             -I$(top_srcdir)/modules/graphic_export/includes/
 
-# Temp stuff
-@GUI_TRUE@@STRING_V1_TRUE@am__append_2 = $(top_builddir)/modules/string/libscistring.la
-@GUI_TRUE@@STRING_V1_FALSE@am__append_3 = $(top_builddir)/modules/STRING_V2/libscistring.la
-@GUI_FALSE@am__append_4 = -I$(top_srcdir)/modules/output_stream/includes
+@GUI_FALSE@am__append_2 = -I$(top_srcdir)/modules/output_stream/includes
 DIST_COMMON = $(am__libscigraphics_la_include_HEADERS_DIST) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_5 = java
-@SWIG_TRUE@am__append_6 = swig
-@GIWS_TRUE@am__append_7 = giws
+@GUI_TRUE@am__append_3 = java
+@SWIG_TRUE@am__append_4 = swig
+@GIWS_TRUE@am__append_5 = giws
 subdir = modules/graphics
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -107,7 +104,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
 @GUI_TRUE@     $(top_builddir)/modules/intersci/libsciintersci.la \
 @GUI_TRUE@     $(top_builddir)/modules/data_structures/libscidata_structures.la \
 @GUI_TRUE@     $(top_builddir)/modules/tclsci/libscitclsci.la \
-@GUI_TRUE@     $(am__append_2) $(am__append_3)
+@GUI_TRUE@     $(top_builddir)/modules/string/libscistring.la
 am__libscigraphics_la_SOURCES_DIST = src/nographics/nographics.c \
        src/c/GetCommandArg.c src/c/WindowList.c src/c/Events.c \
        src/c/getHandleProperty/get_figure_position_property.c \
@@ -1068,7 +1065,7 @@ libscigraphics_la_CFLAGS =  \
        -Isrc/c/ -Isrc/c/getHandleProperty/ \
        -I$(top_srcdir)/modules/gui/includes/ \
        -I$(top_srcdir)/modules/STRING_V2/includes/ $(am__append_1) \
-       $(am__append_4)
+       $(am__append_2)
 @GUI_FALSE@GRAPHICS_C_SOURCES = src/nographics/nographics.c
 @GUI_TRUE@GRAPHICS_C_SOURCES = src/c/GetCommandArg.c \
 @GUI_TRUE@src/c/WindowList.c \
@@ -1456,11 +1453,12 @@ libscigraphics_la_CFLAGS =  \
 @GUI_TRUE@libscigraphics_la_LDFLAGS = $(JAVA_JNI_LIBS) $(TCLTK_LIBS) $(X_LIBS)
 @GUI_FALSE@libscigraphics_la_SOURCES = $(GRAPHICS_C_SOURCES)
 @GUI_TRUE@libscigraphics_la_SOURCES = $(GRAPHICS_C_SOURCES) $(GATEWAY_C_SOURCES) $(GRAPHICS_CPP_SOURCES)
-@GUI_TRUE@libscigraphics_la_LIBADD =  \
+@GUI_TRUE@libscigraphics_la_LIBADD = \
 @GUI_TRUE@     $(top_builddir)/modules/intersci/libsciintersci.la \
-@GUI_TRUE@     $(top_builddir)/modules/data_structures/libscidata_structures.la \
-@GUI_TRUE@     $(top_builddir)/modules/tclsci/libscitclsci.la \
-@GUI_TRUE@     $(am__append_2) $(am__append_3)
+@GUI_TRUE@    $(top_builddir)/modules/data_structures/libscidata_structures.la \
+@GUI_TRUE@    $(top_builddir)/modules/tclsci/libscitclsci.la \
+@GUI_TRUE@    $(top_builddir)/modules/string/libscistring.la
+
 
 #### graphics : Conf files ####
 @GUI_TRUE@libscigraphics_la_rootdir = $(mydatadir)
@@ -1722,7 +1720,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_5) $(am__append_6) $(am__append_7)
+TARGETS_ALL = $(am__append_3) $(am__append_4) $(am__append_5)
 
 ################ MACROS ######################"
 # Rule to build a macro
index 6bbe770..d2ba521 100644 (file)
@@ -160,13 +160,8 @@ libscigui_la_SOURCES = $(GUI_C_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_S
 libscigui_la_LIBADD = \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
-    $(top_builddir)/modules/tclsci/libscitclsci.la
-
-if STRING_V1
-libscigui_la_LIBADD += $(top_builddir)/modules/string/libscistring.la
-else
-libscigui_la_LIBADD += $(top_builddir)/modules/STRING_V2/libscistring.la
-endif
+    $(top_builddir)/modules/tclsci/libscitclsci.la \
+    $(top_builddir)/modules/string/libscistring.la
 
 
 # Cyclic dep
index e5a16aa..e709d03 100644 (file)
@@ -52,8 +52,6 @@ DIST_COMMON = $(libscigui_la_include_HEADERS) $(srcdir)/Makefile.am \
 @GUI_TRUE@am__append_1 = java
 @SWIG_TRUE@am__append_2 = swig
 @GIWS_TRUE@am__append_3 = giws
-@STRING_V1_TRUE@am__append_4 = $(top_builddir)/modules/string/libscistring.la
-@STRING_V1_FALSE@am__append_5 = $(top_builddir)/modules/STRING_V2/libscistring.la
 subdir = modules/gui
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -91,8 +89,8 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscigui_la_DEPENDENCIES =  \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
-       $(top_builddir)/modules/tclsci/libscitclsci.la $(am__append_4) \
-       $(am__append_5)
+       $(top_builddir)/modules/tclsci/libscitclsci.la \
+       $(top_builddir)/modules/string/libscistring.la
 am__libscigui_la_SOURCES_DIST = src/nogui/nogui.c \
        src/c/getlookandfeel.c src/c/setlookandfeel.c \
        src/c/getinstalledlookandfeels.c src/c/TerminateGui.c \
@@ -659,10 +657,12 @@ JARMASK = *.jar
 libscigui_la_LDFLAGS = $(LD_FLAGS) $(X_LIBS) $(TERMCAP_LIB) $(X_EXTRA_LIBS)
 pkglib_LTLIBRARIES = libscigui.la
 libscigui_la_SOURCES = $(GUI_C_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES) $(GUI_CPP_SOURCES)
-libscigui_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \
+libscigui_la_LIBADD = \
+       $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
-       $(top_builddir)/modules/tclsci/libscitclsci.la $(am__append_4) \
-       $(am__append_5)
+    $(top_builddir)/modules/tclsci/libscitclsci.la \
+    $(top_builddir)/modules/string/libscistring.la
+
 
 # Cyclic dep
 #      $(top_builddir)/modules/graphics/libscigraphics.la
index 750c2a7..9046450 100644 (file)
@@ -29,13 +29,8 @@ libsciinterpolation_la_FFLAGS=  -Iincludes/
 libsciinterpolation_la_CFLAGS=         -Iincludes/ \
                                -Isrc/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
-                               -I$(top_srcdir)/modules/output_stream/includes 
-if STRING_V1
-libsciinterpolation_la_CFLAGS += -I$(top_srcdir)/modules/string/includes
-else
-libsciinterpolation_la_CFLAGS += -I$(top_srcdir)/modules/STRING_V2/includes
-endif                                  
-
+                               -I$(top_srcdir)/modules/output_stream/includes \
+                -I$(top_srcdir)/modules/string/includes
 
 pkglib_LTLIBRARIES = libsciinterpolation.la
 
@@ -43,14 +38,9 @@ libsciinterpolation_la_SOURCES = $(INTERPOLATION_C_SOURCES) $(INTERPOLATION_FORT
 
 libsciinterpolation_la_LIBADD = \
        $(top_builddir)/modules/core/libscicore.la \
-       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
-
-if STRING_V1
-libsciinterpolation_la_LIBADD += $(top_builddir)/modules/string/libscistring.la
-else
-libsciinterpolation_la_LIBADD += $(top_builddir)/modules/STRING_V2/libscistring.la
-endif
-
+       $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
+    $(top_builddir)/modules/string/libscistring.la
+    
 
 #### Target ######
 modulename=interpolation
index 1a7b6dd..ec28d90 100644 (file)
@@ -47,16 +47,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@STRING_V1_TRUE@am__append_1 = -I$(top_srcdir)/modules/string/includes
-@STRING_V1_FALSE@am__append_2 = -I$(top_srcdir)/modules/STRING_V2/includes
-@STRING_V1_TRUE@am__append_3 = $(top_builddir)/modules/string/libscistring.la
-@STRING_V1_FALSE@am__append_4 = $(top_builddir)/modules/STRING_V2/libscistring.la
 DIST_COMMON = $(libsciinterpolation_la_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_5 = java
-@SWIG_TRUE@am__append_6 = swig
-@GIWS_TRUE@am__append_7 = giws
+@GUI_TRUE@am__append_1 = java
+@SWIG_TRUE@am__append_2 = swig
+@GIWS_TRUE@am__append_3 = giws
 subdir = modules/interpolation
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -93,7 +89,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libsciinterpolation_la_DEPENDENCIES =  \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-       $(am__append_3) $(am__append_4)
+       $(top_builddir)/modules/string/libscistring.la
 am__objects_1 = libsciinterpolation_la-interpolation.lo \
        libsciinterpolation_la-someinterp.lo
 am__objects_2 = libsciinterpolation_la-somespline.lo \
@@ -353,16 +349,19 @@ sci_gateway/c/sci_bsplin3val.c \
 sci_gateway/c/sci_eval_cshep2d.c
 
 libsciinterpolation_la_FFLAGS = -Iincludes/
-libsciinterpolation_la_CFLAGS = -Iincludes/ -Isrc/c/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
-       -I$(top_srcdir)/modules/output_stream/includes $(am__append_1) \
-       $(am__append_2)
+libsciinterpolation_la_CFLAGS = -Iincludes/ \
+                               -Isrc/c/ \
+                               -I$(top_srcdir)/libs/MALLOC/includes/ \
+                               -I$(top_srcdir)/modules/output_stream/includes \
+                -I$(top_srcdir)/modules/string/includes
+
 pkglib_LTLIBRARIES = libsciinterpolation.la
 libsciinterpolation_la_SOURCES = $(INTERPOLATION_C_SOURCES) $(INTERPOLATION_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
-libsciinterpolation_la_LIBADD =  \
+libsciinterpolation_la_LIBADD = \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
-       $(am__append_3) $(am__append_4)
+    $(top_builddir)/modules/string/libscistring.la
+
 
 #### Target ######
 modulename = interpolation
@@ -397,7 +396,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_5) $(am__append_6) $(am__append_7)
+TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
 
 ################ MACROS ######################"
 # Rule to build a macro
index 0f50384..b67cd98 100644 (file)
@@ -32,24 +32,14 @@ intersci_SOURCES = $(INTERSCI_EXE_C_SOURCES)
 libsciintersci_la_SOURCES = $(INTERSCI_LIB_C_SOURCES)
 
 libsciintersci_la_CFLAGS =     -I$(top_srcdir)/libs/MALLOC/includes/ \
-                               -I$(top_srcdir)/modules/output_stream/includes 
-if STRING_V1
-libsciintersci_la_CFLAGS += -I$(top_srcdir)/modules/string/includes
-else
-libsciintersci_la_CFLAGS += -I$(top_srcdir)/modules/STRING_V2/includes
-endif                                  
-
+                               -I$(top_srcdir)/modules/output_stream/includes \
+                -I$(top_srcdir)/modules/string/includes        
 
 libsciintersci_la_LIBADD = \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
-
-if STRING_V1
-libsciintersci_la_LIBADD += $(top_builddir)/modules/string/libscistring.la
-else
-libsciintersci_la_LIBADD += $(top_builddir)/modules/STRING_V2/libscistring.la
-endif
-
+       $(top_builddir)/libs/MALLOC/libscimalloc.la \
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+    $(top_builddir)/modules/string/libscistring.la
+    
 #### Target ######
 modulename=intersci
 
index f67833b..1f5e714 100644 (file)
@@ -48,15 +48,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = intersci$(EXEEXT)
-@STRING_V1_TRUE@am__append_1 = -I$(top_srcdir)/modules/string/includes
-@STRING_V1_FALSE@am__append_2 = -I$(top_srcdir)/modules/STRING_V2/includes
-@STRING_V1_TRUE@am__append_3 = $(top_builddir)/modules/string/libscistring.la
-@STRING_V1_FALSE@am__append_4 = $(top_builddir)/modules/STRING_V2/libscistring.la
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_5 = java
-@SWIG_TRUE@am__append_6 = swig
-@GIWS_TRUE@am__append_7 = giws
+@GUI_TRUE@am__append_1 = java
+@SWIG_TRUE@am__append_2 = swig
+@GIWS_TRUE@am__append_3 = giws
 subdir = modules/intersci
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -88,8 +84,9 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libsciintersci_la_DEPENDENCIES =  \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la $(am__append_3) \
-       $(am__append_4)
+       $(top_builddir)/libs/MALLOC/libscimalloc.la \
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+       $(top_builddir)/modules/string/libscistring.la
 am__objects_1 = libsciintersci_la-libinter.lo libsciintersci_la-out.lo
 am_libsciintersci_la_OBJECTS = $(am__objects_1)
 libsciintersci_la_OBJECTS = $(am_libsciintersci_la_OBJECTS)
@@ -324,11 +321,14 @@ pkglib_LTLIBRARIES = libsciintersci.la
 intersci_SOURCES = $(INTERSCI_EXE_C_SOURCES)
 libsciintersci_la_SOURCES = $(INTERSCI_LIB_C_SOURCES)
 libsciintersci_la_CFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
-       -I$(top_srcdir)/modules/output_stream/includes $(am__append_1) \
-       $(am__append_2)
-libsciintersci_la_LIBADD =  \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la $(am__append_3) \
-       $(am__append_4)
+                               -I$(top_srcdir)/modules/output_stream/includes \
+                -I$(top_srcdir)/modules/string/includes        
+
+libsciintersci_la_LIBADD = \
+       $(top_builddir)/libs/MALLOC/libscimalloc.la \
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+    $(top_builddir)/modules/string/libscistring.la
+
 
 #### Target ######
 modulename = intersci
@@ -349,7 +349,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_5) $(am__append_6) $(am__append_7)
+TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
 
 ################ MACROS ######################"
 # Rule to build a macro
@@ -936,7 +936,6 @@ uninstall-am: uninstall-binPROGRAMS \
        uninstall-libsciintersci_la_rootDATA \
        uninstall-pkglibLTLIBRARIES
 
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
 
 # This target enables tests for Scilab
 check-local: $(top_builddir)/scilab-bin
index 3085698..fbf704e 100644 (file)
@@ -7,27 +7,17 @@ MEXLIB_C_SOURCES = src/c/mexlib.c
 
 MEXLIB_FLAGS = -Iincludes/ -I$(top_builddir)/modules/output_stream/includes/
 
-if STRING_V1
 MEXLIB_FLAGS += -I$(top_srcdir)/modules/string/includes
-else
-MEXLIB_FLAGS += -I$(top_srcdir)/modules/STRING_V2/includes
-endif                                  
 
 
 MEXLIB_DEP = $(top_builddir)/modules/core/libscicore.la \
 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
 $(top_builddir)/modules/data_structures/libscidata_structures.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la 
+       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+    $(top_builddir)/modules/string/libscistring.la
 #      $(top_builddir)/libs/blas/libsciblas.la \
 #      $(top_builddir)/modules/arnoldi/libsciarnoldi.la
 
-
-if STRING_V1
-MEXLIB_DEP += $(top_builddir)/modules/string/libscistring.la
-else
-MEXLIB_DEP += $(top_builddir)/modules/STRING_V2/libscistring.la
-endif
-
 pkglib_LTLIBRARIES = libmat.la libmex.la libmx.la
 
 libmex_la_SOURCES = $(MEXLIB_C_SOURCES)
index 0671f1c..d05c3e1 100644 (file)
@@ -47,17 +47,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@STRING_V1_TRUE@am__append_1 = -I$(top_srcdir)/modules/string/includes
-@STRING_V1_FALSE@am__append_2 = -I$(top_srcdir)/modules/STRING_V2/includes
-#      $(top_builddir)/libs/blas/libsciblas.la \
-#      $(top_builddir)/modules/arnoldi/libsciarnoldi.la
-@STRING_V1_TRUE@am__append_3 = $(top_builddir)/modules/string/libscistring.la
-@STRING_V1_FALSE@am__append_4 = $(top_builddir)/modules/STRING_V2/libscistring.la
 DIST_COMMON = $(libmex_la_include_HEADERS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_5 = java
-@SWIG_TRUE@am__append_6 = swig
-@GIWS_TRUE@am__append_7 = giws
+@GUI_TRUE@am__append_1 = java
+@SWIG_TRUE@am__append_2 = swig
+@GIWS_TRUE@am__append_3 = giws
 subdir = modules/mexlib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -313,12 +307,15 @@ top_srcdir = @top_srcdir@
 MEXLIB_C_SOURCES = src/c/mexlib.c
 MEXLIB_FLAGS = -Iincludes/ \
        -I$(top_builddir)/modules/output_stream/includes/ \
-       $(am__append_1) $(am__append_2)
+       -I$(top_srcdir)/modules/string/includes
 MEXLIB_DEP = $(top_builddir)/modules/core/libscicore.la \
-       $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
-       $(top_builddir)/modules/data_structures/libscidata_structures.la \
+$(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
+$(top_builddir)/modules/data_structures/libscidata_structures.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(am__append_3) $(am__append_4)
+    $(top_builddir)/modules/string/libscistring.la
+
+#      $(top_builddir)/libs/blas/libsciblas.la \
+#      $(top_builddir)/modules/arnoldi/libsciarnoldi.la
 pkglib_LTLIBRARIES = libmat.la libmex.la libmx.la
 libmex_la_SOURCES = $(MEXLIB_C_SOURCES)
 libmex_la_LIBADD = $(MEXLIB_DEP)
@@ -353,7 +350,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_5) $(am__append_6) $(am__append_7)
+TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
 
 ################ MACROS ######################"
 # Rule to build a macro
index 495f038..eb70461 100644 (file)
@@ -34,12 +34,10 @@ GATEWAY_C_SOURCES =
 GATEWAY_FORTRAN_SOURCES =
 
 libscioutput_stream_la_CFLAGS=  -I$(top_srcdir)/libs/MALLOC/includes/ \
--Iincludes/ -I$(top_srcdir)/modules/core/include -Isrc/c/ 
-if STRING_V1
-libscioutput_stream_la_CFLAGS += -I$(top_srcdir)/modules/string/includes
-else
-libscioutput_stream_la_CFLAGS += -I$(top_srcdir)/modules/STRING_V2/includes
-endif  
+-Iincludes/ \
+-I$(top_srcdir)/modules/core/includes \
+-Isrc/c/ \
+-I$(top_srcdir)/modules/string/includes
 
 libscioutput_stream_la_LDFLAGS =
 pkglib_LTLIBRARIES = libscioutput_stream.la
@@ -48,11 +46,7 @@ libscioutput_stream_la_SOURCES = $(OUTPUT_STREAM_C_SOURCES) $(OUTPUT_STREAM_FORT
 
 #libscioutput_stream_la_LIBADD =
 
-if STRING_V1
 libscioutput_stream_la_LIBADD= $(top_builddir)/modules/string/libscistring.la
-else
-libscioutput_stream_la_LIBADD= $(top_builddir)/modules/STRING_V2/libscistring.la
-endif
 
 #### Target ######
 modulename=output_stream
index 0e0d7a5..282169c 100644 (file)
@@ -42,14 +42,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@STRING_V1_TRUE@am__append_1 = -I$(top_srcdir)/modules/string/includes
-@STRING_V1_FALSE@am__append_2 = -I$(top_srcdir)/modules/STRING_V2/includes
 DIST_COMMON = $(libscioutput_stream_la_include_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
-@GUI_TRUE@am__append_3 = java
-@SWIG_TRUE@am__append_4 = swig
-@GIWS_TRUE@am__append_5 = giws
+@GUI_TRUE@am__append_1 = java
+@SWIG_TRUE@am__append_2 = swig
+@GIWS_TRUE@am__append_3 = giws
 subdir = modules/output_stream
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
@@ -83,8 +81,8 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscioutput_stream_la_includedir)"
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-@STRING_V1_FALSE@libscioutput_stream_la_DEPENDENCIES = $(top_builddir)/modules/STRING_V2/libscistring.la
-@STRING_V1_TRUE@libscioutput_stream_la_DEPENDENCIES = $(top_builddir)/modules/string/libscistring.la
+libscioutput_stream_la_DEPENDENCIES =  \
+       $(top_builddir)/modules/string/libscistring.la
 am__objects_1 = libscioutput_stream_la-erro.lo \
        libscioutput_stream_la-cerro.lo \
        libscioutput_stream_la-Scierror.lo \
@@ -331,15 +329,17 @@ OUTPUT_STREAM_FORTRAN_SOURCES =
 GATEWAY_C_SOURCES = 
 GATEWAY_FORTRAN_SOURCES = 
 libscioutput_stream_la_CFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
-       -Iincludes/ -I$(top_srcdir)/modules/core/include -Isrc/c/ \
-       $(am__append_1) $(am__append_2)
+-Iincludes/ \
+-I$(top_srcdir)/modules/core/includes \
+-Isrc/c/ \
+-I$(top_srcdir)/modules/string/includes
+
 libscioutput_stream_la_LDFLAGS = 
 pkglib_LTLIBRARIES = libscioutput_stream.la
 libscioutput_stream_la_SOURCES = $(OUTPUT_STREAM_C_SOURCES) $(OUTPUT_STREAM_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES) $(JNI_SOURCES)
-@STRING_V1_FALSE@libscioutput_stream_la_LIBADD = $(top_builddir)/modules/STRING_V2/libscistring.la
 
 #libscioutput_stream_la_LIBADD =
-@STRING_V1_TRUE@libscioutput_stream_la_LIBADD = $(top_builddir)/modules/string/libscistring.la
+libscioutput_stream_la_LIBADD = $(top_builddir)/modules/string/libscistring.la
 
 #### Target ######
 modulename = output_stream
@@ -379,7 +379,7 @@ mydatadir = $(pkgdatadir)/modules/$(modulename)
 #### the procedure will be the same with Microsoft Windows (C) 
 ####�and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_3) $(am__append_4) $(am__append_5)
+TARGETS_ALL = $(am__append_1) $(am__append_2) $(am__append_3)
 
 ################ MACROS ######################"
 # Rule to build a macro
similarity index 93%
rename from scilab/modules/STRING_V2/Makefile.am
rename to scilab/modules/string/Makefile.am
index 39fc949..d976490 100644 (file)
@@ -73,11 +73,7 @@ libscistring_la_LDFLAGS = $(PCRE_LIBS)
 
 pkglib_LTLIBRARIES = libscistring.la
 
-#if STRING_V2
 libscistring_la_SOURCES = $(STRING_C_SOURCES) $(STRING_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
-#else
-#libscistring_la_SOURCES= 
-#endif
 
 libscistring_la_LIBADD = 
 #      $(top_builddir)/modules/polynomials/libscipolynomials.la \
@@ -87,7 +83,7 @@ libscistring_la_LIBADD =
 
 
 #### Target ######
-modulename=STRING_V2
+modulename=string
 
 
 #### string : Conf files ####
@@ -96,11 +92,11 @@ libscistring_la_root_DATA = changelog.txt license.txt readme.txt version.xml
 
 #### string : init scripts ####
 libscistring_la_etcdir = $(mydatadir)/etc
-libscistring_la_etc_DATA = etc/STRING_V2.quit etc/STRING_V2.start
+libscistring_la_etc_DATA = etc/string.quit etc/string.start
 
 #### string : gateway declaration ####
 libscistring_la_sci_gatewaydir = $(mydatadir)/sci_gateway
-libscistring_la_sci_gateway_DATA = sci_gateway/STRING_V2_gateway.xml
+libscistring_la_sci_gateway_DATA = sci_gateway/string_gateway.xml
 
 #### string : include files ####
 libscistring_la_includedir=$(pkgincludedir)/string
similarity index 99%
rename from scilab/modules/STRING_V2/Makefile.in
rename to scilab/modules/string/Makefile.in
index ef17bd4..fd37217 100644 (file)
@@ -52,7 +52,7 @@ DIST_COMMON = $(libscistring_la_include_HEADERS) $(srcdir)/Makefile.am \
 @GUI_TRUE@am__append_1 = java
 @SWIG_TRUE@am__append_2 = swig
 @GIWS_TRUE@am__append_3 = giws
-subdir = modules/STRING_V2
+subdir = modules/string
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
        $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
@@ -399,12 +399,7 @@ libscistring_la_CFLAGS = \
 
 libscistring_la_LDFLAGS = $(PCRE_LIBS)
 pkglib_LTLIBRARIES = libscistring.la
-
-#if STRING_V2
 libscistring_la_SOURCES = $(STRING_C_SOURCES) $(STRING_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
-#else
-#libscistring_la_SOURCES= 
-#endif
 libscistring_la_LIBADD = 
 #      $(top_builddir)/modules/polynomials/libscipolynomials.la \
 #      $(top_builddir)/libs/MALLOC/libscimalloc.la
@@ -412,7 +407,7 @@ libscistring_la_LIBADD =
 #      $(top_builddir)/modules/core/libscicore.la
 
 #### Target ######
-modulename = STRING_V2
+modulename = string
 
 #### string : Conf files ####
 libscistring_la_rootdir = $(mydatadir)
@@ -420,11 +415,11 @@ libscistring_la_root_DATA = changelog.txt license.txt readme.txt version.xml
 
 #### string : init scripts ####
 libscistring_la_etcdir = $(mydatadir)/etc
-libscistring_la_etc_DATA = etc/STRING_V2.quit etc/STRING_V2.start
+libscistring_la_etc_DATA = etc/string.quit etc/string.start
 
 #### string : gateway declaration ####
 libscistring_la_sci_gatewaydir = $(mydatadir)/sci_gateway
-libscistring_la_sci_gateway_DATA = sci_gateway/STRING_V2_gateway.xml
+libscistring_la_sci_gateway_DATA = sci_gateway/string_gateway.xml
 
 #### string : include files ####
 libscistring_la_includedir = $(pkgincludedir)/string
@@ -505,9 +500,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  modules/STRING_V2/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  modules/string/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --foreign  modules/STRING_V2/Makefile
+         $(AUTOMAKE) --foreign  modules/string/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
similarity index 94%
rename from scilab/modules/STRING_V2/STRING_V2.iss
rename to scilab/modules/string/STRING_V2.iss
index 122e543..ac3ae96 100644 (file)
@@ -8,7 +8,7 @@
 ; string module
 ;--------------------------------------------------------------------------------------------------------------
 ;
-#define STRING "STRING_V2"
+#define STRING "string"
 ;
 Source: bin\string.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\string_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
@@ -18,7 +18,7 @@ Source: modules\{#STRING}\readme.txt; DestDir: {app}\modules\{#STRING}; Componen
 Source: modules\{#STRING}\license.txt; DestDir: {app}\modules\{#STRING}; Components: {#COMPN_SCILAB}
 Source: modules\{#STRING}\changelog.txt; DestDir: {app}\modules\{#STRING}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#STRING}\sci_gateway\STRING_V2_gateway.xml; DestDir: {app}\modules\{#STRING}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#STRING}\sci_gateway\string_gateway.xml; DestDir: {app}\modules\{#STRING}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#STRING}\etc\{#STRING}.quit; DestDir: {app}\modules\{#STRING}\etc; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#STRING}\etc\{#STRING}.start; DestDir: {app}\modules\{#STRING}\etc; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
similarity index 83%
rename from scilab/modules/STRING_V2/etc/STRING_V2.start
rename to scilab/modules/string/etc/STRING_V2.start
index 7fad9b6..315bc6f 100644 (file)
@@ -3,8 +3,8 @@
 // Copyright INRIA 2006
 // ====================================================================
 //Load  functions librarie
-load('SCI/modules/STRING_V2/macros/lib');
+load('SCI/modules/string/macros/lib');
 // ====================================================================
 //add help chapter
-add_module_help_chapter('STRING_V2');
+add_module_help_chapter('string');
 // ====================================================================
@@ -4,7 +4,7 @@
 // Copyright INRIA 2007
 // Allan CORNET
 // ====================================================================
-path = SCI+'/modules/STRING_V2/help/'+getdefaultlanguage();
+path = SCI+'/modules/string/help/'+getdefaultlanguage();
 add_help_chapter("Strings",path,%T);
 clear path add_help_chapter;
 // ====================================================================
@@ -1,4 +1,4 @@
-# Localization of the module STRING_V2
+# Localization of the module string
 # Please see in SCI/tools/localization for localization management
 # Copyright (C) 2007/2008 - INRIA / Scilab
 # This file is distributed under the same license as the Scilab package.
@@ -1,4 +1,4 @@
-# Localization of the module STRING_V2
+# Localization of the module string
 # Please see in SCI/tools/localization for localization management
 # Copyright (C) 2007/2008 - INRIA / Scilab
 # This file is distributed under the same license as the Scilab package.
@@ -5,5 +5,5 @@ if (isdef('genlib') == %f) then
   exec(SCI+'/modules/functions/scripts/buildmacros/loadgenlib.sce');
 end
 //------------------------------------
-genlib('stringlib','SCI/modules/STRING_V2/macros',%f,%t);
+genlib('stringlib','SCI/modules/string/macros',%f,%t);
 //------------------------------------
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
-<GATEWAY name="STRING_V2">
+<GATEWAY name="string">
 <!-- =================== -->
 <!--
  Scilab
@@ -52,7 +52,7 @@ int C2F(sci_strsplit) _PARAMS((char *fname,unsigned long fname_len))
                /* faster but very difficult to understand and debug :( */
                /* benchmark : Windows Vista C2D 6600 2.4 Ghz */
                /* 
-               text     = mgetl(SCI+"/modules/STRING_V2/tests/benchmarks/ascii_text.txt");
+               text     = mgetl(SCI+"/modules/string/tests/benchmarks/ascii_text.txt");
                text_cat = strcat(text);
                nb_run = 10000;
                timer();
similarity index 99%
rename from scilab/modules/STRING_V2/src/c/string.vcproj
rename to scilab/modules/string/src/c/string.vcproj
index 6ae1be5..817512b 100644 (file)
                        >
                </File>
                <File
-                       RelativePath="..\..\sci_gateway\STRING_V2_gateway.xml"
+                       RelativePath="..\..\sci_gateway\string_gateway.xml"
                        >
                </File>
                <File
@@ -43,5 +43,5 @@ copy string_f_header.def+string_f.vcdef string_f.def &gt;nul" Description="Build
                <Filter Name="Header Files" Filter="fi;fd"/>
                <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
                <File RelativePath="..\..\Makefile.am"/>
-               <File RelativePath="..\..\sci_gateway\STRING_V2_gateway.xml"/></Files>
+               <File RelativePath="..\..\sci_gateway\string_gateway.xml"/></Files>
        <Globals/></VisualStudioProject>
@@ -3,7 +3,7 @@
 // Copyright INRIA 2007
 //==============================================================================
 
-text = mgetl(SCI+"/modules/STRING_V2/tests/benchmarks/ascii_text.txt");
+text = mgetl(SCI+"/modules/string/tests/benchmarks/ascii_text.txt");
 
 // <-- BENCH START -->
 a = ascii(text);
@@ -3,7 +3,7 @@
 // Copyright INRIA 2007
 //==============================================================================
 
-exec(SCI+"/modules/STRING_V2/tests/benchmarks/ascii_code.txt",-1);
+exec(SCI+"/modules/string/tests/benchmarks/ascii_code.txt",-1);
 
 // <-- BENCH START -->
 a = ascii(ref);
@@ -3,7 +3,7 @@
 // Copyright INRIA 2007
 //==============================================================================
 
-text = mgetl(SCI+"/modules/STRING_V2/tests/unit_tests/text.txt");
+text = mgetl(SCI+"/modules/string/tests/unit_tests/text.txt");
 
 // <-- BENCH START -->
 a = grep(text,"fonction");
@@ -3,7 +3,7 @@
 // Copyright INRIA 2007
 //==============================================================================
 
-text = mgetl(SCI+"/modules/STRING_V2/tests/benchmarks/ascii_text.txt");
+text = mgetl(SCI+"/modules/string/tests/benchmarks/ascii_text.txt");
 
 // <-- BENCH START -->
 a = length(text);
@@ -3,7 +3,7 @@
 // Copyright INRIA 2007
 //==============================================================================
 
-text     = mgetl(SCI+"/modules/STRING_V2/tests/benchmarks/ascii_text.txt");
+text     = mgetl(SCI+"/modules/string/tests/benchmarks/ascii_text.txt");
 text_cat = strcat(text);
 
 // <-- BENCH START -->
@@ -3,7 +3,7 @@
 // Copyright INRIA 2007
 //==============================================================================
 
-text = mgetl(SCI+"/modules/STRING_V2/tests/benchmarks/ascii_text.txt");
+text = mgetl(SCI+"/modules/string/tests/benchmarks/ascii_text.txt");
 
 // <-- BENCH START -->
 a = strcat(text);
@@ -3,7 +3,7 @@
 // Copyright INRIA 2007
 //==============================================================================
 
-text     = mgetl(SCI+"/modules/STRING_V2/tests/unit_tests/text.txt");
+text     = mgetl(SCI+"/modules/string/tests/unit_tests/text.txt");
 text_cat = strcat(text);
 
 // <-- BENCH START -->
@@ -3,7 +3,7 @@
 // Copyright INRIA 2007
 //==============================================================================
 
-text = mgetl(SCI+"/modules/STRING_V2/tests/benchmarks/ascii_text.txt");
+text = mgetl(SCI+"/modules/string/tests/benchmarks/ascii_text.txt");
 
 // <-- BENCH START -->
 a = stripblanks(text,%T);
@@ -3,7 +3,7 @@
 // Copyright INRIA 2008
 //==============================================================================
 
-text = mgetl(SCI+"/modules/STRING_V2/tests/benchmarks/ascii_text.txt");
+text = mgetl(SCI+"/modules/string/tests/benchmarks/ascii_text.txt");
 
 // <-- BENCH START -->
 a = strrev(text);
@@ -3,7 +3,7 @@
 // Copyright INRIA 2007
 //==============================================================================
 
-text     = mgetl(SCI+"/modules/STRING_V2/tests/benchmarks/ascii_text.txt");
+text     = mgetl(SCI+"/modules/string/tests/benchmarks/ascii_text.txt");
 text_cat = strcat(text);
 
 // <-- BENCH START -->
@@ -3,7 +3,7 @@
 // Copyright INRIA 2007
 //==============================================================================
 
-text     = mgetl(SCI+"/modules/STRING_V2/tests/unit_tests/text.txt");
+text     = mgetl(SCI+"/modules/string/tests/unit_tests/text.txt");
 
 // <-- BENCH START -->
 a = strsubst(text,"fonction","function");
@@ -15,7 +15,7 @@ if (ascii(CODE_ASCII_SCILAB) <> str_scilab) then bugmes();quit;end
 // == TEST 3 ===================================================================
 if ascii([str_scilab 'a';'b' 'c']) <> [115 99 105 108 97 98 98 97 99] then bugmes();quit;end
 // == TEST 4 ===================================================================
-fd  = mopen(SCI+'/modules/STRING_V2/tests/unit_tests/text.txt','r');
+fd  = mopen(SCI+'/modules/string/tests/unit_tests/text.txt','r');
 txt = mgetl( fd );
 mclose( fd );
 ASCII_TXT           = ascii(txt);
@@ -23,7 +23,7 @@ if ascii([str_scilab 'a';'b' 'c']) <> [115 99 105 108 97 98 98 97 99] then pause
 
 // == TEST 4 ===================================================================
 
-fd  = mopen(SCI+'/modules/STRING_V2/tests/unit_tests/text.txt','r');
+fd  = mopen(SCI+'/modules/string/tests/unit_tests/text.txt','r');
 txt = mgetl( fd );
 mclose( fd );
 ASCII_TXT           = ascii(txt);
@@ -29,7 +29,7 @@ if grep(['AB','B'],['A';'B']) <> 1 then bugmes();quit;end
 //===============================
 if grep(['AB','B'],['A';'B';'C']) <> 1 then bugmes();quit;end
 //===============================
-fd = mopen(SCI+'/modules/STRING_V2/tests/unit_tests/text.txt','r');
+fd = mopen(SCI+'/modules/string/tests/unit_tests/text.txt','r');
 txt = mgetl( fd );
 mclose( fd );
 //===============================
@@ -29,7 +29,7 @@ if grep(['AB','B'],['A';'B']) <> 1 then pause,end
 //===============================
 if grep(['AB','B'],['A';'B';'C']) <> 1 then pause,end 
 //===============================
-fd = mopen(SCI+'/modules/STRING_V2/tests/unit_tests/text.txt','r');
+fd = mopen(SCI+'/modules/string/tests/unit_tests/text.txt','r');
 txt = mgetl( fd );
 mclose( fd );
 //===============================
@@ -117,7 +117,7 @@ if length(emptystr())<>0 then bugmes();quit;end
 if or(length(['abd';emptystr()])<>[3;0]) then bugmes();quit;end
 if or(length(string(ones(10,10)))<>1) then bugmes();quit;end
 // = with a file ===============================================================
-fd = mopen(SCI+'/modules/STRING_V2/tests/unit_tests/text.txt','r');
+fd = mopen(SCI+'/modules/string/tests/unit_tests/text.txt','r');
 txt = mgetl( fd );
 mclose( fd );
 if length(txt(1)) <> 280  then bugmes();quit;end
@@ -81,7 +81,7 @@ if or(length(string(ones(10,10)))<>1) then pause,end
 
 
 // = with a file ===============================================================
-fd = mopen(SCI+'/modules/STRING_V2/tests/unit_tests/text.txt','r');
+fd = mopen(SCI+'/modules/string/tests/unit_tests/text.txt','r');
 txt = mgetl( fd );
 mclose( fd );
 if length(txt(1)) <> 280  then pause,end
@@ -28,7 +28,7 @@ if strcat(['abc','abd','aa','bxe']) <> 'abc'+'abd'+'aa'+'bxe' then bugmes();quit
 //===============================
 if strcat(['abc','abd','aa','bxe'],'')<>'abcabdaabxe' then bugmes();quit;end
 //===============================
-fd = mopen(SCI+'/modules/STRING_V2/tests/unit_tests/text.txt','r');
+fd = mopen(SCI+'/modules/string/tests/unit_tests/text.txt','r');
 txt = mgetl( fd );
 mclose( fd );
 NEW_TXT_A = strcat(txt);
@@ -28,7 +28,7 @@ if strcat(['abc','abd','aa','bxe']) <> 'abc'+'abd'+'aa'+'bxe' then pause,end
 //===============================
 if strcat(['abc','abd','aa','bxe'],'')<>'abcabdaabxe' then pause,end
 //===============================
-fd = mopen(SCI+'/modules/STRING_V2/tests/unit_tests/text.txt','r');
+fd = mopen(SCI+'/modules/string/tests/unit_tests/text.txt','r');
 txt = mgetl( fd );
 mclose( fd );
 NEW_TXT_A = strcat(txt);
@@ -54,7 +54,7 @@ refw = [1 3 4];
 if (k <> refk ) then bugmes();quit;end
 if (w <> refw ) then bugmes();quit;end
 //===============================
-fd = mopen(SCI+'/modules/STRING_V2/tests/unit_tests/text.txt','r');
+fd = mopen(SCI+'/modules/string/tests/unit_tests/text.txt','r');
 txt = mgetl( fd );
 mclose( fd );
 //===============================
@@ -54,7 +54,7 @@ refw = [1 3 4];
 if (k <> refk ) then pause,end
 if (w <> refw ) then pause,end
 //===============================
-fd = mopen(SCI+'/modules/STRING_V2/tests/unit_tests/text.txt','r');
+fd = mopen(SCI+'/modules/string/tests/unit_tests/text.txt','r');
 txt = mgetl( fd );
 mclose( fd );
 //===============================