Fix the build after 129672924fea5c93a149558750f8740755e1878a 54/18254/3
Clément DAVID [Fri, 17 Jun 2016 08:51:41 +0000 (10:51 +0200)]
Change-Id: I47ce3caf039c508df38ccd43800f898705c7d76e

scilab/Makefile.am
scilab/Makefile.in
scilab/modules/io/tests/nonreg_tests/bug_10606.dia.ref
scilab/modules/io/tests/nonreg_tests/bug_10606.tst
scilab/modules/io/tests/nonreg_tests/bug_14058.dia.ref
scilab/modules/io/tests/nonreg_tests/bug_14058.tst
scilab/tools/innosetup/base.iss

index b7e3c73..2b79f83 100644 (file)
@@ -30,8 +30,6 @@ AM_CXXFLAGS = $(SCI_CXXFLAGS)
 AM_FFLAGS   = $(SCI_FFLAGS)
 AM_LDFLAGS  = $(SCI_LDFLAGS)
 
-changelogs = CHANGES
-
 bin_PROGRAMS           = scilab-bin scilab-cli-bin
 
 bin_SCRIPTS                    = bin/scilab bin/scilab-adv-cli bin/scilab-cli \
@@ -184,11 +182,11 @@ $(top_builddir)/etc/logging.properties \
 $(top_builddir)/etc/librarypath.xml
 
 infofilesdir=$(pkgdatadir)/
-infofiles_DATA = $(top_srcdir)/CHANGES \
+infofiles_DATA = $(top_srcdir)/CHANGES.md \
 $(top_srcdir)/ACKNOWLEDGEMENTS \
 $(top_srcdir)/COPYING \
 $(top_srcdir)/COPYING-BSD \
-$(top_srcdir)/README \
+$(top_srcdir)/README.md \
 $(top_builddir)/Version.incl
 
 valgrinddir=$(pkgdatadir)/tools/profiling
index 74efa7e..bd86289 100644 (file)
@@ -482,7 +482,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in \
        $(top_srcdir)/modules/core/includes/machine.h.in \
        $(top_srcdir)/modules/core/includes/version.h.in \
        $(top_srcdir)/modules/helptools/etc/SciDocConf.xml.in COPYING \
-       README config/ar-lib config/compile config/config.guess \
+       config/ar-lib config/compile config/config.guess \
        config/config.rpath config/config.sub config/depcomp \
        config/install-sh config/ltmain.sh config/missing \
        config/mkinstalldirs
@@ -830,7 +830,6 @@ AM_CFLAGS = $(SCI_CFLAGS)
 AM_CXXFLAGS = $(SCI_CXXFLAGS)
 AM_FFLAGS = $(SCI_FFLAGS)
 AM_LDFLAGS = $(SCI_LDFLAGS)
-changelogs = CHANGES
 bin_SCRIPTS = bin/scilab bin/scilab-adv-cli bin/scilab-cli \
        bin/scinotes bin/xcos $(am__append_1)
 scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(am__append_2) \
@@ -910,11 +909,11 @@ $(top_builddir)/etc/logging.properties \
 $(top_builddir)/etc/librarypath.xml
 
 infofilesdir = $(pkgdatadir)/
-infofiles_DATA = $(top_srcdir)/CHANGES \
+infofiles_DATA = $(top_srcdir)/CHANGES.md \
 $(top_srcdir)/ACKNOWLEDGEMENTS \
 $(top_srcdir)/COPYING \
 $(top_srcdir)/COPYING-BSD \
-$(top_srcdir)/README \
+$(top_srcdir)/README.md \
 $(top_builddir)/Version.incl
 
 valgrinddir = $(pkgdatadir)/tools/profiling
index 06960ba..b951b1c 100644 (file)
@@ -20,8 +20,8 @@
 //    1.
 // rep  =
 if getos()=="Windows"
-    [rep,stat,stderr]=unix_g("fc "+SCI+"/CHANGES "+SCI+"/COPYING");
+    [rep,stat,stderr]=unix_g("fc "+SCI+"/CHANGES.md "+SCI+"/COPYING");
 else
-    [rep,stat,stderr]=unix_g("diff "+SCI+"/CHANGES "+SCI+"/COPYING");
+    [rep,stat,stderr]=unix_g("diff "+SCI+"/CHANGES.md "+SCI+"/COPYING");
 end
 assert_checkfalse(rep == []);
index 182529b..3787539 100644 (file)
 // rep  =
 
 if getos()=="Windows"
-    [rep,stat,stderr]=unix_g("fc "+SCI+"/CHANGES "+SCI+"/COPYING");
+    [rep,stat,stderr]=unix_g("fc "+SCI+"/CHANGES.md "+SCI+"/COPYING");
 
 else
 
-    [rep,stat,stderr]=unix_g("diff "+SCI+"/CHANGES "+SCI+"/COPYING");
+    [rep,stat,stderr]=unix_g("diff "+SCI+"/CHANGES.md "+SCI+"/COPYING");
 
 end
 
index 9729195..260c859 100644 (file)
@@ -14,7 +14,7 @@
 // Scilab crashes with 'file("close", file())' instruction
 [units,typs,nams] = file();
 u = mopen(SCI+"/ACKNOWLEDGEMENTS", "rt");
-u2 = mopen(SCI+"/CHANGES", "rt");
+u2 = mopen(SCI+"/CHANGES.md", "rt");
 [units_open,typs,nams] = file();
 assert_checkequal(gsort([units, u, u2], "c", "i"), units_open);
 file("close", file());
index 4ead8a3..20add6e 100644 (file)
@@ -16,7 +16,7 @@
 
 [units,typs,nams] = file();
 u = mopen(SCI+"/ACKNOWLEDGEMENTS", "rt");
-u2 = mopen(SCI+"/CHANGES", "rt");
+u2 = mopen(SCI+"/CHANGES.md", "rt");
 [units_open,typs,nams] = file();
 assert_checkequal(gsort([units, u, u2], "c", "i"), units_open);
 file("close", file());
index f0acd74..9932a38 100644 (file)
@@ -34,7 +34,7 @@ Source: etc\modules.xml; DestDir: {app}\etc; Components: {#COMPN_SCILAB}
 Source: etc\logging.properties; DestDir: {app}\etc; Components: {#COMPN_SCILAB}
 ;
 ; root directory
-Source: CHANGES; DestDir: {app}; Components: {#COMPN_SCILAB}
+Source: CHANGES.md; DestDir: {app}; Components: {#COMPN_SCILAB}
 Source: COPYING; DestDir: {app}; Components: {#COMPN_SCILAB}
 Source: COPYING-BSD; DestDir: {app}; Components: {#COMPN_SCILAB}
 ; (don't include README, as it's only about Unix)