Commit Graph

125 Commits (a982ea34b8108d08d2735257db550c98735cb242)

Author SHA1 Message Date
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
Nicolas Pouillard b20a476c2f ocamlbuild,presentation: short version
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8939 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:27:31 +00:00
Nicolas Pouillard f30c6b3372 ocamlbuild: Swap some menhir rules to prefer .mlypack over .mly.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8938 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:27:10 +00:00
Nicolas Pouillard cc98973042 ocamlbuild: Give tags to the ocamlc given to menhir.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8937 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:26:36 +00:00
Nicolas Pouillard 9e122e5bfe ocamlbuild: Add flag_and_dep and ocaml_lib now also yields deps on the library.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8936 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:26:13 +00:00
Nicolas Pouillard 19331378e1 ocamlbuild: Move some tags related functions form Rule to Command.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8935 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:25:20 +00:00
Nicolas Pouillard b78c7f0cc9 ocamlbuild: Allow '\' to escape a new line in _tags.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8934 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:24:29 +00:00
Nicolas Pouillard 21e8e9a210 ocamlbuild,doc: Update the list of modules.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8933 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-25 14:23:20 +00:00
Damien Doligez 9ea5edac9a merge changes 3.10.0 -> 3.10.1
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8768 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-01-11 16:13:18 +00:00
Nicolas Pouillard abd0efef67 ocamlbuild: digest any resource.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8723 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-18 09:03:39 +00:00
Nicolas Pouillard 653f2273b8 ocamlbuild: normalize pathname and authorize absolute pathnames as dependencies.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8717 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-18 08:58:32 +00:00
Nicolas Pouillard c0b37df251 ocamlbuild: extract exists_in_source_dir from import_in_build_dir.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8716 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-18 08:57:36 +00:00
Nicolas Pouillard 7779f740c4 [ocamlbuild] Add Pathname.normalize
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8715 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-18 08:57:05 +00:00
Nicolas Pouillard 37713379d1 [ocamlbuild] Fix filename_concat to avoid consecutive slashes.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8714 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-18 08:56:28 +00:00
Nicolas Pouillard e94095e6b0 ocamlbuild,minor,improvement: Digest commands in such a way that one don't make too big strings.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8713 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-18 08:55:48 +00:00
Nicolas Pouillard 515851721f [ocamlbuild] Add statistics about parallelism.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8712 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-12-18 08:55:04 +00:00
Nicolas Pouillard 1f943bd9ed [ocamlbuild] copy_rule now creates destinations directories if neccessary.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8680 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 17:22:53 +00:00
Nicolas Pouillard df52eaf66b [ocamlbuild] Skip empty shell commands in Ocamlbuild_executor.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8679 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 17:21:59 +00:00
Nicolas Pouillard f7a3758488 [ocamlbuild] Add the |> operator for reverse application.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8678 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 17:20:39 +00:00
Nicolas Pouillard cd7ce252c6 [ocamlbuild] Kill file_rule, please use rule + Echo instead.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8677 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 17:19:24 +00:00
Nicolas Pouillard b1b5eec9bc [ocamlbuild] No longer use file_rule but rule + Echo.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8673 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 16:19:35 +00:00
Nicolas Pouillard d6abf3177c [ocamlbuild] Add the Echo command primitive.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8672 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 16:18:49 +00:00
Nicolas Pouillard 9e216739ee [ocamlbuild] Simplify a little the execute_many protocol and then cleanup Command.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8671 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 16:11:46 +00:00
Nicolas Pouillard 187653767a [ocamlbuild] Fix the start.sh script.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8670 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 16:10:49 +00:00
Nicolas Pouillard c32b7dbb0e [ocamlbuild] ocamlbuild is no longer recursive by default.
You can still have a fine grained control using your _tags
file and the "traverse" tag.
There is no longer the "true: traverse" tag declaration by default.
To make ocamlbuild recursive use one of these:
  1) Give the -r flag to ocamlbuild.
  2) Have a _tags or myocamlbuild.ml file in your top directory.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8669 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 16:10:13 +00:00
Nicolas Pouillard 3a4356befd [ocamlbuild] Move some functions from Pathname to Resource and use Digest_cache.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8668 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 16:08:18 +00:00
Nicolas Pouillard 114db8aaea [ocamlbuild] More documentation (in particular all the PLUGIN sig is doc).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8667 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 16:06:58 +00:00
Nicolas Pouillard 68072dfe87 [ocamlbuild] Implement default tags in a simpler way.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8666 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 16:06:13 +00:00
Nicolas Pouillard f835cca505 [ocamlbuild] Move tag_any and tag_file to Configuration but still export them in Ocamlbuild_plugin.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8665 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 16:03:48 +00:00
Nicolas Pouillard ae46dfee1c [ocamlbuild] Add the Digest_cache module.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8663 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 16:02:14 +00:00
Nicolas Pouillard de914acf4b [ocamlbuild] Update the expected test output.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8662 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-28 15:52:01 +00:00