remove ocamlbuild from the compiler distribution

Changes

@@ -312,17 +312,6 @@ Other libraries:
 - PR#7024: in documentation of Str regular expressions, clarify what
     "end of line" means for "^" and "$" regexps.
 
-OCamlbuild:
-- PR#6794, PR#6809: pass package-specific include flags when building C files
-  (Jérémie Dimino, request by whitequark)
-- GPR#208: add "asm" tag to ocamlbuild to enable flag -S
-  (ygrek)
-- Changed OCamlbuild's license to LGPLv2 with static linking exception.
-- GPR#219: speedup target-already-built builds
-  (ygrek)
-- PR#6605, GPR#117: use ocamlfind, if available, to discover camlp4 path
-  (Vincent Laporte)
-
 OCamldep:
 - GPR#286: add support for module aliases
   (jacques Garrigue)

INSTALL.adoc

@@ -14,12 +14,6 @@
   are all *required*.  The vendor-provided compiler, assembler and make
   have major problems.
 
-* GNU make is needed to build ocamlbuild.  If your system's default
-  make is not GNU make, you need to define the GNUMAKE environment
-  variable to the name of GNU make, typically with this command:
-
-    export GNUMAKE=gmake
-
 == INSTALLATION INSTRUCTIONS
 
 1. Configure the system. From the top directory, do:
@@ -121,7 +115,8 @@ The `configure` script accepts the following options:
         Do not build ocamldoc.
 
 -no-ocamlbuild::
-        Do not build ocamlbuild.
+        Deprecated since 4.03.0, as ocamlbuild is now distributed separately
+        from the compiler distribution.
 
 -no-graph::
         Do not compile the Graphics library.

LICENSE

@@ -1,7 +1,7 @@
 In the following, "the Library" refers to all files marked "Copyright
 INRIA" in the following directories and their sub-directories:
 
-  asmrun, byterun, config, ocamlbuild, otherlibs, stdlib, win32caml
+  asmrun, byterun, config, otherlibs, stdlib, win32caml
 
 and "the Compiler" refers to all files marked "Copyright INRIA" in the
 following directories and their sub-directories:

Makefile

@@ -31,7 +31,7 @@ all:
 	$(MAKE) runtime
 	$(MAKE) coreall
 	$(MAKE) ocaml
-	$(MAKE) otherlibraries $(OCAMLBUILDBYTE) $(WITH_DEBUGGER) \
+	$(MAKE) otherlibraries $(WITH_DEBUGGER) \
 	  $(WITH_OCAMLDOC)
 
 # Compile everything the first time
@@ -164,7 +164,7 @@ opt:
 	$(MAKE) runtimeopt
 	$(MAKE) ocamlopt
 	$(MAKE) libraryopt
-	$(MAKE) otherlibrariesopt ocamltoolsopt $(OCAMLBUILDNATIVE)
+	$(MAKE) otherlibrariesopt ocamltoolsopt
 
 # Native-code versions of the tools
 opt.opt:
@@ -174,12 +174,10 @@ opt.opt:
 	$(MAKE) ocaml
 	$(MAKE) opt-core
 	$(MAKE) ocamlc.opt
-	$(MAKE) otherlibraries $(WITH_DEBUGGER) $(WITH_OCAMLDOC) \
-	        $(OCAMLBUILDBYTE)
+	$(MAKE) otherlibraries $(WITH_DEBUGGER) $(WITH_OCAMLDOC)
 	$(MAKE) ocamlopt.opt
 	$(MAKE) otherlibrariesopt
-	$(MAKE) ocamllex.opt ocamltoolsopt ocamltoolsopt.opt $(OCAMLDOC_OPT) \
-	        $(OCAMLBUILDNATIVE)
+	$(MAKE) ocamllex.opt ocamltoolsopt ocamltoolsopt.opt $(OCAMLDOC_OPT)
 
 base.opt:
 	$(MAKE) checkstack
@@ -188,8 +186,7 @@ base.opt:
 	$(MAKE) ocaml
 	$(MAKE) opt-core
 	$(MAKE) ocamlc.opt
-	$(MAKE) otherlibraries $(OCAMLBUILDBYTE) $(WITH_DEBUGGER) \
-	  $(WITH_OCAMLDOC)
+	$(MAKE) otherlibraries $(WITH_DEBUGGER) $(WITH_OCAMLDOC)
 	$(MAKE) ocamlopt.opt
 	$(MAKE) otherlibrariesopt
 
@@ -242,8 +239,6 @@ install:
 	if test -n "$(WITH_OCAMLDOC)"; then (cd ocamldoc; $(MAKE) install); else :; fi
 	if test -n "$(WITH_DEBUGGER)"; then (cd debugger; $(MAKE) install); \
 	   else :; fi
-	if test -n "$(WITH_OCAMLBUILD)"; then (cd ocamlbuild; $(MAKE) install); \
-	   else :; fi
 	cp config/Makefile $(INSTALL_LIBDIR)/Makefile.config
 	if test -f ocamlopt; then $(MAKE) installopt; else :; fi
 
