Commit Graph

134 Commits (e331dacf29c5e2af5f07ee68b1a500d5ba36457d)

Author SHA1 Message Date
Jacques Garrigue 1ce29d9bfc re-commit Leo's weak-dependencies pull request
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14755 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-05-07 00:34:20 +00:00
Jacques Garrigue 95104b3924 revert commit 14719
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14723 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-05-02 06:19:55 +00:00
Mark Shinwell 521ac0213a weak dependencies with -trans-mod (github/ocamllabs/weak-depends 45e980a,21856a7,merge)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14719 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-05-01 12:50:20 +00:00
Damien Doligez 5b8df637d2 merge branch "safe-string"
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14705 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-29 11:56:17 +00:00
Damien Doligez 2231b6496b make clean: remove *.cmt and *.cmti files
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14543 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-07 10:57:12 +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
Alain Frisch 0c4c54c990 Get rid of ocamlcomp.sh. The next step is to share all those common declarations for calling the compilers from various places.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14521 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-02 16:20:38 +00:00
Mark Shinwell 1f4de8b799 use -bin-annot when building
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14448 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-03-07 14:47:30 +00:00
Xavier Leroy 33f242aaea Reverting the elimination of the ocamlcomp*.sh scripts, namely the following commits:
14278
14277
14276
14176
14175
14173
14172
14171
14169
14168
14167
These changes need to mature on their own branch.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14329 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-11-29 13:04:38 +00:00
Alain Frisch 6873f39817 Keep attributes on value declarations in .cmi files (but clear all the location fields, except if -keep-locs is used, of course). Use this to report a warning when a value marked as [@@deprecated] is referenced (#5854)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14188 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-09-26 15:24:11 +00:00
Wojciech Meyer 241585bc83 build: replace ocamlcomp*.sh.
This script was built from ocamlcomp.sh.in through sed and is called
instead of "ocamlc" (for instance).
It makes it possible to switch from "ocamlc" to "ocamlc.opt" without
changing anything in the Makefiles, only calling sed.

I couldn't cleanly make it handle both a compiler for the target and for
the build. Instead I'm replacing it and doing as much as possible
directly in the Makefiles.
I hoped it would reduce the number of shell invocations, which would
speed things up quite a lot on Windows but I still had to have at least
one since it's not possible to update a make variable from inside a make
rule: i.e. it's not possible to do X=a, build a.opt and update X to be
a.opt.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14168 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-09-20 00:22:38 +00:00
Damien Doligez 7844495624 Merge branch 4.01 from branching point to 4.01.0+rc1
Command line used:
  svn merge --accept postpone -r 13776:14055 $REPO/version/4.01 .


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14060 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-09-04 15:12:37 +00:00
Pierre Weis 1673c623b5 Wrong quoting chase.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13718 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-05-29 18:05:44 +00:00
Damien Doligez 59371b9d75 remove TABs
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13014 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-15 18:01:26 +00:00
Damien Doligez def31744f9 remove all $Id keywords
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13013 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-15 17:50:56 +00:00
Xavier Clerc b676e19acf PR#5240: register exception printers for Unix.Unix_error and Dynlink.Error
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12996 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-10 08:54:42 +00:00
Fabrice Le Fessant d39d43e55f merge with branch bin-annot
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12516 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-30 14:52:37 +00:00
Alain Frisch dd6d8257c0 Enabled 'unused rec flag' warning.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12503 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-29 12:33:51 +00:00
Alain Frisch a0a14c08fa Enable and fix more warnings.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12498 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-29 11:47:28 +00:00
Alain Frisch 05c973e6ed Compile with warning 33, and remove unused opens.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12497 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-29 11:10:03 +00:00
Xavier Leroy ce1e74f0bd PR#5215 continued: as unique ident for dynlinked bytecode units, use MD5 of .cmo/.cma file combined with name of unit within the .cma. (Push of commit 12253.)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12278 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-26 17:44:47 +00:00
Xavier Leroy 4e5eb94ed9 PR#5215: Marshalling of closures now supported if the closures come from dynamically-loaded code.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12229 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-13 14:50:41 +00:00
Damien Doligez 5b14388ad0 refactoring the "read n bytes from a channel into a new string" idiom
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12184 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-23 19:54:44 +00:00
Damien Doligez d9eb848d86 PR#5238, PR#5277: Sys_error when getting error location
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11166 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-08-04 14:59:13 +00:00
Damien Doligez 3b507dd1aa renaming of Objective Caml to OCaml and cleanup of copyright headers
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11156 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-27 14:17:02 +00:00
Damien Doligez 90664f4ea1 uniform .ignore system
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11133 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-20 15:37:36 +00:00
Pierre Weis dc2472c8dd Ignoring compiled files.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10986 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-03-17 23:25:14 +00:00
Alain Frisch f0d3e10ef7 Simplification.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10476 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-28 15:09:22 +00:00
Alain Frisch 7e84b29e46 Remove the runtime detection of whether natdynlink works or not.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10471 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-28 10:16:31 +00:00
Alain Frisch 684a1baafe Do not install natdynlink if it does not work.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10470 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-28 10:11:54 +00:00
Alain Frisch 47dbbc7d7f Decide at config time if natdynlink is supported or not, but always compile/install dynlink.cmxa to simplify 3rd party packages. A runtime exception signals an unsupported natdynlink.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10461 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-25 10:00:39 +00:00
Xavier Leroy 2adec7d747 PR#5033: tools/objinfo made more general.
tools/dumpapprox removed, now subsumed by tools/objinfo.
Introduced asmcomp/cmx_format.mli and used consistently in asmcomp,
  tools/objinfo, and otherlibs/dynlink
Note: ocamlbuild -based build procedure not updated yet.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10424 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-19 11:29:38 +00:00
Damien Doligez 1072c2cc6d deduplicate debugger/dynlink.{ml,mli}
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10413 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-17 15:49:53 +00:00
Alain Frisch 1a0d254dbe PR #5018: Wrong exception raised by Dynlink.loadfile.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10234 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-06 20:57:11 +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
Alain Frisch af064a536f Fix bug #4606
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8993 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-08-28 22:17:51 +00:00
Alain Frisch dedf33637b Typo.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8877 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-04-22 15:04:39 +00:00
Alain Frisch 4ec2351f08 Typo.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8875 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-04-22 12:29:18 +00:00
Alain Frisch 291a4207ad Cleanup natdynlink. Automatic initialization of Dynlink (bytecode and native code). Do not use RTLD_GLOBAL for Dynlink.loadfile_private in native code.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8873 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-04-22 12:24:10 +00:00
Alain Frisch ff421e9e8b Cleanup + pass -Wl,-E to linker when linking dynlink.cma in custom mode.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8868 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-04-16 06:50:31 +00:00
Damien Doligez 16e4a68197 PR#4243 partial solution
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8615 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-22 19:01:50 +00:00
Alain Frisch 185ec52922 Remove spurious .depend
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8491 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-08 09:47:48 +00:00
Alain Frisch 3958a92c72 Merge the natdynlink branch into HEAD.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8477 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-06 15:16:56 +00:00
Nicolas Pouillard b100c43753 Add many .mllib .mlpack .clib .dlib files
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7825 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-02-07 09:52:28 +00:00
Xavier Leroy b0041ea963 Revised DLL loading: distinguish between loading for execution
(ocamlrun, dynlink, toplevel) and loading for checking the existence
of symbols (ocamlc).  This is needed for Windows with manifests and
not a bad idea for other platforms.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7656 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-09-28 21:36:38 +00:00
Xavier Leroy 403f1e1a34 Update
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7618 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-09-19 12:41:42 +00:00
Xavier Leroy 7950e128dc Remove obsolete comment
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7617 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-09-19 12:41:33 +00:00
Xavier Leroy 44669a2a47 Depollution de l'espace de nom: utiliser un -pack pour isoler les modules en provenance du compilateur
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7424 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-05-11 15:52:02 +00:00
Damien Doligez 35de2ce529 mise au carre des warnings XYZ
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6714 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-11-29 14:53:32 +00:00