Commit Graph

224 Commits (c4e8117c2bf2b17e60c5d141456a3628d150513c)

Author SHA1 Message Date
alainfrisch de857d6fb9 GPR#324: Make boot/ocamlc read directly byterun/primitives (patch by Francois Bobot). 2016-03-10 10:46:19 +01:00
Damien Doligez d5f61a4e54 tweak tools/check-typo and break more overlong lines 2016-02-19 12:28:36 +01:00
Damien Doligez 5401ce8473 Update headers for the new license.
Remains to be done: remove all headers in testsuite/tests.
2016-02-18 16:59:16 +01:00
Damien Doligez ee8f71101b clean up whitespace and cut long lines 2016-02-17 13:36:27 +01:00
alainfrisch 6661919762 Move more stuff into Makefile.shared in order to fix the build on Windows. 2016-02-11 10:34:36 +01:00
Christophe Troestler 37edba7be7 Avoid calling make recursively when "testsuite" is not present
Suggestion of Damien Doligez.
2016-02-10 14:46:39 +01:00
Christophe Troestler c449bbeb3d Make AppVeyor run tests 2016-02-10 14:46:39 +01:00
Christophe Troestler 7f6a8ae2f0 Protect install paths against spaces (on Windows) 2016-02-10 14:46:39 +01:00
Gabriel Scherer f8f2a6277f remove ocamlbuild from the compiler distribution 2016-02-01 15:05:18 -05:00
Pierre Chambart 4c67cc0347 Fix Makefile.nt 2016-01-22 17:02:06 +01:00
Pierre Chambart 050c454765 Add middle_end to Makefiles 2016-01-22 01:24:02 +01:00
David Allsopp b46843fb69 Allow compilation using bootstrapped FlexDLL
Extend the previous patch allowing make -f Makefile.nt flexdll
install-flexdll not to require the install-flexdll stage.

OCAML_FLEXLINK is utilised as required to allow compilation of the entire
system using an in-tree compiled flexlink. The build process simply
required the flexdll target to appear before world.

opt.opt compiles a native code version of flexlink.exe as flexlink.opt.

install always installs flexlink.exe if it was compiled along with any
required .manifest files. It also installs the appropriate .o/.obj files
to $(INSTALL_LIBDIR).

At present, the bootstrapping is not extended to the Cygwin ports.
2016-01-15 17:07:12 +00:00
David Allsopp fe4b643c4e Support OCAML_FLEXLINK environment variable
OCAML_FLEXLINK is inspected by ocamlopt, ocamlc and ocamlmklib and allows
the flexlink command to be overriden. This is primarily intended as a
solution for bootstrapping OCaml with FlexDLL, thus allowing a bytecode
image of flexlink launched with ocamlrun to be executed, instead of
requiring flexlink to be in PATH.
2016-01-15 17:07:11 +00:00
David Allsopp a7b6083be3 Add FlexDLL as git submodule
Messages for obtaining flexdll sources updated in Makefile.nt
2016-01-15 17:07:01 +00:00
David Allsopp a9f5227d62 Allow bootstrapped FlexDLL to be installed
`install-flexdll` target added to Makefile.nt which installs flexlink.exe
and the correct objects, manifests and flexdll.h to `$(INSTALL_BINDIR)`.

When this target has been used, the behaviour of opt.opt is altered to
compile a native-code version of flexlink.exe. This is subsequently
installed by the install target.

This means that Windows can be fully built by issuing:

  make -f Makefile.nt flexdll install-flexdll world opt.opt install
2016-01-15 17:01:30 +00:00
David Allsopp 5da5d4ac7d Allow optional bootstrapping of FlexDLL on Windows
Allows the four native Windows ports to compile FlexDLL and flexlink
"in-tree" by placing the sources in directory `flexdll` and issuing
`make -f Makefile.nt flexdll`

FlexDLL must still be installed somewhere in PATH before OCaml itself
can be compiled. The `flexdll` target leaves the OCaml build tree in a
sufficiently clean state to allow `world` to be run after installation
of FlexDLL.
2016-01-15 17:01:30 +00:00
Pierre Chambart 828cb4ebb9 Add field in Config for flambda and change the cmx and cmxa magic number 2016-01-14 14:20:23 +01:00
Nicolas Ojeda Bar 97a89e2fd9 Install compiler-libs .cmx under Windows 2016-01-11 14:39:40 +01:00
David Allsopp 642d9db20d Ensure opt.opt always builds other libraries
Makefile.nt was only inadvertently compiling otherlibrariesopt when doing
world.opt/opt.opt because ocamlbuild.native depends on it. Building
otherlibrariesopt should be explicit (especially when ocamlbuild is
removed)
2016-01-04 11:21:55 +01:00
Xavier Leroy 2810763764 Strip debugging information off the bootstrap compilers, to reduce their size
The stripping is done during bootstrap, when copying the new ocamlc, ocamllex and ocamldep to boot/.  The new "stripdebug" tool performs this task.

