summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Bignier <paul.bignier@scilab-enterprises.com>2016-12-21 09:18:31 +0100
committerPaul Bignier <paul.bignier@scilab-enterprises.com>2016-12-21 09:19:29 +0100
commit070653459ef4f5fdfa8de2f52312623ae3917b52 (patch)
tree48363379a48a238a613bcccc50824964dce599d4
parent71177ef17db02ad487ae0b28e60f8e69d0cd477a (diff)
downloadscilab-070653459ef4f5fdfa8de2f52312623ae3917b52.zip
scilab-070653459ef4f5fdfa8de2f52312623ae3917b52.tar.gz
Revert "OCaml build: enforce .mli generation to clean-build in parallel"
This reverts commit 32c0288226994dc2a28c9cf6e38eaed3dfdae90c. The commit prevented scicos compilation Change-Id: Iaa1fc805b36ccdd88779612e7225e9fea2c1db7b
-rw-r--r--scilab/CHANGES.md2
-rw-r--r--scilab/modules/scicos/.gitignore1
-rw-r--r--scilab/modules/scicos/Makefile.in19
-rw-r--r--scilab/modules/scicos/Makefile.modelica.am19
4 files changed, 26 insertions, 15 deletions
diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index 7caeac8..fa69f7c 100644
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -62,8 +62,6 @@ To build Scilab from sources, or to build extensions code (Toolboxes):
62* ecj minimal version switched to 4.4.0 (for Java 8 compatibility). 62* ecj minimal version switched to 4.4.0 (for Java 8 compatibility).
63* `--without-xcos` now only disable Xcos compilation. Xcos graphical interface is disabled using `--without-gui`. 63* `--without-xcos` now only disable Xcos compilation. Xcos graphical interface is disabled using `--without-gui`.
64 64
65Building the OCaml Scilab files in parallel is supported.
66
67 65
68Dependencies 66Dependencies
69------------ 67------------
diff --git a/scilab/modules/scicos/.gitignore b/scilab/modules/scicos/.gitignore
index 4990ee1..f80fec8 100644
--- a/scilab/modules/scicos/.gitignore
+++ b/scilab/modules/scicos/.gitignore
@@ -2,7 +2,6 @@
2 2
3modelicac 3modelicac
4modelicac.ocamlc 4modelicac.ocamlc
5*.mli
6*.cmi 5*.cmi
7*.cma 6*.cma
8*.cmo 7*.cmo
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index de65355..d012be4 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -3796,25 +3796,32 @@ distclean-local:
3796 3796
3797@OCAML_TRUE@@XCOS_TRUE@.mly.ml: 3797@OCAML_TRUE@@XCOS_TRUE@.mly.ml:
3798@OCAML_TRUE@@XCOS_TRUE@ $(OCAMLYACC) $< 3798@OCAML_TRUE@@XCOS_TRUE@ $(OCAMLYACC) $<
3799@OCAML_TRUE@@XCOS_TRUE@ @rm $*.mli
3799 3800
3800# Build the binaries, disabling parallel building 3801# Build the binaries, disabling parallel building
3801 3802
3802@OCAML_TRUE@@XCOS_TRUE@modelicac: $(modelicac_SOURCES) $(MLIS_modelicac) $(MLS_modelicac:.ml=.cmx) 3803@OCAML_TRUE@@XCOS_TRUE@modelicac: $(modelicac_SOURCES)
3804@OCAML_TRUE@@XCOS_TRUE@ $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicac:.ml=.cmx)
3803@OCAML_TRUE@@XCOS_TRUE@ $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicac:.ml=.cmx) 3805@OCAML_TRUE@@XCOS_TRUE@ $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicac:.ml=.cmx)
3804 3806
3805@OCAML_TRUE@@XCOS_TRUE@modelicac.ocamlc: $(modelicac_SOURCES) $(MLIS_modelicac) $(MLS_modelicac:.ml=.cmo) 3807@OCAML_TRUE@@XCOS_TRUE@modelicac.ocamlc: $(modelicac_SOURCES)
3808@OCAML_TRUE@@XCOS_TRUE@ $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicac:.ml=.cmo)
3806@OCAML_TRUE@@XCOS_TRUE@ $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicac:.ml=.cmo) 3809@OCAML_TRUE@@XCOS_TRUE@ $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicac:.ml=.cmo)
3807 3810
3808@OCAML_TRUE@@XCOS_TRUE@XML2Modelica: $(XML2Modelica_SOURCES) $(MLIS_XML2Modelica) $(MLS_XML2Modelica:.ml=.cmx) 3811@OCAML_TRUE@@XCOS_TRUE@XML2Modelica: $(XML2Modelica_SOURCES)
3812@OCAML_TRUE@@XCOS_TRUE@ $(MAKE) MAKEFLAGS=-j1 $(MLS_XML2Modelica:.ml=.cmx)
3809@OCAML_TRUE@@XCOS_TRUE@ $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_XML2Modelica:.ml=.cmx) 3813@OCAML_TRUE@@XCOS_TRUE@ $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_XML2Modelica:.ml=.cmx)
3810 3814
3811@OCAML_TRUE@@XCOS_TRUE@XML2Modelica.ocamlc: $(XML2Modelica_SOURCES) $(MLIS_XML2Modelica) $(MLS_XML2Modelica:.ml=.cmo) 3815@OCAML_TRUE@@XCOS_TRUE@XML2Modelica.ocamlc: $(XML2Modelica_SOURCES)
3816@OCAML_TRUE@@XCOS_TRUE@ $(MAKE) MAKEFLAGS=-j1 $(MLS_XML2Modelica:.ml=.cmo)
3812@OCAML_TRUE@@XCOS_TRUE@ $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS) $(MLS_XML2Modelica:.ml=.cmo) 3817@OCAML_TRUE@@XCOS_TRUE@ $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS) $(MLS_XML2Modelica:.ml=.cmo)
3813 3818
3814@OCAML_TRUE@@XCOS_TRUE@modelicat: $(modelicat_SOURCES) $(MLIS_modelicat) $(MLS_modelicat:.ml=.cmx) 3819@OCAML_TRUE@@XCOS_TRUE@modelicat: $(modelicat_SOURCES)
3820@OCAML_TRUE@@XCOS_TRUE@ $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicat:.ml=.cmx)
3815@OCAML_TRUE@@XCOS_TRUE@ $(OCAMLOPT) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicat:.ml=.cmx) 3821@OCAML_TRUE@@XCOS_TRUE@ $(OCAMLOPT) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicat:.ml=.cmx)
3816 3822
3817@OCAML_TRUE@@XCOS_TRUE@modelicat.ocamlc: $(modelicat_SOURCES) $(MLIS_modelicat) $(MLS_modelicat:.ml=.cmo) 3823@OCAML_TRUE@@XCOS_TRUE@modelicat.ocamlc: $(modelicat_SOURCES)
3824@OCAML_TRUE@@XCOS_TRUE@ $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicat:.ml=.cmo)
3818@OCAML_TRUE@@XCOS_TRUE@ $(OCAMLC) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicat:.ml=.cmo) 3825@OCAML_TRUE@@XCOS_TRUE@ $(OCAMLC) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicat:.ml=.cmo)
3819 3826
3820#BUILT_SOURCES = depend 3827#BUILT_SOURCES = depend
diff --git a/scilab/modules/scicos/Makefile.modelica.am b/scilab/modules/scicos/Makefile.modelica.am
index dae2e9e..01fd5f1 100644
--- a/scilab/modules/scicos/Makefile.modelica.am
+++ b/scilab/modules/scicos/Makefile.modelica.am
@@ -148,25 +148,32 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi .cmx
148 148
149.mly.ml: 149.mly.ml:
150 $(OCAMLYACC) $< 150 $(OCAMLYACC) $<
151 @rm $*.mli
151 152
152# Build the binaries, disabling parallel building 153# Build the binaries, disabling parallel building
153 154
154modelicac: $(modelicac_SOURCES) $(MLIS_modelicac) $(MLS_modelicac:.ml=.cmx) 155modelicac: $(modelicac_SOURCES)
156 $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicac:.ml=.cmx)
155 $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicac:.ml=.cmx) 157 $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicac:.ml=.cmx)
156 158
157modelicac.ocamlc: $(modelicac_SOURCES) $(MLIS_modelicac) $(MLS_modelicac:.ml=.cmo) 159modelicac.ocamlc: $(modelicac_SOURCES)
160 $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicac:.ml=.cmo)
158 $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicac:.ml=.cmo) 161 $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicac:.ml=.cmo)
159 162
160XML2Modelica: $(XML2Modelica_SOURCES) $(MLIS_XML2Modelica) $(MLS_XML2Modelica:.ml=.cmx) 163XML2Modelica: $(XML2Modelica_SOURCES)
164 $(MAKE) MAKEFLAGS=-j1 $(MLS_XML2Modelica:.ml=.cmx)
161 $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_XML2Modelica:.ml=.cmx) 165 $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_XML2Modelica:.ml=.cmx)
162 166
163XML2Modelica.ocamlc: $(XML2Modelica_SOURCES) $(MLIS_XML2Modelica) $(MLS_XML2Modelica:.ml=.cmo) 167XML2Modelica.ocamlc: $(XML2Modelica_SOURCES)
168 $(MAKE) MAKEFLAGS=-j1 $(MLS_XML2Modelica:.ml=.cmo)
164 $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS) $(MLS_XML2Modelica:.ml=.cmo) 169 $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS) $(MLS_XML2Modelica:.ml=.cmo)
165 170
166modelicat: $(modelicat_SOURCES) $(MLIS_modelicat) $(MLS_modelicat:.ml=.cmx) 171modelicat: $(modelicat_SOURCES)
172 $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicat:.ml=.cmx)
167 $(OCAMLOPT) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicat:.ml=.cmx) 173 $(OCAMLOPT) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicat:.ml=.cmx)
168 174
169modelicat.ocamlc: $(modelicat_SOURCES) $(MLIS_modelicat) $(MLS_modelicat:.ml=.cmo) 175modelicat.ocamlc: $(modelicat_SOURCES)
176 $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicat:.ml=.cmo)
170 $(OCAMLC) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicat:.ml=.cmo) 177 $(OCAMLC) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicat:.ml=.cmo)
171 178
172CLEANFILES = $(BASE_PATH)/*/*.cmi \ 179CLEANFILES = $(BASE_PATH)/*/*.cmi \