@@ -260,8 +255,6 @@ installopt:
 	cp compilerlibs/ocamloptcomp.cma $(OPTSTART) $(INSTALL_COMPLIBDIR)
 	if test -n "$(WITH_OCAMLDOC)"; then (cd ocamldoc; $(MAKE) installopt); \
 		else :; fi
-	if test -n "$(WITH_OCAMLBUILD)"; then (cd ocamlbuild; $(MAKE) installopt); \
-	   else :; fi
 	for i in $(OTHERLIBRARIES); \
 	  do (cd otherlibs/$$i; $(MAKE) installopt) || exit $$?; done
 	if test -f ocamlopt.opt ; then $(MAKE) installoptopt; fi
@@ -733,20 +726,6 @@ partialclean::
 alldepend::
 	cd debugger; $(MAKE) depend
 
-# Ocamlbuild
-
-ocamlbuild.byte: ocamlc otherlibraries
-	cd ocamlbuild && $(MAKE) all
-
-ocamlbuild.native: ocamlopt otherlibrariesopt
-	cd ocamlbuild && $(MAKE) allopt
-
-partialclean::
-	cd ocamlbuild && $(MAKE) clean
-
-alldepend::
-	cd ocamlbuild && $(MAKE) depend
-
 # Check that the stack limit is reasonable.
 
 checkstack:
@@ -812,7 +791,7 @@ distclean:
 .PHONY: compare core coreall
 .PHONY: coreboot defaultentry depend distclean install installopt
 .PHONY: library library-cross libraryopt
-.PHONY: ocamlbuild.byte ocamlbuild.native ocamldebugger ocamldoc
+.PHONY: ocamldebugger ocamldoc
 .PHONY: ocamldoc.opt ocamllex ocamllex.opt ocamltools ocamltoolsopt
 .PHONY: ocamltoolsopt.opt ocamlyacc opt-core opt opt.opt otherlibraries
 .PHONY: otherlibrariesopt package-macosx promote promote-cross

Makefile.nt

@@ -62,8 +62,7 @@ flexlink.opt:
 
 # Recompile the system using the bootstrap compiler
 all: runtime ocamlc ocamllex ocamlyacc ocamltools library ocaml \
-  otherlibraries $(OCAMLBUILDBYTE) $(WITH_DEBUGGER) \
-  $(WITH_OCAMLDOC)
+  otherlibraries $(WITH_DEBUGGER) $(WITH_OCAMLDOC)
 
 # The compilation of ocaml will fail if the runtime has changed.
 # Never mind, just do make bootstrap to reach fixpoint again.
@@ -170,8 +169,8 @@ opt:
 # Native-code versions of the tools
 # If the submodule is initialised, then opt.opt will build a native flexlink
 opt.opt: core opt-core ocamlc.opt all ocamlopt.opt ocamllex.opt \
-         ocamltoolsopt ocamltoolsopt.opt otherlibrariesopt $(OCAMLBUILDNATIVE) \
-         $(OCAMLDOC_OPT) $(if $(wildcard flexdll/Makefile),flexlink.opt)
+         ocamltoolsopt ocamltoolsopt.opt otherlibrariesopt $(OCAMLDOC_OPT) \
+         $(if $(wildcard flexdll/Makefile),flexlink.opt)
 
 # Complete build using fast compilers
 world.opt: coldstart opt.opt
@@ -219,8 +218,6 @@ installbyt:
 	  else :; fi
 	if test -n "$(WITH_DEBUGGER)"; then (cd debugger; $(MAKEREC) install); \
 	   else :; fi
-	if test -n "$(WITH_OCAMLBUILD)"; then (cd ocamlbuild; $(MAKE) install); \
-	   else :; fi
 	if test -n "$(FLEXDLL_SUBMODULE_PRESENT)"; then $(MAKEREC) install-flexdll; \
 	   else :; fi
 	cp config/Makefile $(INSTALL_LIBDIR)/Makefile.config
