summaryrefslogtreecommitdiffstats
path: root/ocamldoc/Makefile.nt
AgeCommit message (Collapse)Author
2015-02-08debugger, ocamlbuild, ocamldoc: separate their build from the compiler's.HEADmasterAdrien Nader
In other words: "make world" doesn't build the aforementioned tools anymore and they need to be configured and built separately. They are still in the same source tree. At first sight this should lead to more work but there are _several_ reasons for such a split. * It dissociates the builds and therefore the breakage when doing changes in the build system. * It makes changing one of them simpler. * It simplifies the Makefile files and removes some needs for the UNIX_OR_WIN32 variable. * It removes the Makefile.nt files and enables the build of the manpages on Windows too. * It builds these tools using the .opt variants when possible. This doesn't save that much time but it's nice nonetheless. * It's simpler to package for distributions which already split these tools to their own packages. * It simplifies cross-compilation by reducing the scope of the changes needed (i.e. I hope there won't be a need for more changes in the build systems of these tools). * It refers less to boot/ and should make bootstrapping at least a bit simpler (I can't tell how much but in any case it's not negative). As for the negative aspects: * Possibly more steps for compiler hackers in the "hot path". * A hand-written "configure_tool" script which creates a "Makefile.local" file which is include'ed from the Makefile files and which defines the invocation of the compiler and of other tools. After these changes, there are two ways to build the tools: whether OCaml is installed system-wide or not (i.e. "uninstalled" [ I'm not to be blamed for this terminology ]). If the compiler has been installed (typical for packagers): ./configure_tool debugger make -C debugger all If the compiler has not been installed (probably typical for compiler devs even though I'm not sure most don't disable the build of the tools when doing their development): UNINSTALLED_OCAML_DESTDIR=$(pwd)/lapin UNINSTALLED_OCAML_PREFIX=/usr ./configure_tool debugger make -C debugger all In the example directly above, UNINSTALLED_OCAML_PREFIX defaults to "/usr/local" (the default for the compiler build too) and must match. UNINSTALLED_OCAML_DESTDIR has no default and must be the same as the value used for DESTDIR when running "make install DESTDIR=$(pwd)/lapin" for the compiler. Providing an absolute path, while not mandatory, is saner. Comments are welcome on how to make the whole process more handy for you (yes, "you", the reader, whoever you are).
2014-08-22merge changes from branch 4.02 from branching (rev 14852) to 4.02.0+rc1 (rev ↵Damien Doligez
15121) git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15125 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-05-04PR#5584: merge open extensible types, extension-patch-4.0.2Jacques Garrigue
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14737 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-07PR#6358: obey DESTDIR in install targetsGabriel Scherer
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14536 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-02Get rid of ocamlcomp.sh. The next step is to share all those common ↵Alain Frisch
declarations for calling the compilers from various places. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14521 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-11-29Reverting the elimination of the ocamlcomp*.sh scripts, namely the following ↵Xavier Leroy
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-10-02#6195: use ocamlcommon.cma to link ocamldoc, instead of explicit list of ↵Alain Frisch
compiler modules. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14209 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-09-27Fix.Alain Frisch
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14193 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-09-20build: replace ocamlcomp*.sh.Wojciech Meyer
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-04-05Fix for Win32.Alain Frisch
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13487 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-15remove all $Id keywordsDamien Doligez
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13013 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-08-01fix formatting of copyright headersDamien Doligez
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12803 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-12Fix problem of size of bin-annot filesFabrice Le Fessant
- Reset most of the fields of Env.t when saving bin-annot files - Move debugger/envaux.ml to typing/, and add a function to recover environements from bin-annot files. - Move tools/typedtreeIter.ml to typing/ - Move the code of typing/typedtreeMap.ml from cmt_format.ml git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12702 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-10PR#5218: use $(MAKE) instead of "make" in MakefilesDamien Doligez
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12694 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-06-13Reduce diff between Makefile and Makefile.nt, probably removing a few bugs. ↵Alain Frisch
Generators are still missing for Windows. We should really factorize common parts of such makefiles... git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12601 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-06-13Adapt ocamldoc for -ppx. Also reuse some code from Pparse instead of ↵Alain Frisch
duplicating it. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12598 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-30merge with branch bin-annotFabrice Le Fessant
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12516 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-18Unused_var has been removed.Alain Frisch
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12052 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-12Fix for Windows.Alain Frisch
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11299 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-09-15Jonathan's updates to the Windows/Mingw portXavier Leroy
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11197 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-27renaming of Objective Caml to OCaml and cleanup of copyright headersDamien Doligez
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11156 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-28add world.opt targetJacques Garrigue
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10472 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-22clean up spaces and tabsDamien Doligez
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9547 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-07-20merge changes from ocaml3111rc0 to ocaml3111Damien Doligez
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9319 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-04-09fix compilatin of ocamldoc for NT with no odoc_opt.ml any moreMaxence Guesdon
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9228 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-06Merge the natdynlink branch into HEAD.Alain Frisch
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8477 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-09-20fusion des changements 3.09.2 -> 3.09.3Damien Doligez
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7619 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-04-23no need to Dynlink.add_available_units any moreMaxence Guesdon
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6252 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-03-22removed unused Makefile variableMaxence Guesdon
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6164 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-03-22odoc_cross.ml: use a Map to associate a complete name toMaxence Guesdon
the known elements with this name, instead of searching each time through the whole list of modules -> a gain of more than 90% in speed for cross-referecing (Odoc_cross.associate) git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6158 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-03-05new module odoc_print, will work when Format.pp_print_flush is fixedMaxence Guesdon
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6135 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-01-28create ocamldoc/custom when installingMaxence Guesdon
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6092 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-01-28handling a path to load custom generatorsMaxence Guesdon
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6087 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-08-29Installer ocamldoc.opt.exeXavier Leroy
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5809 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-07-08installation des man pages en man3, ne plus installer ocamldoc.sty, clean ↵Maxence Guesdon
supprime stdlib_man git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5671 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-07-04Don't overwrite HTML and LateX style files, generate style file for LaTeXMaxence Guesdon
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5656 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-05-12MAJ ajout StypesXavier Leroy
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5552 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-03-24MAJXavier Leroy
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5452 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-10-01ajout -linkall et Nativeint dans les crc pour le chargement dynamiqueMaxence Guesdon
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5150 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-08-19Revu generation du .depend (ne pas mettre de dependances sur otherlibs, cela ↵Xavier Leroy
pose probleme sous Windows) git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5107 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-08-13ne plus installer odoc_args.mli + ajout commentaireMaxence Guesdon
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5099 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-07-23ajout installation de odoc_args.mliMaxence Guesdon
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5023 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-07-09ajout odoc_text à la liste de modules dispo pour le dynlinkMaxence Guesdon
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4985 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-06-07Portage Mingw et revision du portage Win32/MSVCXavier Leroy
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4899 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-04-30changement de Oo en CamlinternalOO pour odoc_crcMaxence Guesdon
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4763 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-04-25correction pour utiliser camlrun pour lancer ocamldoc avant l'installationMaxence Guesdon
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4741 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-04-18use ../ocamlcJacques Garrigue
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4693 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-04-15Adaptation WindowsXavier Leroy
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4665 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-04-09Enlèvement de Graphics dans odoc_crc.ml car il pose problème sous cygwin ↵Maxence Guesdon
acr il n'existe pas git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4625 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-04-08remplacement du générateur iso par le générateur texiMaxence Guesdon
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4604 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02