[WIP] new library management

INSTALL

@@ -61,11 +61,6 @@ options:
 		because #use "topfind" will not work when this option
 		is enabled.)
 
-	-with-toolbox
-		also compile and install the "toolbox". This requires
-		that labltk is available. The toolbox contains the
-		"make_wizard" to easily create findlib-enabled Makefiles.
-
 	-cygpath
 		Cygwin environment only: If "ocamlc -where" does not
 		output a Unix-style path, this option can be used

Makefile.config.pattern

@@ -50,10 +50,9 @@ EXEC_SUFFIX=
 LIB_SUFFIX=.a
 
 #----------------------------------------------------------------------
-# Which parts are to be built: findlib, findlib-toolbox (space-separated
-# list)
+# Which parts are to be built: findlib,  (space-separated list)
 #----------------------------------------------------------------------
-PARTS=findlib findlib-toolbox
+PARTS=findlib
 
 #----------------------------------------------------------------------
 # Whether the "topfind" script is installed in $(OCAML_CORE_STDLIB):

TODO

@@ -1,6 +1,18 @@
-Document archive(plugin)
-
-Suggestion (gasche): -show-command only outputs the constructed
-command, but does not run it.
-
-Get ready for -ppx
+ - ocamlfind remove
+ - lean packages: support sub packages properly (also when there is a META file).
+     descend into subdirs also for lean_with_META
+     install: create subdirs as needed
+ - support that ocamlopt is not present
+ - support old compilers without cmo/cmx parsing helpers
+ - support "unparsed bare package" mode
+     These packages are just forwarded to the compiler.
+     Also use this for dynlink.
+ - fix generation of META for built-in libs like unix
+     No longer m4
+     Turn them into lean packages
+ - Support ppx
+ - support Dune's virtual packages
+ - clean up the version of OCAMLPATH passed to the compiler
+ - enforce DLL naming convention for lean pkgs
+ - Support dynload
+ - Documentation

configure

@@ -114,7 +114,6 @@ ocamlfind_bin=""
 ocamlfind_man=""
 ocaml_sitelib=""
 ocamlfind_config=""
-with_toolbox=0
 with_topfind=1
 with_camlp4=1
 custom=-custom
@@ -144,9 +143,6 @@ while [ "$#" != "0" ]; do
 	-system) system=$2
 	         shift 2
 		 ;;
-	-with-toolbox) with_toolbox=1
-	         shift
-		 ;;
 	-no-topfind) with_topfind=0
 	         shift
 		 ;;
@@ -164,7 +160,6 @@ while [ "$#" != "0" ]; do
                   echo "  -config path         set the location of the configuration file" 1>&2
                   echo "  -no-custom           don't link in custom runtime mode" 1>&2
 		  echo "  -system <systype>    override system type (esp. mingw and win32)" 1>&2
-		  echo "  -with-toolbox        also build the toolbox" 1>&2
 		  echo "  -no-topfind          don't install topfind script into stdlib directory" 1>&2
 		  echo "  -no-camlp4           don't install the camlp4 META file" 1>&2
 		  exit
@@ -448,9 +443,6 @@ if [ -f "${ocaml_core_stdlib}/labltk/labltk.cma" ]; then
 else
     llabltk=''
     echo "labltk: not present"
-    if [ $with_toolbox -gt 0 ]; then
-	echo "Sorry, toolbox requires labltk - omitting toolbox."
-    fi
     with_toolbox=0
 fi
 
@@ -614,7 +606,7 @@ printf "Detecting compiler arguments: "
 ( cd tools/extract_args && make ) >ocargs.log 2>&1
 if [ "$?" -eq 0 ]; then
     printf "(extractor built) "
-    tools/extract_args/extract_args -o src/findlib/ocaml_args.ml ocamlc ocamlcp ocamloptp ocamlmklib ocamlmktop ocamlopt ocamldep ocamldoc >>ocargs.log 2>&1
+    tools/extract_args/extract_args -o src/findlib/fl_ocaml_args.ml ocamlc ocamlcp ocamloptp ocamlmklib ocamlmktop ocamlopt ocamldep ocamldoc >>ocargs.log 2>&1
     # ocamlbrowser does not work!
     if [ $? -eq 0 ]; then
 	echo "ok"
@@ -631,9 +623,6 @@ fi
 # Write Makefile.config
 
 parts="findlib"
-if [ $with_toolbox -gt 0 ]; then
-    parts="$parts findlib-toolbox"
-fi
 if [ $cbytes -gt 0 ]; then
     parts="$parts bytes"
 fi
@@ -696,12 +685,6 @@ else
     echo "Topfind ppxopt support:    no"
 fi
 
-if [ $with_toolbox -gt 0 ]; then
-    echo "Toolbox:                   yes"
-else
-    echo "Toolbox:                   no"
-fi
-
 if [ -z "$custom" ]; then
     echo "Link custom runtime:       no"
 else

doc/README.xml

@@ -109,6 +109,14 @@ configuration files, and library routines in detail.</p>
     <title>List of Changes</title>
     <ul>
 
+      <li>
+        <p><em>2.0+DEV:</em> Adapted to automatic library linking, as
+        available in ocaml-XXX. Now, using META files is optional if
+        certain conventions are followed. This implies the following
+        list of detailed changes:</p>
+        <p>Replaced Findlib.package_meta by Findlib.package_path.</p>
+      </li>
+
     <li>
       <p><em>1.8.1:</em> Adapted to upcoming ocaml-4.09.</p>
       <p>New API Findlib.list_packages' can specify a package prefix.</p>

findlib.files

@@ -122,6 +122,7 @@ f src/findlib/topfind.ml.in
 x src/findlib/fl_meta.ml
 x src/findlib/findlib_config.ml
 x src/findlib/ocaml_args.ml
+x src/findlib/fl_ocaml_args.ml
 x src/findlib/topfind.ml
 p src/findlib/.*\.ml
 p src/findlib/.*\.mli