@@ -247,8 +244,6 @@ installopt:
 	cp asmcomp/*.cmi asmcomp/*.cmt asmcomp/*.cmti $(INSTALL_COMPLIBDIR)
 	cp compilerlibs/ocamloptcomp.cma $(OPTSTART) $(INSTALL_COMPLIBDIR)
 	if test -n "$(WITH_OCAMLDOC)"; then (cd ocamldoc; $(MAKEREC) installopt); fi
-	if test -n "$(WITH_OCAMLBUILD)"; then (cd ocamlbuild; $(MAKE) installopt); \
-	   else :; fi
 	for i in $(OTHERLIBRARIES); do \
 	  $(MAKEREC) -C otherlibs/$$i installopt || exit $$?; \
 	done
@@ -661,20 +656,6 @@ partialclean::
 alldepend::
 	cd debugger; $(MAKEREC) depend
 
-# Ocamlbuild
-
-ocamlbuild.byte: ocamlc otherlibraries
-	cd ocamlbuild && $(MAKE) all
-
-ocamlbuild.native: ocamlopt otherlibrariesopt
-	cd ocamlbuild && $(if $(FLEXDLL_SUBMODULE_PRESENT),OCAML_FLEXLINK="../boot/ocamlrun ../flexdll/flexlink.exe") $(MAKE) allopt
-
-partialclean::
-	cd ocamlbuild && $(MAKE) clean
-
-alldepend::
-	cd ocamlbuild && $(MAKE) depend
-
 # Make clean in the test suite
 
 clean::
@@ -728,8 +709,8 @@ distclean:
 .PHONY: partialclean beforedepend alldepend cleanboot coldstart
 .PHONY: compare core coreall
 .PHONY: coreboot defaultentry depend distclean install installopt
-.PHONY: library library-cross libraryopt ocamlbuild-mixed-boot
-.PHONY: ocamlbuild.byte ocamlbuild.native ocamldebugger ocamldoc
+.PHONY: library library-cross libraryopt
+.PHONY: ocamldebugger ocamldoc
 .PHONY: ocamldoc.opt ocamllex ocamllex.opt ocamltools ocamltoolsopt
 .PHONY: ocamltoolsopt.opt ocamlyacc opt-core opt opt.opt otherlibraries
 .PHONY: otherlibrariesopt promote promote-cross

config/Makefile-templ

@@ -72,10 +72,6 @@ SHARPBANGSCRIPTS=true
 # Under FreeBSD:
 #CPP=cpp -P
 
-### Magic declarations for ocamlbuild -- leave unchanged
-#ml let syslib x = "-l"^x;;
-#ml let mklib out files opts = Printf.sprintf "%sar rc %s %s %s; %sranlib %s" toolpref out opts files toolpref out;;
-
 ### How to invoke ranlib
 RANLIB=ranlib
 RANLIBCMD=ranlib

config/Makefile.mingw

@@ -20,9 +20,6 @@ PREFIX=C:/ocamlmgw
 ### Remove this to disable compiling ocamldebug
 WITH_DEBUGGER=ocamldebugger
 
-### Remove this to disable compiling ocamlbuild
-WITH_OCAMLBUILD=ocamlbuild
-
 ### Remove this to disable compiling ocamldoc
 WITH_OCAMLDOC=ocamldoc
 

config/Makefile.mingw64

@@ -20,9 +20,6 @@ PREFIX=C:/ocamlmgw64
 ### Remove this to disable compiling ocamldebug
 WITH_DEBUGGER=ocamldebugger
 
-### Remove this to disable compiling ocamlbuild
-WITH_OCAMLBUILD=ocamlbuild
-
 ### Remove this to disable compiling ocamldoc
 WITH_OCAMLDOC=ocamldoc
 

config/Makefile.msvc

@@ -166,9 +166,6 @@ PACKLD=link -lib -nologo -out:# there must be no space after this '-out:'
 ### Clear this to disable compiling ocamldebug
 WITH_DEBUGGER=ocamldebugger
 
-### Clear this to disable compiling ocamlbuild
-WITH_OCAMLBUILD=ocamlbuild
-
 ### Clear this to disable compiling ocamldoc
 WITH_OCAMLDOC=ocamldoc
 

config/Makefile.msvc64

@@ -170,9 +170,6 @@ PACKLD=link -lib -nologo -machine:AMD64 -out:# must have no space after '-out:'
 ### Clear this to disable compiling ocamldebug
 WITH_DEBUGGER=ocamldebugger
 
-### Clear this to disable compiling ocamlbuild
-WITH_OCAMLBUILD=ocamlbuild
-
 ### Clear this to disable compiling ocamldoc
 WITH_OCAMLDOC=ocamldoc
 

configure

@@ -45,7 +45,6 @@ with_sharedlibs=yes
 partialld="ld -r"
 with_debugger=ocamldebugger
 with_ocamldoc=ocamldoc
-with_ocamlbuild=ocamlbuild
 with_frame_pointers=false
 no_naked_pointers=false
 native_compiler=true
@@ -155,7 +154,7 @@ while : ; do
     -no-ocamldoc|--no-ocamldoc)
         with_ocamldoc="";;
     -no-ocamlbuild|--no-ocamlbuild)
-        with_ocamlbuild="";;
+        ;; # ignored for backward compatibility
     -with-frame-pointers|--with-frame-pointers)
         with_frame_pointers=true;;
     -no-naked-pointers|--no-naked-pointers)
@@ -1802,7 +1801,6 @@ fi
 echo "RUNTIMEI=${with_instrumented_runtime}" >>Makefile
 echo "WITH_DEBUGGER=${with_debugger}" >>Makefile
 echo "WITH_OCAMLDOC=${with_ocamldoc}" >>Makefile
-echo "WITH_OCAMLBUILD=${with_ocamlbuild}" >>Makefile
 echo "ASM_CFI_SUPPORTED=$asm_cfi_supported" >> Makefile
 echo "WITH_FRAME_POINTERS=$with_frame_pointers" >> Makefile
 echo "TARGET=$target" >> Makefile