diff options
author | Stéphane MOTTELET <stephane.mottelet@utc.fr> | 2019-07-19 13:27:58 +0200 |
---|---|---|
committer | Stéphane MOTTELET <stephane.mottelet@utc.fr> | 2019-07-19 13:27:58 +0200 |
commit | 9343d27e101953aa056ebda3f08afd08902fabb2 (patch) | |
tree | 4fd2ace9aae9407c63adf8acfa8ab5bb6f802e62 | |
parent | aee95a0f9c0aaf11d3b03564fe4bf8dda968526d (diff) | |
download | scilab-6.0.zip scilab-6.0.tar.gz |
Compilation of scilab 6.0 under OSX Mojave6.0
Change-Id: I76bea6ca402f9a83a5e3d8aa45d45bb2a2762172
-rw-r--r-- | scilab/Makefile.in | 96 | ||||
-rw-r--r-- | scilab/m4/macosx.m4 | 3 | ||||
-rw-r--r-- | scilab/modules/scicos/Makefile.in | 2 | ||||
-rw-r--r-- | scilab/modules/scicos/Makefile.modelica.am | 2 |
4 files changed, 47 insertions, 56 deletions
diff --git a/scilab/Makefile.in b/scilab/Makefile.in index 7f3201f..33a2a20 100644 --- a/scilab/Makefile.in +++ b/scilab/Makefile.in | |||
@@ -1,7 +1,7 @@ | |||
1 | # Makefile.in generated by automake 1.14.1 from Makefile.am. | 1 | # Makefile.in generated by automake 1.15.1 from Makefile.am. |
2 | # @configure_input@ | 2 | # @configure_input@ |
3 | 3 | ||
4 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | 4 | # Copyright (C) 1994-2017 Free Software Foundation, Inc. |
5 | 5 | ||
6 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
7 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
@@ -46,7 +46,17 @@ | |||
46 | 46 | ||
47 | 47 | ||
48 | VPATH = @srcdir@ | 48 | VPATH = @srcdir@ |
49 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | 49 | am__is_gnu_make = { \ |
50 | if test -z '$(MAKELEVEL)'; then \ | ||
51 | false; \ | ||
52 | elif test -n '$(MAKE_HOST)'; then \ | ||
53 | true; \ | ||
54 | elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ | ||
55 | true; \ | ||
56 | else \ | ||
57 | false; \ | ||
58 | fi; \ | ||
59 | } | ||
50 | am__make_running_with_option = \ | 60 | am__make_running_with_option = \ |
51 | case $${target_option-} in \ | 61 | case $${target_option-} in \ |
52 | ?) ;; \ | 62 | ?) ;; \ |
@@ -140,32 +150,6 @@ bin_PROGRAMS = scilab-bin$(EXEEXT) scilab-cli-bin$(EXEEXT) | |||
140 | # The user wants to compile the localization files | 150 | # The user wants to compile the localization files |
141 | @GENERATE_LOCALIZATION_FILES_TRUE@am__append_13 = localization | 151 | @GENERATE_LOCALIZATION_FILES_TRUE@am__append_13 = localization |
142 | @COMPILATION_TESTS_TRUE@am__append_14 = check-java | 152 | @COMPILATION_TESTS_TRUE@am__append_14 = check-java |
143 | DIST_COMMON = $(top_srcdir)/Makefile.call_scilab.am \ | ||
144 | $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ | ||
145 | $(top_srcdir)/configure $(am__configure_deps) \ | ||
146 | $(top_srcdir)/modules/core/includes/machine.h.in \ | ||
147 | $(top_srcdir)/config/mkinstalldirs $(srcdir)/scilab.pc.in \ | ||
148 | $(top_srcdir)/etc/modules.xml.in \ | ||
149 | $(top_srcdir)/etc/classpath.xml.in \ | ||
150 | $(top_srcdir)/etc/Info.plist.in \ | ||
151 | $(top_srcdir)/etc/logging.properties.in \ | ||
152 | $(srcdir)/scilab.properties.in \ | ||
153 | $(srcdir)/scilab-lib.properties.in \ | ||
154 | $(srcdir)/scilab-lib-doc.properties.in \ | ||
155 | $(top_srcdir)/modules/helptools/etc/SciDocConf.xml.in \ | ||
156 | $(top_srcdir)/modules/core/includes/version.h.in \ | ||
157 | $(top_srcdir)/modules/atoms/etc/repositories.in \ | ||
158 | $(top_srcdir)/modules/atoms/tests/unit_tests/repositories.orig.in \ | ||
159 | $(top_srcdir)/config/depcomp COPYING config/ar-lib \ | ||
160 | config/compile config/config.guess config/config.rpath \ | ||
161 | config/config.sub config/depcomp config/install-sh \ | ||
162 | config/missing config/mkinstalldirs config/ltmain.sh \ | ||
163 | $(top_srcdir)/config/ar-lib $(top_srcdir)/config/compile \ | ||
164 | $(top_srcdir)/config/config.guess \ | ||
165 | $(top_srcdir)/config/config.rpath \ | ||
166 | $(top_srcdir)/config/config.sub \ | ||
167 | $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ | ||
168 | $(top_srcdir)/config/missing | ||
169 | check_PROGRAMS = call_scilab_c_simple$(EXEEXT) call_scilab_c$(EXEEXT) \ | 153 | check_PROGRAMS = call_scilab_c_simple$(EXEEXT) call_scilab_c$(EXEEXT) \ |
170 | call_scilab_c_getlastjob$(EXEEXT) \ | 154 | call_scilab_c_getlastjob$(EXEEXT) \ |
171 | call_scilab_c_DisableInteractiveMode$(EXEEXT) \ | 155 | call_scilab_c_DisableInteractiveMode$(EXEEXT) \ |
@@ -195,6 +179,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ | |||
195 | $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac | 179 | $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac |
196 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 180 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
197 | $(ACLOCAL_M4) | 181 | $(ACLOCAL_M4) |
182 | DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ | ||
183 | $(am__configure_deps) $(am__DIST_COMMON) | ||
198 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ | 184 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
199 | configure.lineno config.status.lineno | 185 | configure.lineno config.status.lineno |
200 | mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs | 186 | mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs |
@@ -913,7 +899,7 @@ LANG_DOMAIN = scilab | |||
913 | TARGETS_ALL = macros $(am__append_13) $(am__append_14) | 899 | TARGETS_ALL = macros $(am__append_13) $(am__append_14) |
914 | 900 | ||
915 | # check is performed with scilab, so use the serial-tests on purpose | 901 | # check is performed with scilab, so use the serial-tests on purpose |
916 | TESTS_ENVIRONMENT = LANG=C $(top_builddir)/bin/scilab-cli -nb -noatomsautoload -f | 902 | TESTS_ENVIRONMENT = LANG=C HOME=/tmp $(top_builddir)/bin/scilab-cli -nb -noatomsautoload -nouserstartup -f |
917 | TESTS = $(top_builddir)/modules/development_tools/tests/unit_tests/test_run_level_1.tst | 903 | TESTS = $(top_builddir)/modules/development_tools/tests/unit_tests/test_run_level_1.tst |
918 | rootdir = $(pkgdatadir)/etc/ | 904 | rootdir = $(pkgdatadir)/etc/ |
919 | root_DATA = $(top_srcdir)/etc/scilab.start \ | 905 | root_DATA = $(top_srcdir)/etc/scilab.start \ |
@@ -1018,7 +1004,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |||
1018 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | 1004 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ |
1019 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | 1005 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ |
1020 | esac; | 1006 | esac; |
1021 | $(top_srcdir)/Makefile.call_scilab.am: | 1007 | $(top_srcdir)/Makefile.call_scilab.am $(am__empty): |
1022 | 1008 | ||
1023 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | 1009 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
1024 | $(SHELL) ./config.status --recheck | 1010 | $(SHELL) ./config.status --recheck |
@@ -1855,7 +1841,7 @@ distdir: $(DISTFILES) | |||
1855 | ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ | 1841 | ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ |
1856 | || chmod -R a+r "$(distdir)" | 1842 | || chmod -R a+r "$(distdir)" |
1857 | dist-gzip: distdir | 1843 | dist-gzip: distdir |
1858 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | 1844 | tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz |
1859 | $(am__post_remove_distdir) | 1845 | $(am__post_remove_distdir) |
1860 | dist-bzip2: distdir | 1846 | dist-bzip2: distdir |
1861 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 | 1847 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
@@ -1870,17 +1856,17 @@ dist-xz: distdir | |||
1870 | $(am__post_remove_distdir) | 1856 | $(am__post_remove_distdir) |
1871 | 1857 | ||
1872 | dist-tarZ: distdir | 1858 | dist-tarZ: distdir |
1873 | @echo WARNING: "Support for shar distribution archives is" \ | 1859 | @echo WARNING: "Support for distribution archives compressed with" \ |
1874 | "deprecated." >&2 | 1860 | "legacy program 'compress' is deprecated." >&2 |
1875 | @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 | 1861 | @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
1876 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z | 1862 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
1877 | $(am__post_remove_distdir) | 1863 | $(am__post_remove_distdir) |
1878 | 1864 | ||
1879 | dist-shar: distdir | 1865 | dist-shar: distdir |
1880 | @echo WARNING: "Support for distribution archives compressed with" \ | 1866 | @echo WARNING: "Support for shar distribution archives is" \ |
1881 | "legacy program 'compress' is deprecated." >&2 | 1867 | "deprecated." >&2 |
1882 | @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 | 1868 | @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
1883 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz | 1869 | shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz |
1884 | $(am__post_remove_distdir) | 1870 | $(am__post_remove_distdir) |
1885 | dist-zip: distdir | 1871 | dist-zip: distdir |
1886 | -rm -f $(distdir).zip | 1872 | -rm -f $(distdir).zip |
@@ -1897,7 +1883,7 @@ dist dist-all: | |||
1897 | distcheck: dist | 1883 | distcheck: dist |
1898 | case '$(DIST_ARCHIVES)' in \ | 1884 | case '$(DIST_ARCHIVES)' in \ |
1899 | *.tar.gz*) \ | 1885 | *.tar.gz*) \ |
1900 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ | 1886 | eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ |
1901 | *.tar.bz2*) \ | 1887 | *.tar.bz2*) \ |
1902 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ | 1888 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
1903 | *.tar.lz*) \ | 1889 | *.tar.lz*) \ |
@@ -1907,23 +1893,23 @@ distcheck: dist | |||
1907 | *.tar.Z*) \ | 1893 | *.tar.Z*) \ |
1908 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ | 1894 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
1909 | *.shar.gz*) \ | 1895 | *.shar.gz*) \ |
1910 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ | 1896 | eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ |
1911 | *.zip*) \ | 1897 | *.zip*) \ |
1912 | unzip $(distdir).zip ;;\ | 1898 | unzip $(distdir).zip ;;\ |
1913 | esac | 1899 | esac |
1914 | chmod -R a-w $(distdir) | 1900 | chmod -R a-w $(distdir) |
1915 | chmod u+w $(distdir) | 1901 | chmod u+w $(distdir) |
1916 | mkdir $(distdir)/_build $(distdir)/_inst | 1902 | mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst |
1917 | chmod a-w $(distdir) | 1903 | chmod a-w $(distdir) |
1918 | test -d $(distdir)/_build || exit 0; \ | 1904 | test -d $(distdir)/_build || exit 0; \ |
1919 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ | 1905 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
1920 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ | 1906 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
1921 | && am__cwd=`pwd` \ | 1907 | && am__cwd=`pwd` \ |
1922 | && $(am__cd) $(distdir)/_build \ | 1908 | && $(am__cd) $(distdir)/_build/sub \ |
1923 | && ../configure \ | 1909 | && ../../configure \ |
1924 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ | 1910 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
1925 | $(DISTCHECK_CONFIGURE_FLAGS) \ | 1911 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
1926 | --srcdir=.. --prefix="$$dc_install_base" \ | 1912 | --srcdir=../.. --prefix="$$dc_install_base" \ |
1927 | && $(MAKE) $(AM_MAKEFLAGS) \ | 1913 | && $(MAKE) $(AM_MAKEFLAGS) \ |
1928 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ | 1914 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
1929 | && $(MAKE) $(AM_MAKEFLAGS) check \ | 1915 | && $(MAKE) $(AM_MAKEFLAGS) check \ |
@@ -2126,6 +2112,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ | |||
2126 | uninstall-infofilesDATA uninstall-pkgconfigDATA \ | 2112 | uninstall-infofilesDATA uninstall-pkgconfigDATA \ |
2127 | uninstall-rootDATA uninstall-valgrindDATA | 2113 | uninstall-rootDATA uninstall-valgrindDATA |
2128 | 2114 | ||
2115 | .PRECIOUS: Makefile | ||
2116 | |||
2129 | 2117 | ||
2130 | # Don't do it for scilab_cli_bin. We want to be able to call it without | 2118 | # Don't do it for scilab_cli_bin. We want to be able to call it without |
2131 | # the java libs | 2119 | # the java libs |
@@ -2138,8 +2126,8 @@ all-local: $(TARGETS_ALL) | |||
2138 | 2126 | ||
2139 | macros: $(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli check-jvm-dep check-libstdcpp-dep | 2127 | macros: $(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli check-jvm-dep check-libstdcpp-dep |
2140 | -@( cd $(top_builddir) ; \ | 2128 | -@( cd $(top_builddir) ; \ |
2141 | echo "$(top_builddir)/bin/scilab-cli -ns -noatomsautoload -quit -f modules/functions/scripts/buildmacros/buildmacros.sce" ; \ | 2129 | echo "$(top_builddir)/bin/scilab-cli -ns -noatomsautoload -nouserstartup -quit -f modules/functions/scripts/buildmacros/buildmacros.sce" ; \ |
2142 | $(top_builddir)/bin/scilab-cli -ns -noatomsautoload -quit -f modules/functions/scripts/buildmacros/buildmacros.sce) || exit 1 | 2130 | HOME=/tmp $(top_builddir)/bin/scilab-cli -ns -noatomsautoload -nouserstartup -quit -f modules/functions/scripts/buildmacros/buildmacros.sce) || exit 1 |
2143 | 2131 | ||
2144 | strip-debug: | 2132 | strip-debug: |
2145 | find $(top_builddir) -name '*.so.?.?.?' | while read file ; \ | 2133 | find $(top_builddir) -name '*.so.?.?.?' | while read file ; \ |
@@ -2215,8 +2203,8 @@ doc: javadoc $(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli | |||
2215 | @BUILD_HELP_TRUE@ for l in $(ALL_LINGUAS_DOC); do \ | 2203 | @BUILD_HELP_TRUE@ for l in $(ALL_LINGUAS_DOC); do \ |
2216 | @BUILD_HELP_TRUE@ echo "-- Building documentation ($$l) --"; \ | 2204 | @BUILD_HELP_TRUE@ echo "-- Building documentation ($$l) --"; \ |
2217 | @BUILD_HELP_TRUE@ COMMAND="try xmltojar([],[],'$$l');catch disp(lasterror()); exit(-1);end;exit(0);"; \ | 2205 | @BUILD_HELP_TRUE@ COMMAND="try xmltojar([],[],'$$l');catch disp(lasterror()); exit(-1);end;exit(0);"; \ |
2218 | @BUILD_HELP_TRUE@ echo "LANG=$$l.UTF-8 LC_ALL=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS='-Djava.awt.headless=true' $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e \"$$COMMAND\"";\ | 2206 | @BUILD_HELP_TRUE@ echo "LANG=$$l.UTF-8 LC_ALL=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS='-Djava.awt.headless=true' HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e \"$$COMMAND\"";\ |
2219 | @BUILD_HELP_TRUE@ LANG=$$l.UTF-8 LC_ALL=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS='-Djava.awt.headless=true' $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e "$$COMMAND" || exit 1;\ | 2207 | @BUILD_HELP_TRUE@ LANG=$$l.UTF-8 LC_ALL=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS='-Djava.awt.headless=true' HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e "$$COMMAND" || exit 1;\ |
2220 | @BUILD_HELP_TRUE@ done; \ | 2208 | @BUILD_HELP_TRUE@ done; \ |
2221 | @BUILD_HELP_TRUE@ else \ | 2209 | @BUILD_HELP_TRUE@ else \ |
2222 | @BUILD_HELP_TRUE@ echo "Cannot find Scilab-adv-cli binary"; \ | 2210 | @BUILD_HELP_TRUE@ echo "Cannot find Scilab-adv-cli binary"; \ |
@@ -2229,8 +2217,8 @@ doc-web: javadoc $(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli | |||
2229 | @BUILD_HELP_TRUE@ for l in $(ALL_LINGUAS_DOC); do \ | 2217 | @BUILD_HELP_TRUE@ for l in $(ALL_LINGUAS_DOC); do \ |
2230 | @BUILD_HELP_TRUE@ echo "-- Building documentation ($$l) --"; \ | 2218 | @BUILD_HELP_TRUE@ echo "-- Building documentation ($$l) --"; \ |
2231 | @BUILD_HELP_TRUE@ COMMAND="try xmltoweb([],[],'$$l');catch exit(-1);end;exit(0);";\ | 2219 | @BUILD_HELP_TRUE@ COMMAND="try xmltoweb([],[],'$$l');catch exit(-1);end;exit(0);";\ |
2232 | @BUILD_HELP_TRUE@ echo "LANG=$$l.UTF-8 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -l $$l -noatomsautoload -nouserstartup -e \"$$COMMAND\"";\ | 2220 | @BUILD_HELP_TRUE@ echo "LANG=$$l.UTF-8 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -nb -l $$l -noatomsautoload -nouserstartup -e \"$$COMMAND\"";\ |
2233 | @BUILD_HELP_TRUE@ LANG=$$l.UTF-8 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -l $$l -noatomsautoload -nouserstartup -e "$$COMMAND" || exit 1;\ | 2221 | @BUILD_HELP_TRUE@ LANG=$$l.UTF-8 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -nb -l $$l -noatomsautoload -nouserstartup -e "$$COMMAND" || exit 1;\ |
2234 | @BUILD_HELP_TRUE@ JAVADOC_TARGET=$(top_builddir)/modules/helptools/web/$$l/javasci; \ | 2222 | @BUILD_HELP_TRUE@ JAVADOC_TARGET=$(top_builddir)/modules/helptools/web/$$l/javasci; \ |
2235 | @BUILD_HELP_TRUE@ if test ! -d $$JAVADOC_TARGET; then \ | 2223 | @BUILD_HELP_TRUE@ if test ! -d $$JAVADOC_TARGET; then \ |
2236 | @BUILD_HELP_TRUE@ mkdir $$JAVADOC_TARGET; \ | 2224 | @BUILD_HELP_TRUE@ mkdir $$JAVADOC_TARGET; \ |
@@ -2257,8 +2245,8 @@ check-help:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli | |||
2257 | for l in $(ALL_LINGUAS_DOC); do \ | 2245 | for l in $(ALL_LINGUAS_DOC); do \ |
2258 | echo "-- Checking documentation ($$l) --"; \ | 2246 | echo "-- Checking documentation ($$l) --"; \ |
2259 | COMMAND="try check_help();catch exit(-1);end;exit(0);";\ | 2247 | COMMAND="try check_help();catch exit(-1);end;exit(0);";\ |
2260 | echo "$(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -e \"$$COMMAND\"";\ | 2248 | echo "$(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -nouserstartup -e \"$$COMMAND\"";\ |
2261 | $(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -e "$$COMMAND" || exit 1;\ | 2249 | HOME=/tmp $(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -nouserstartup -e "$$COMMAND" || exit 1;\ |
2262 | done; \ | 2250 | done; \ |
2263 | else \ | 2251 | else \ |
2264 | echo "Cannot find Scilab binary"; \ | 2252 | echo "Cannot find Scilab binary"; \ |
@@ -2294,8 +2282,8 @@ clean-help: | |||
2294 | -@if test -x $(top_builddir)/scilab-cli-bin; then \ | 2282 | -@if test -x $(top_builddir)/scilab-cli-bin; then \ |
2295 | COMMAND="try clean_help();catch exit(-1);end;exit(0)"; \ | 2283 | COMMAND="try clean_help();catch exit(-1);end;exit(0)"; \ |
2296 | for l in $(ALL_LINGUAS_DOC); do \ | 2284 | for l in $(ALL_LINGUAS_DOC); do \ |
2297 | echo "$(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -e '$$COMMAND'"; \ | 2285 | echo "$(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -nouserstartup -e '$$COMMAND'"; \ |
2298 | $(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -e "$$COMMAND" || exit 1; \ | 2286 | HOME=/tmp $(top_builddir)/bin/scilab-cli -nb -l $$l -noatomsautoload -nouserstartup -e "$$COMMAND" || exit 1; \ |
2299 | done; \ | 2287 | done; \ |
2300 | else \ | 2288 | else \ |
2301 | echo "Cannot find Scilab binary"; \ | 2289 | echo "Cannot find Scilab binary"; \ |
@@ -2315,7 +2303,7 @@ clean-help: | |||
2315 | 2303 | ||
2316 | clean-tests: | 2304 | clean-tests: |
2317 | @if test -x $(top_builddir)/scilab-cli-bin; then \ | 2305 | @if test -x $(top_builddir)/scilab-cli-bin; then \ |
2318 | $(top_builddir)/bin/scilab-cli -nb -noatomsautoload -l fr -e 'try test_clean();catch exit(-1);end;exit(0);' || exit 1; \ | 2306 | HOME=/tmp $(top_builddir)/bin/scilab-cli -nb -noatomsautoload -nouserstartup -l fr -e 'try test_clean();catch exit(-1);end;exit(0);' || exit 1; \ |
2319 | else \ | 2307 | else \ |
2320 | echo "Cannot find Scilab binary"; \ | 2308 | echo "Cannot find Scilab binary"; \ |
2321 | fi | 2309 | fi |
diff --git a/scilab/m4/macosx.m4 b/scilab/m4/macosx.m4 index 80f1e09..a9ff851 100644 --- a/scilab/m4/macosx.m4 +++ b/scilab/m4/macosx.m4 | |||
@@ -5,6 +5,9 @@ AC_DEFUN([AC_GET_MACOSX_VERSION],[ | |||
5 | AC_MSG_CHECKING([Mac OS X Version]) | 5 | AC_MSG_CHECKING([Mac OS X Version]) |
6 | [macosx_version=`sw_vers -productVersion`] | 6 | [macosx_version=`sw_vers -productVersion`] |
7 | case $macosx_version in | 7 | case $macosx_version in |
8 | 10.14*) | ||
9 | AC_MSG_RESULT([macOS 10.14 - Mojave.]) | ||
10 | ;; | ||
8 | 10.13*) | 11 | 10.13*) |
9 | AC_MSG_RESULT([macOS 10.13 - High Sierra.]) | 12 | AC_MSG_RESULT([macOS 10.13 - High Sierra.]) |
10 | ;; | 13 | ;; |
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in index 1245095..8195c9e 100644 --- a/scilab/modules/scicos/Makefile.in +++ b/scilab/modules/scicos/Makefile.in | |||
@@ -3779,7 +3779,7 @@ distclean-local: | |||
3779 | # Build the binaries, disabling parallel building as ocamldep ordering seems to fail on some systems | 3779 | # Build the binaries, disabling parallel building as ocamldep ordering seems to fail on some systems |
3780 | 3780 | ||
3781 | @OCAML_TRUE@@XCOS_TRUE@modelicac: $(modelicac_SOURCES) $(MLS_modelicac) | 3781 | @OCAML_TRUE@@XCOS_TRUE@modelicac: $(modelicac_SOURCES) $(MLS_modelicac) |
3782 | @OCAML_TRUE@@XCOS_TRUE@ /usr/bin/time -v $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicac) | 3782 | @OCAML_TRUE@@XCOS_TRUE@ /usr/bin/time $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicac) |
3783 | 3783 | ||
3784 | @OCAML_TRUE@@XCOS_TRUE@modelicac.ocamlc: $(modelicac_SOURCES) $(MLS_modelicac) | 3784 | @OCAML_TRUE@@XCOS_TRUE@modelicac.ocamlc: $(modelicac_SOURCES) $(MLS_modelicac) |
3785 | @OCAML_TRUE@@XCOS_TRUE@ $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicac) | 3785 | @OCAML_TRUE@@XCOS_TRUE@ $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicac) |
diff --git a/scilab/modules/scicos/Makefile.modelica.am b/scilab/modules/scicos/Makefile.modelica.am index 6b8e1aa..77c534f 100644 --- a/scilab/modules/scicos/Makefile.modelica.am +++ b/scilab/modules/scicos/Makefile.modelica.am | |||
@@ -113,7 +113,7 @@ SUFFIXES += .mll .mly | |||
113 | # Build the binaries, disabling parallel building as ocamldep ordering seems to fail on some systems | 113 | # Build the binaries, disabling parallel building as ocamldep ordering seems to fail on some systems |
114 | 114 | ||
115 | modelicac: $(modelicac_SOURCES) $(MLS_modelicac) | 115 | modelicac: $(modelicac_SOURCES) $(MLS_modelicac) |
116 | /usr/bin/time -v $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicac) | 116 | /usr/bin/time $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicac) |
117 | 117 | ||
118 | modelicac.ocamlc: $(modelicac_SOURCES) $(MLS_modelicac) | 118 | modelicac.ocamlc: $(modelicac_SOURCES) $(MLS_modelicac) |
119 | $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicac) | 119 | $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicac) |