Permalink
Browse files

Big refactoring work.

The API is now much cleaner. There are still some work to do to clean-up OpamClient.ml, this can be fixed later.
  • Loading branch information...
samoht committed Oct 4, 2012
1 parent d8ae7ec commit aa67aa9b540608d78b88470543e7a0dacc59a695
Showing 336 changed files with 18,946 additions and 15,871 deletions.
View
@@ -1,7 +1,7 @@
include Makefile.config
LOCAL_OCPBUILD=./ocp-build/ocp-build
-OCPBUILD ?= $(LOCAL_OCPBUILD)
+OCPBUILD ?= $(LOCAL_OCPBUILD) # /usr/local/bin/ocp-build
SRC_EXT=src_ext
TARGETS = opam opam-mk-repo
@@ -72,8 +72,7 @@ uninstall:
rm -f $(mandir)/man1/opam*
LIB = opam-lib
-CMI = opamFile path file_format process globals repositories lexer run\
- linelexer types parallel utils parser
+CMI = $(shell ls src/*.mli)
_FILES= $(LIB:%=%.a) $(LIB:%=%.cma) $(LIB:%=%.cmxa)\
$(CMI:%=%.cmi)
FILES = $(_FILES:%=_obuild/opam-lib/%)
@@ -88,7 +87,7 @@ doc: compile
mkdir -p doc/html/
ocamldoc \
-I _obuild/opam-lib -I _obuild/cudf -I _obuild/dose \
- -I _obuild/bat -I _obuild/unix -I _obuild/extlib \
+ -I _obuild/re -I _obuild/unix -I _obuild/extlib \
-I _obuild/arg -I _obuild/graph \
src/*.mli -html -d doc/html/
$(MAKE) -C doc/man-src
View
@@ -3718,7 +3718,7 @@ echo "$as_me: error: Your version of OCaml: $OCAMLVERSION is not supported" >&2;
fi
-ac_config_files="$ac_config_files Makefile.config src/globals.ml"
+ac_config_files="$ac_config_files Makefile.config src/opamGlobals.ml"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -4288,7 +4288,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
- "src/globals.ml") CONFIG_FILES="$CONFIG_FILES src/globals.ml" ;;
+ "src/opamGlobals.ml") CONFIG_FILES="$CONFIG_FILES src/opamGlobals.ml" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
View
@@ -22,7 +22,7 @@ fi
AC_CONFIG_FILES(
Makefile.config
- src/globals.ml
+ src/opamGlobals.ml
)
AC_OUTPUT
View
@@ -1,57 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<link rel="stylesheet" href="style.css" type="text/css">
-<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type">
-<link rel="Start" href="index.html">
-<link rel="previous" href="File.Descr.html">
-<link rel="next" href="File.Installed.html">
-<link rel="Up" href="File.html">
-<link title="Index of types" rel=Appendix href="index_types.html">
-<link title="Index of exceptions" rel=Appendix href="index_exceptions.html">
-<link title="Index of values" rel=Appendix href="index_values.html">
-<link title="Index of modules" rel=Appendix href="index_modules.html">
-<link title="Index of module types" rel=Appendix href="index_module_types.html">
-<link title="Client" rel="Chapter" href="Client.html">
-<link title="File" rel="Chapter" href="File.html">
-<link title="File_format" rel="Chapter" href="File_format.html">
-<link title="Parallel" rel="Chapter" href="Parallel.html">
-<link title="Path" rel="Chapter" href="Path.html">
-<link title="Process" rel="Chapter" href="Process.html">
-<link title="Repositories" rel="Chapter" href="Repositories.html">
-<link title="Run" rel="Chapter" href="Run.html">
-<link title="Solver" rel="Chapter" href="Solver.html">
-<link title="Types" rel="Chapter" href="Types.html"><title>File.Aliases</title>
-</head>
-<body>
-<div class="navbar"><a class="pre" href="File.Descr.html" title="File.Descr">Previous</a>
-&nbsp;<a class="up" href="File.html" title="File">Up</a>
-&nbsp;<a class="post" href="File.Installed.html" title="File.Installed">Next</a>
-</div>
-<h1>Module <a href="type_File.Aliases.html">File.Aliases</a></h1>
-<pre><span class="keyword">module</span> Aliases: <code class="type"><a href="File.IO_FILE.html">IO_FILE</a></code><code class="type"> with type t = (Alias.t * OCaml_V.t) list</code></pre>Compiler aliases: <code class="code">$opam/aliases</code><br>
-<hr width="100%">
-<pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre>
-<div class="info">
-File contents<br>
-</div>
-
-<pre><span id="VALempty"><span class="keyword">val</span> empty</span> : <code class="type"><a href="File.IO_FILE.html#TYPEt">t</a></code></pre><div class="info">
-Empty file<br>
-</div>
-<pre><span id="VALwrite"><span class="keyword">val</span> write</span> : <code class="type"><a href="Types.html#TYPEfilename">Types.filename</a> -> <a href="File.IO_FILE.html#TYPEt">t</a> -> unit</code></pre><div class="info">
-Write some contents to a file<br>
-</div>
-<pre><span id="VALread"><span class="keyword">val</span> read</span> : <code class="type"><a href="Types.html#TYPEfilename">Types.filename</a> -> <a href="File.IO_FILE.html#TYPEt">t</a></code></pre><div class="info">
-Read file contents. Raise an error if the file does not exist.<br>
-</div>
-<pre><span id="VALsafe_read"><span class="keyword">val</span> safe_read</span> : <code class="type"><a href="Types.html#TYPEfilename">Types.filename</a> -> <a href="File.IO_FILE.html#TYPEt">t</a></code></pre><div class="info">
-Read file contents. Return <code class="code">empty</code> if the file does not exist.<br>
-</div>
-<pre><span id="VALto_raw"><span class="keyword">val</span> to_raw</span> : <code class="type"><a href="File.IO_FILE.html#TYPEt">t</a> -> <a href="Types.html#TYPEraw">Types.raw</a></code></pre><div class="info">
-Return the file contents<br>
-</div>
-<pre><span id="VALof_raw"><span class="keyword">val</span> of_raw</span> : <code class="type"><a href="Types.html#TYPEraw">Types.raw</a> -> <a href="File.IO_FILE.html#TYPEt">t</a></code></pre><div class="info">
-Convert a raw string into a file<br>
-</div>
-</body></html>
View
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<link rel="stylesheet" href="style.css" type="text/css">
-<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type">
-<link rel="Start" href="index.html">
-<link rel="next" href="File.OPAM.html">
-<link rel="Up" href="File.html">
-<link title="Index of types" rel=Appendix href="index_types.html">
-<link title="Index of exceptions" rel=Appendix href="index_exceptions.html">
-<link title="Index of values" rel=Appendix href="index_values.html">
-<link title="Index of modules" rel=Appendix href="index_modules.html">
-<link title="Index of module types" rel=Appendix href="index_module_types.html">
-<link title="Client" rel="Chapter" href="Client.html">
-<link title="File" rel="Chapter" href="File.html">
-<link title="File_format" rel="Chapter" href="File_format.html">
-<link title="Parallel" rel="Chapter" href="Parallel.html">
-<link title="Path" rel="Chapter" href="Path.html">
-<link title="Process" rel="Chapter" href="Process.html">
-<link title="Repositories" rel="Chapter" href="Repositories.html">
-<link title="Run" rel="Chapter" href="Run.html">
-<link title="Solver" rel="Chapter" href="Solver.html">
-<link title="Types" rel="Chapter" href="Types.html"><title>File.Config</title>
-</head>
-<body>
-<div class="navbar">&nbsp;<a class="up" href="File.html" title="File">Up</a>
-&nbsp;<a class="post" href="File.OPAM.html" title="File.OPAM">Next</a>
-</div>
-<h1>Module <a href="type_File.Config.html">File.Config</a></h1>
-<pre><span class="keyword">module</span> Config: <code class="code">sig</code> <a href="File.Config.html">..</a> <code class="code">end</code></pre>Configuration file: <code class="code">$opam/config</code><br>
-<hr width="100%">
-<pre><span class="keyword">include</span> <a href="File.IO_FILE.html">File.IO_FILE</a></pre>
-<pre><span id="VALcreate"><span class="keyword">val</span> create</span> : <code class="type">Types.OPAM_V.t -> <a href="Types.html#TYPErepository">Types.repository</a> list -> int -> t</code></pre><div class="info">
-Creation<br>
-</div>
-<pre><span id="VALwith_ocaml_version"><span class="keyword">val</span> with_ocaml_version</span> : <code class="type">t -> Types.Alias.t -> t</code></pre><div class="info">
-OCaml alias updates<br>
-</div>
-<pre><span id="VALwith_repositories"><span class="keyword">val</span> with_repositories</span> : <code class="type">t -> <a href="Types.html#TYPErepository">Types.repository</a> list -> t</code></pre><div class="info">
-Repository updates<br>
-</div>
-<pre><span id="VALwith_system_ocaml_version"><span class="keyword">val</span> with_system_ocaml_version</span> : <code class="type">t -> Types.OCaml_V.t -> t</code></pre><div class="info">
-system-wide's OCaml version updates<br>
-</div>
-<pre><span id="VALopam_version"><span class="keyword">val</span> opam_version</span> : <code class="type">t -> Types.OPAM_V.t</code></pre><div class="info">
-Return the OPAM version<br>
-</div>
-<pre><span id="VALrepositories"><span class="keyword">val</span> repositories</span> : <code class="type">t -> <a href="Types.html#TYPErepository">Types.repository</a> list</code></pre><div class="info">
-Return the list of repository<br>
-</div>
-<pre><span id="VALocaml_version"><span class="keyword">val</span> ocaml_version</span> : <code class="type">t -> Types.Alias.t</code></pre><div class="info">
-Return the OCaml alias<br>
-</div>
-<pre><span id="VALsystem_ocaml_version"><span class="keyword">val</span> system_ocaml_version</span> : <code class="type">t -> Types.OCaml_V.t option</code></pre><div class="info">
-Return the system's OCaml version<br>
-</div>
-<pre><span id="VALcores"><span class="keyword">val</span> cores</span> : <code class="type">t -> int</code></pre><div class="info">
-Return the number of cores<br>
-</div>
-</body></html>
View
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<link rel="stylesheet" href="style.css" type="text/css">
-<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type">
-<link rel="Start" href="index.html">
-<link rel="previous" href="File.OPAM.html">
-<link rel="next" href="File.Aliases.html">
-<link rel="Up" href="File.html">
-<link title="Index of types" rel=Appendix href="index_types.html">
-<link title="Index of exceptions" rel=Appendix href="index_exceptions.html">
-<link title="Index of values" rel=Appendix href="index_values.html">
-<link title="Index of modules" rel=Appendix href="index_modules.html">
-<link title="Index of module types" rel=Appendix href="index_module_types.html">
-<link title="Client" rel="Chapter" href="Client.html">
-<link title="File" rel="Chapter" href="File.html">
-<link title="File_format" rel="Chapter" href="File_format.html">
-<link title="Parallel" rel="Chapter" href="Parallel.html">
-<link title="Path" rel="Chapter" href="Path.html">
-<link title="Process" rel="Chapter" href="Process.html">
-<link title="Repositories" rel="Chapter" href="Repositories.html">
-<link title="Run" rel="Chapter" href="Run.html">
-<link title="Solver" rel="Chapter" href="Solver.html">
-<link title="Types" rel="Chapter" href="Types.html"><title>File.Descr</title>
-</head>
-<body>
-<div class="navbar"><a class="pre" href="File.OPAM.html" title="File.OPAM">Previous</a>
-&nbsp;<a class="up" href="File.html" title="File">Up</a>
-&nbsp;<a class="post" href="File.Aliases.html" title="File.Aliases">Next</a>
-</div>
-<h1>Module <a href="type_File.Descr.html">File.Descr</a></h1>
-<pre><span class="keyword">module</span> Descr: <code class="code">sig</code> <a href="File.Descr.html">..</a> <code class="code">end</code></pre>Package descriptions: <code class="code">$opam/descr/</code><br>
-<hr width="100%">
-<pre><span class="keyword">include</span> <a href="File.IO_FILE.html">File.IO_FILE</a></pre>
-<pre><span id="VALcreate"><span class="keyword">val</span> create</span> : <code class="type">string -> t</code></pre><div class="info">
-Create a description file<br>
-</div>
-<pre><span id="VALsynopsis"><span class="keyword">val</span> synopsis</span> : <code class="type">t -> string</code></pre><div class="info">
-Return the first line<br>
-</div>
-<pre><span id="VALfull"><span class="keyword">val</span> full</span> : <code class="type">t -> string</code></pre><div class="info">
-Return the full description<br>
-</div>
-</body></html>
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<link rel="stylesheet" href="style.css" type="text/css">
-<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type">
-<link rel="Start" href="index.html">
-<link rel="previous" href="File.Dot_config.Section.html">
-<link rel="next" href="File.Dot_config.Syntax.html">
-<link rel="Up" href="File.Dot_config.html">
-<link title="Index of types" rel=Appendix href="index_types.html">
-<link title="Index of exceptions" rel=Appendix href="index_exceptions.html">
-<link title="Index of values" rel=Appendix href="index_values.html">
-<link title="Index of modules" rel=Appendix href="index_modules.html">
-<link title="Index of module types" rel=Appendix href="index_module_types.html">
-<link title="Client" rel="Chapter" href="Client.html">
-<link title="File" rel="Chapter" href="File.html">
-<link title="File_format" rel="Chapter" href="File_format.html">
-<link title="Parallel" rel="Chapter" href="Parallel.html">
-<link title="Path" rel="Chapter" href="Path.html">
-<link title="Process" rel="Chapter" href="Process.html">
-<link title="Repositories" rel="Chapter" href="Repositories.html">
-<link title="Run" rel="Chapter" href="Run.html">
-<link title="Solver" rel="Chapter" href="Solver.html">
-<link title="Types" rel="Chapter" href="Types.html"><title>File.Dot_config.Library</title>
-</head>
-<body>
-<div class="navbar"><a class="pre" href="File.Dot_config.Section.html" title="File.Dot_config.Section">Previous</a>
-&nbsp;<a class="up" href="File.Dot_config.html" title="File.Dot_config">Up</a>
-&nbsp;<a class="post" href="File.Dot_config.Syntax.html" title="File.Dot_config.Syntax">Next</a>
-</div>
-<h1>Module <a href="type_File.Dot_config.Library.html">File.Dot_config.Library</a></h1>
-<pre><span class="keyword">module</span> Library: <code class="type"><a href="File.Dot_config.SECTION.html">SECTION</a></code><code class="type"> </code></pre>Sections starting by <code class="code">library</code><br>
-<hr width="100%">
-<pre><span id="VALavailable"><span class="keyword">val</span> available</span> : <code class="type">t -> <a href="Types.html#TYPEsection">Types.section</a> list</code></pre><div class="info">
-List the available sections<br>
-</div>
-<pre><span id="VALkind"><span class="keyword">val</span> kind</span> : <code class="type">t -> <a href="Types.html#TYPEsection">Types.section</a> -> string</code></pre><div class="info">
-Return the section kind<br>
-</div>
-<pre><span id="VALasmcomp"><span class="keyword">val</span> asmcomp</span> : <code class="type">t -> <a href="Types.html#TYPEsection">Types.section</a> -> string list</code></pre><div class="info">
-Return the list of native-compiler options<br>
-</div>
-<pre><span id="VALbytecomp"><span class="keyword">val</span> bytecomp</span> : <code class="type">t -> <a href="Types.html#TYPEsection">Types.section</a> -> string list</code></pre><div class="info">
-Return the list of bytecode-compiler options<br>
-</div>
-<pre><span id="VALasmlink"><span class="keyword">val</span> asmlink</span> : <code class="type">t -> <a href="Types.html#TYPEsection">Types.section</a> -> string list</code></pre><div class="info">
-Return the list of native-code linking options<br>
-</div>
-<pre><span id="VALbytelink"><span class="keyword">val</span> bytelink</span> : <code class="type">t -> <a href="Types.html#TYPEsection">Types.section</a> -> string list</code></pre><div class="info">
-Return the list of bytecode linking options<br>
-</div>
-<pre><span id="VALrequires"><span class="keyword">val</span> requires</span> : <code class="type">t -> <a href="Types.html#TYPEsection">Types.section</a> -> <a href="Types.html#TYPEsection">Types.section</a> list</code></pre><div class="info">
-Return the build requirements<br>
-</div>
-<pre><span id="VALvariable"><span class="keyword">val</span> variable</span> : <code class="type">t -> <a href="Types.html#TYPEsection">Types.section</a> -> <a href="Types.html#TYPEvariable">Types.variable</a> -> <a href="Types.html#TYPEvariable_contents">Types.variable_contents</a></code></pre><div class="info">
-Return the value of variables<br>
-</div>
-<pre><span id="VALvariables"><span class="keyword">val</span> variables</span> : <code class="type">t -> <a href="Types.html#TYPEsection">Types.section</a> -> <a href="Types.html#TYPEvariable">Types.variable</a> list</code></pre><div class="info">
-The list of local variables<br>
-</div>
-</body></html>
Oops, something went wrong.

0 comments on commit aa67aa9

Please sign in to comment.