summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>2014-07-17 15:37:52 +0200
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2014-07-17 15:37:52 +0200
commit31048c9cb8a5d36c87ccd8addbc405a6c34f2759 (patch)
tree46a8ef587e5ab979945e4b1be6bf8c8d71648790
parente429c0599926747e687f9490cf0e42104bb88621 (diff)
downloadscilab-31048c9cb8a5d36c87ccd8addbc405a6c34f2759.zip
scilab-31048c9cb8a5d36c87ccd8addbc405a6c34f2759.tar.gz
Additionnal fix after https://codereview.scilab.org/#/c/14866/.
An other copy of repositories is stored in test directories. Change-Id: I01dd2a8f2fb2172cf27b9f309b48dad29055c0ea
-rw-r--r--scilab/Makefile.in6
-rwxr-xr-xscilab/configure3
-rw-r--r--scilab/configure.ac1
-rw-r--r--scilab/modules/atoms/tests/unit_tests/repositories.orig2
-rw-r--r--scilab/modules/atoms/tests/unit_tests/repositories.orig.in1
-rw-r--r--scilab/modules/javasci/Makefile.in6
6 files changed, 13 insertions, 6 deletions
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index ff58c60..b452df2 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -147,6 +147,7 @@ DIST_COMMON = $(top_srcdir)/Makefile.call_scilab.am \
147 $(top_srcdir)/modules/core/includes/version.h.in \ 147 $(top_srcdir)/modules/core/includes/version.h.in \
148 $(top_srcdir)/modules/core/includes/stack.h.in \ 148 $(top_srcdir)/modules/core/includes/stack.h.in \
149 $(top_srcdir)/modules/atoms/etc/repositories.in \ 149 $(top_srcdir)/modules/atoms/etc/repositories.in \
150 $(top_srcdir)/modules/atoms/tests/unit_tests/repositories.orig.in \
150 $(top_srcdir)/config/depcomp COPYING config/ar-lib \ 151 $(top_srcdir)/config/depcomp COPYING config/ar-lib \
151 config/compile config/config.guess config/config.rpath \ 152 config/compile config/config.guess config/config.rpath \
152 config/config.sub config/depcomp config/install-sh \ 153 config/config.sub config/depcomp config/install-sh \
@@ -194,7 +195,8 @@ CONFIG_CLEAN_FILES = scilab.pc etc/modules.xml etc/classpath.xml \
194 scilab-lib.properties scilab-lib-doc.properties \ 195 scilab-lib.properties scilab-lib-doc.properties \
195 modules/helptools/etc/SciDocConf.xml \ 196 modules/helptools/etc/SciDocConf.xml \
196 modules/core/includes/version.h modules/core/includes/stack.h \ 197 modules/core/includes/version.h modules/core/includes/stack.h \
197 modules/atoms/etc/repositories 198 modules/atoms/etc/repositories \
199 modules/atoms/tests/unit_tests/repositories.orig
198CONFIG_CLEAN_VPATH_FILES = 200CONFIG_CLEAN_VPATH_FILES =
199am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ 201am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
200 "$(DESTDIR)$(infofilesdir)" "$(DESTDIR)$(pkgconfigdir)" \ 202 "$(DESTDIR)$(infofilesdir)" "$(DESTDIR)$(pkgconfigdir)" \
@@ -1010,6 +1012,8 @@ modules/core/includes/stack.h: $(top_builddir)/config.status $(top_srcdir)/modul
1010 cd $(top_builddir) && $(SHELL) ./config.status $@ 1012 cd $(top_builddir) && $(SHELL) ./config.status $@
1011modules/atoms/etc/repositories: $(top_builddir)/config.status $(top_srcdir)/modules/atoms/etc/repositories.in 1013modules/atoms/etc/repositories: $(top_builddir)/config.status $(top_srcdir)/modules/atoms/etc/repositories.in
1012 cd $(top_builddir) && $(SHELL) ./config.status $@ 1014 cd $(top_builddir) && $(SHELL) ./config.status $@
1015modules/atoms/tests/unit_tests/repositories.orig: $(top_builddir)/config.status $(top_srcdir)/modules/atoms/tests/unit_tests/repositories.orig.in
1016 cd $(top_builddir) && $(SHELL) ./config.status $@
1013install-binPROGRAMS: $(bin_PROGRAMS) 1017install-binPROGRAMS: $(bin_PROGRAMS)
1014 @$(NORMAL_INSTALL) 1018 @$(NORMAL_INSTALL)
1015 @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ 1019 @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
diff --git a/scilab/configure b/scilab/configure
index 5bb5958..058dc9c 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -42337,7 +42337,7 @@ SCI_LDFLAGS=$(echo $LARGEFILE_LDFLAGS $CODECOVERAGE_LDFLAGS $DEBUG_LDFLAGS $
42337 42337
42338 42338
42339 42339
42340ac_config_files="$ac_config_files contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/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/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/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/mpi/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/external_objects/Makefile modules/external_objects_java/Makefile modules/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h modules/core/includes/stack.h modules/atoms/etc/repositories" 42340ac_config_files="$ac_config_files contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/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/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/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/mpi/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/external_objects/Makefile modules/external_objects_java/Makefile modules/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h modules/core/includes/stack.h modules/atoms/etc/repositories modules/atoms/tests/unit_tests/repositories.orig"
42341 42341
42342 42342
42343# Detection of the module for the future version of Scilab 6 42343# Detection of the module for the future version of Scilab 6
@@ -43774,6 +43774,7 @@ do
43774 "modules/core/includes/version.h") CONFIG_FILES="$CONFIG_FILES modules/core/includes/version.h" ;; 43774 "modules/core/includes/version.h") CONFIG_FILES="$CONFIG_FILES modules/core/includes/version.h" ;;
43775 "modules/core/includes/stack.h") CONFIG_FILES="$CONFIG_FILES modules/core/includes/stack.h" ;; 43775 "modules/core/includes/stack.h") CONFIG_FILES="$CONFIG_FILES modules/core/includes/stack.h" ;;
43776 "modules/atoms/etc/repositories") CONFIG_FILES="$CONFIG_FILES modules/atoms/etc/repositories" ;; 43776 "modules/atoms/etc/repositories") CONFIG_FILES="$CONFIG_FILES modules/atoms/etc/repositories" ;;
43777 "modules/atoms/tests/unit_tests/repositories.orig") CONFIG_FILES="$CONFIG_FILES modules/atoms/tests/unit_tests/repositories.orig" ;;
43777 "modules/development_tools/src/fake/Makefile") CONFIG_FILES="$CONFIG_FILES modules/development_tools/src/fake/Makefile" ;; 43778 "modules/development_tools/src/fake/Makefile") CONFIG_FILES="$CONFIG_FILES modules/development_tools/src/fake/Makefile" ;;
43778 43779
43779 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 43780 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff --git a/scilab/configure.ac b/scilab/configure.ac
index ed5977c..f4aea91 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -1997,6 +1997,7 @@ modules/helptools/etc/SciDocConf.xml
1997modules/core/includes/version.h 1997modules/core/includes/version.h
1998modules/core/includes/stack.h 1998modules/core/includes/stack.h
1999modules/atoms/etc/repositories 1999modules/atoms/etc/repositories
2000modules/atoms/tests/unit_tests/repositories.orig
2000]) 2001])
2001 2002
2002# Detection of the module for the future version of Scilab 6 2003# Detection of the module for the future version of Scilab 6
diff --git a/scilab/modules/atoms/tests/unit_tests/repositories.orig b/scilab/modules/atoms/tests/unit_tests/repositories.orig
index 85a28b8..363a637 100644
--- a/scilab/modules/atoms/tests/unit_tests/repositories.orig
+++ b/scilab/modules/atoms/tests/unit_tests/repositories.orig
@@ -1 +1 @@
http://atoms.scilab.org/5.4 http://atoms.scilab.org/5.5
diff --git a/scilab/modules/atoms/tests/unit_tests/repositories.orig.in b/scilab/modules/atoms/tests/unit_tests/repositories.orig.in
new file mode 100644
index 0000000..0f3fff9
--- /dev/null
+++ b/scilab/modules/atoms/tests/unit_tests/repositories.orig.in
@@ -0,0 +1 @@
http://atoms.scilab.org/@SCILAB_VERSION_MAJOR@.@SCILAB_VERSION_MINOR@
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index 2b545a7..5d71b66 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -976,10 +976,10 @@ maintainer-clean-generic:
976 @echo "This command is intended for maintainers to use" 976 @echo "This command is intended for maintainers to use"
977 @echo "it deletes files that may require special tools to rebuild." 977 @echo "it deletes files that may require special tools to rebuild."
978 -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) 978 -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
979@JAVASCI_FALSE@distclean-local:
980@JAVASCI_FALSE@install-data-local:
981@JAVASCI_FALSE@install-html-local:
982@JAVASCI_FALSE@clean-local: 979@JAVASCI_FALSE@clean-local:
980@JAVASCI_FALSE@install-html-local:
981@JAVASCI_FALSE@install-data-local:
982@JAVASCI_FALSE@distclean-local:
983clean: clean-am 983clean: clean-am
984 984
985clean-am: clean-generic clean-libtool clean-local \ 985clean-am: clean-generic clean-libtool clean-local \