As a consequence, comparing the new compilers with the boot/ compilers at the end of bootstrap is more complicated, since the debug section must be ignored.  A new tool, "cmpbyt" in tools/, performs this comparison.
2015-12-09 10:45:31 +01:00
Simon Cruanes f3d3c221b1 move README.win32 to asciidoc 2015-12-06 19:31:15 +01:00
Alain Frisch 90323d0d1e Starting to share identical parts in the root Makefile and Makefile.nt.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16534 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-10-23 13:49:59 +00:00
Alain Frisch 3a9ec51004 Fix Makefile.nt.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16533 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-10-23 13:42:00 +00:00
Damien Doligez 54ace9943b add parsing/attr_helper.cmo to Makefile.nt (see commit 16451)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16463 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-10-07 11:20:23 +00:00
Damien Doligez affb539dea Makefile.nt: clean up recursive calls to make
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16424 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-09-14 12:18:06 +00:00
Damien Doligez 860c670848 merge branch 4.02 from 4.02.1 (rev 15540) to a few fixes after 4.02.2 (rev 16205)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16214 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-07-17 14:31:05 +00:00
Leo White 5c55e4cc08 Attach documentation comments to Parsetree
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16189 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-06-28 13:11:50 +00:00
Gabriel Scherer d1ee5b0add untypeast: fix Makefile.nt
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15890 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-03-08 17:46:12 +00:00
Gabriel Scherer 95f626c9ff PR#6691: install .cmt[i] files for stdlib and compiler-libs
(patch by David Sheets)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15794 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-01-24 16:35:29 +00:00
Gabriel Scherer 7ca29ef3f7 PR#5887: move the byterun/*.h headers to byterun/caml/*.h to avoid header name clashes
(Jérôme Vouillon and Adrien Nader and Peter Zotov)


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15757 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-12-27 14:41:49 +00:00
Alain Frisch 9d450a05e0 Replace TypedtreeMap with a more standard open-recursion iterator Tast_mapper. Keep TypedtreeMap/Iter for now, for external projects.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15739 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-12-22 09:36:41 +00:00
Alain Frisch 3010bec0bf Fix for mingw/msvc ports.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/abstract_intel_emit@15615 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-11-28 13:17:48 +00:00
Alain Frisch b002e8b22e Sync with trunk.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/abstract_intel_emit@15448 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-10-03 13:35:02 +00:00
Damien Doligez 51e08c490b PR#4099: Bug in Makefile.nt: won't stop on error
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15358 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-09-26 20:57:13 +00:00
Alain Frisch 62a834f455 Fix for Windows.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/abstract_intel_emit@15182 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-09-02 16:04:55 +00:00
Alain Frisch 25178442c2 Only include Intel_* modules when arch is i386 or amd64.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/abstract_intel_emit@15180 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-09-02 15:07:59 +00:00
Alain Frisch 45f4535e99 Move the DSL part from intel_gas to its own module.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/abstract_intel_emit@15160 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-08-29 14:40:25 +00:00
Fabrice Le Fessant c6d4264a09 import new intel emit branch
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/abstract_intel_emit@15097 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-08-18 09:32:20 +00:00
Mark Shinwell dc8727466e stop doing chmod -w on utils/config.ml (PR 6319)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14967 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-06-06 12:01:16 +00:00
Damien Doligez d0368bc2c5 update distclean target
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14801 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-05-12 14:03:04 +00:00
Damien Doligez b4c3955ff7 update Makefile.nt for new asmcomp modules
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14703 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-29 09:40:31 +00:00
Damien Doligez bf8d983a51 fix bug in commit 14694
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14696 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-27 16:36:41 +00:00
Damien Doligez f48db16efd add missing rules for CSE.ml
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14694 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-27 09:31:22 +00:00
Damien Doligez 7303ac34ca fix some of the whitespace problems in the source
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14582 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-12 10:17:02 +00:00
Gabriel Scherer 0b161c0d34 [minor] Makefile.nt typo
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14545 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-07 11:40:24 +00:00
Gabriel Scherer af187516ea minor Makefile.nt fix
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14542 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-07 09:47:34 +00:00
Gabriel Scherer 880af0832d CI golf: try a better fix for tools install in Makefile.nt
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14541 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-07 09:44:51 +00:00
Gabriel Scherer 2a282db06e [minor] partial revert of trunk@14535 to make Windows CI happy
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14539 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-07 08:02:24 +00:00
Gabriel Scherer de4f4cf8b3 PR#6358: obey DESTDIR in install targets
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14536 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-07 07:06:17 +00:00
Gabriel Scherer 2ba45f9a22 harmonize Makefile.nt wrt. Makefile to simplify future line-by-line comparison
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14535 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-07 07:06:14 +00:00