From 31048c9cb8a5d36c87ccd8addbc405a6c34f2759 Mon Sep 17 00:00:00 2001 From: Vincent COUVERT Date: Thu, 17 Jul 2014 15:37:52 +0200 Subject: [PATCH] Additionnal fix after https://codereview.scilab.org/#/c/14866/. An other copy of repositories is stored in test directories. Change-Id: I01dd2a8f2fb2172cf27b9f309b48dad29055c0ea --- scilab/Makefile.in | 6 +++++- scilab/configure | 3 ++- scilab/configure.ac | 1 + .../atoms/tests/unit_tests/repositories.orig | 2 +- .../atoms/tests/unit_tests/repositories.orig.in | 1 + scilab/modules/javasci/Makefile.in | 6 +++--- 6 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 scilab/modules/atoms/tests/unit_tests/repositories.orig.in 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 \ $(top_srcdir)/modules/core/includes/version.h.in \ $(top_srcdir)/modules/core/includes/stack.h.in \ $(top_srcdir)/modules/atoms/etc/repositories.in \ + $(top_srcdir)/modules/atoms/tests/unit_tests/repositories.orig.in \ $(top_srcdir)/config/depcomp COPYING config/ar-lib \ config/compile config/config.guess config/config.rpath \ config/config.sub config/depcomp config/install-sh \ @@ -194,7 +195,8 @@ CONFIG_CLEAN_FILES = scilab.pc etc/modules.xml etc/classpath.xml \ 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/etc/repositories \ + modules/atoms/tests/unit_tests/repositories.orig CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(infofilesdir)" "$(DESTDIR)$(pkgconfigdir)" \ @@ -1010,6 +1012,8 @@ modules/core/includes/stack.h: $(top_builddir)/config.status $(top_srcdir)/modul cd $(top_builddir) && $(SHELL) ./config.status $@ modules/atoms/etc/repositories: $(top_builddir)/config.status $(top_srcdir)/modules/atoms/etc/repositories.in cd $(top_builddir) && $(SHELL) ./config.status $@ +modules/atoms/tests/unit_tests/repositories.orig: $(top_builddir)/config.status $(top_srcdir)/modules/atoms/tests/unit_tests/repositories.orig.in + cd $(top_builddir) && $(SHELL) ./config.status $@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @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 $ -ac_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" +ac_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" # Detection of the module for the future version of Scilab 6 @@ -43774,6 +43774,7 @@ do "modules/core/includes/version.h") CONFIG_FILES="$CONFIG_FILES modules/core/includes/version.h" ;; "modules/core/includes/stack.h") CONFIG_FILES="$CONFIG_FILES modules/core/includes/stack.h" ;; "modules/atoms/etc/repositories") CONFIG_FILES="$CONFIG_FILES modules/atoms/etc/repositories" ;; + "modules/atoms/tests/unit_tests/repositories.orig") CONFIG_FILES="$CONFIG_FILES modules/atoms/tests/unit_tests/repositories.orig" ;; "modules/development_tools/src/fake/Makefile") CONFIG_FILES="$CONFIG_FILES modules/development_tools/src/fake/Makefile" ;; *) 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 modules/core/includes/version.h modules/core/includes/stack.h modules/atoms/etc/repositories +modules/atoms/tests/unit_tests/repositories.orig ]) # 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: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -@JAVASCI_FALSE@distclean-local: -@JAVASCI_FALSE@install-data-local: -@JAVASCI_FALSE@install-html-local: @JAVASCI_FALSE@clean-local: +@JAVASCI_FALSE@install-html-local: +@JAVASCI_FALSE@install-data-local: +@JAVASCI_FALSE@distclean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local \ -- 1.7.9.5