Commit Graph

155 Commits (4e8b7a4808f928e6dba47a2bb768c83dbd426d2d)

Author SHA1 Message Date
Damien Doligez 575555eecd merge changes from branching of 3.12 to release/3.12.0
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10643 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-08-02 14:37:22 +00:00
Damien Doligez 3bba52b91c PR#4857: add -vnum option to all executables
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10444 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-20 14:06:29 +00:00
Damien Doligez d06b348db0 specify path to the 'find' utility for ocamlbuildlight
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10434 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-19 12:53:40 +00:00
Damien Doligez a274b01b55 removed -w A everywhere
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10286 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-20 15:38:58 +00:00
Nicolas Pouillard 4e6cb15c4f ocamlbuild: Add support for native dynlink
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10264 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-17 16:15:42 +00:00
Nicolas Pouillard 3cf7b7152b ocamlbuild,solver: GC some dead comment
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9616 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-02-03 13:33:19 +00:00
Nicolas Pouillard e9a4f4bdc3 ocamlbuild,TODO: one thing done
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9615 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-02-03 13:11:21 +00:00
Nicolas Pouillard da8e2346a0 ocamlbuild,solver: add two comments.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9614 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-02-03 13:11:20 +00:00
Nicolas Pouillard ee0f1a1bb2 ocamlbuild: no longer open Lexers
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9613 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-02-03 13:11:20 +00:00
Nicolas Pouillard 3a2a72f0b7 ocamlbuild: Improve a lexing error message
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9612 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-02-03 13:11:20 +00:00
Nicolas Pouillard a463a1b0a6 ocamlbuild: fix a bug about $PATH
Replace the colon_sep_strings lexing
function by parse_environment_path which
better account for leading or trailing
colons.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9611 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-02-03 13:11:19 +00:00
Nicolas Pouillard 8822cbb173 ocamlbuild,start: update start.sh
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9610 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-02-03 13:11:19 +00:00
Nicolas Pouillard 033e10198e ocamlbuild: two comments
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9609 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-02-03 10:27:46 +00:00
Nicolas Pouillard 0cfe32fc75 ocamlbuild,doc: add Ocamlbuild_Myocamlbuild_config
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9608 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-02-03 10:25:51 +00:00
Xavier Clerc b449be7a4d Added some missing files for parameterized tags.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9558 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-25 08:16:23 +00:00
Xavier Clerc a9c9e826e5 Error regarding original author
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9557 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-25 08:11:53 +00:00
Xavier Clerc facbf166da Support for findlibi, continued (N. Pouillard et al.)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9550 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-22 15:12:21 +00:00
Xavier Clerc ae90f26025 Support for findlib (N. Pouillard et al.)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9549 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-22 14:46:27 +00:00
Xavier Clerc bcdf4082cf Support for parametrized tags (N. Pouillard et al.)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9548 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-22 14:36:57 +00:00
Damien Doligez 04b1656222 clean up spaces and tabs
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9547 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-22 12:48:24 +00:00
Damien Doligez bdc0fadee2 merge changes from release/3.11.1 to release/3.11.2
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9540 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-20 16:26:46 +00:00
Damien Doligez 1b8095f404 PR#4940: get rid of naked end-of-lines in string constants + add warning 29
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9512 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-07 15:15:07 +00:00
Xavier Leroy 349467ec45 New warning `not all labels are mentioned in this record pattern'
moved to letter 'R' (instead of 'E' previously).  Explicitly turned 
off in myocamlbuild configuration.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9391 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-10-22 15:45:54 +00:00
Nicolas Pouillard 038ceed4e7 Fix ocamlbuild -where
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9276 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-05-24 09:11:39 +00:00
Damien Doligez ed32f569e3 merge changes from ocaml3110 to ocaml3111rc0
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9270 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-05-20 11:52:42 +00:00
Nicolas Pouillard 73e85b3edf ocamlbuild: add Ocamlbuild_Myocamlbuild_config to Ocamlbuild_pack
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9178 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-03-05 14:46:22 +00:00
Nicolas Pouillard f897ed0c73 ocamlbuild: Use libdir and bindir from the myocamlbuild_config.ml of OCaml
imported as ocamlbuild_Myocamlbuild_config.ml


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9176 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-03-05 14:33:06 +00:00
Nicolas Pouillard 5da04f8b51 ocamlbuild: Kill $Id$'s
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9173 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-03-03 16:54:58 +00:00
Nicolas Pouillard 384f04cb53 ocamlbuild: less 'open Format' and less 'Pervasives.'
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9171 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-03-03 16:23:12 +00:00
Pierre Weis a548eb3a13 Understanding the notion of standard channel for Format and Scanf.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9166 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-01-25 22:46:15 +00:00
Damien Doligez 1f95b17570 merge changes from 3.10.2merged to 3.11.0
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9153 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-12-03 18:09:09 +00:00
Nicolas Pouillard 901e3bfa82 ocamlbuild: close the log file when cleanning and lauching the plugin.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9118 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-11-06 15:40:39 +00:00
Nicolas Pouillard 3d52165d28 ocamlbuild: Add a 'annot' tag for the -annot option.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9096 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-22 11:23:57 +00:00
Damien Doligez 2b0441401a merge changes between 3.10.2 and the end of branch 3.10
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9079 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-08 13:09:39 +00:00
Nicolas Pouillard 1ede9c14d9 ocamlbuild: Progress on PR#4575 handle '\r' in chomp.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9044 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-10-01 08:36:26 +00:00
Nicolas Pouillard 5b3cdba5df ocamlbuild: dynlink is now supported in native too.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8980 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-08-05 13:06:56 +00:00
Nicolas Pouillard f6bd5658e2 ocamlbuild: fix a double "close" problem (PR#4380)
Thanks to mwipliez for spotting this double close, to jld for providing a
patch.



Author: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Committer: Nicolas Pouillard <ertai@port-ext16.ensta.fr>


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8960 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-31 07:36:12 +00:00
Nicolas Pouillard 5feab1f8ee ocamlbuild: add a ".ml->.pp.ml" rule, and export a camlp4 rule generator function.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8952 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 15:06:47 +00:00
Nicolas Pouillard 22119e7a0f ocamlbuild: disable a test for a now.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8951 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 15:02:45 +00:00
Nicolas Pouillard d9b00529cd ocamlbuild: extend test2.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8950 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:54:15 +00:00
Nicolas Pouillard 85d6ab9349 ocamlbuild: add test11.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8949 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:53:21 +00:00
Nicolas Pouillard 4399ca7c12 ocamlbuild: Add a Rule.Failed exception to allow user triggerd backtracking.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8948 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:50:47 +00:00
Nicolas Pouillard 4f5861e7fe ocamlbuild: display the OCaml version (fix PR#4530).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8947 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:49:03 +00:00
Nicolas Pouillard 79d2c3d441 ocamlbuild: export run_and_read.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8946 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:42:28 +00:00
Nicolas Pouillard a20b3b9dae ocamlbuild: Tags, add use_camlp4_bin and support -custom on libraries.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8945 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:40:49 +00:00
Nicolas Pouillard ab5f085dbc ocamlbuild: be more consitent on warnings over ocamlbuild sources.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8944 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:38:31 +00:00
Nicolas Pouillard dd4062efda ocamlbuild: Fix the -ocamlmktop flag to really setup ocamlmktop.
Thanks to Matthieu Dubuget for spotting this out.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8943 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:30:13 +00:00
Nicolas Pouillard 44f661bc3a ocamlbuild, bugfix: Take the union of all tags and not the last set.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8942 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:28:56 +00:00
Nicolas Pouillard c11360e33c ocamlbuild,presentation: better title.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8941 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:28:15 +00:00
Nicolas Pouillard 61675deee1 ocamlbuild,presentation: improve a sentence, hide a bad example.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8940 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:27:50 +00:00