Merge branch 'master' of git://github.com/OCamlPro/opam

CHANGES

@@ -1,5 +1,5 @@
-0.9.6 (trunk)
-* Fix loading of `~/.profile` when using dash
+0.9.6 [Mar 2013]
+* Fix loading of `~/.profile` when using dash (eg. in Debian/Ubuntu)
 * Fix installation of packages with symbolic links (regression introduced in 0.9.5)
 
 0.9.5 [Mar 2013]

Makefile

@@ -172,7 +172,9 @@ doc: compile
 	  src/**/*.mli -html -d doc/html/
 	$(MAKE) -C doc
 
-OPAM_FULL  = opam-full-$(version)
+OPAM_FULL       = opam-full-$(version)
+OPAM_FULL_TARGZ = $(OPAM_FULL).tar.gz
+
 OPAM_FILES = $(wildcard src_ext/*.tar.gz)\
 	     $(wildcard src_ext/*.tbz)\
 	     $(shell git ls-tree --name-only -r HEAD)
@@ -185,13 +187,15 @@ archive:
 	tar cz $(addprefix $(OPAM_FULL)/,$(OPAM_FILES)) > $(OPAM_FULL).tar.gz
 	rm -f $(OPAM_FULL)
 
-upload: archive
-	read -p "Upload $(OPAM_FULL_TARGZ) [Y/n]?" choice;\
-	case x"$$choice" in \
-	  x|xy|xY ) scp $(OPAM_FULL).tar.gz webmaster@ocamlpro.com:pub/;;\
-	  * ) echo "Cancelled.";;\
-	esac
+upload: $(OPAM_FULL_TARGZ)
+	scp $(OPAM_FULL_TARGZ) webmaster@ocamlpro.com:pub/
 
 configure: configure.ac m4/*.m4
 	aclocal -I m4
 	autoconf
+
+release:
+	git tag -d latest || true
+	git tag -a latest -m "Latest release"
+	git tag -a $(version) -m "Release $(version)"
+	$(MAKE) upload

doc/html/OpamClient.API.CONFIG.html

@@ -59,6 +59,15 @@ <h1>Module <a href="type_OpamClient.API.CONFIG.html">OpamClient.API.CONFIG</a></
 <pre><span id="VALenv"><span class="keyword">val</span> env</span> : <code class="type">csh:bool -> unit</code></pre><div class="info">
 Display environment.<br>
 </div>
+<pre><span id="VALsetup"><span class="keyword">val</span> setup</span> : <code class="type"><a href="OpamTypes.html#TYPEuser_config">OpamTypes.user_config</a> option -> <a href="OpamTypes.html#TYPEglobal_config">OpamTypes.global_config</a> option -> unit</code></pre><div class="info">
+Global and user setup of OPAM.<br>
+</div>
+<pre><span id="VALsetup_list"><span class="keyword">val</span> setup_list</span> : <code class="type"><a href="OpamTypes.html#TYPEshell">OpamTypes.shell</a> -> <a href="OpamTypes.html#TYPEfilename">OpamTypes.filename</a> -> unit</code></pre><div class="info">
+Display global and user informations about OPAM setup.<br>
+</div>
+<pre><span id="VALexec"><span class="keyword">val</span> exec</span> : <code class="type">string -> unit</code></pre><div class="info">
+Execute a command in a subshell with the right environment variables.<br>
+</div>
 <pre><span id="VALincludes"><span class="keyword">val</span> includes</span> : <code class="type">is_rec:bool -> <a href="OpamTypes.html#TYPEname">OpamTypes.name</a> list -> unit</code></pre><div class="info">
 Display includes files.<br>
 </div>

doc/html/OpamClient.API.SWITCH.html

@@ -55,10 +55,10 @@ <h1>Module <a href="type_OpamClient.API.SWITCH.html">OpamClient.API.SWITCH</a></
 Switch API<br>
 </div>
 <hr width="100%">
-<pre><span id="VALswitch"><span class="keyword">val</span> switch</span> : <code class="type">quiet:bool -> <a href="OpamTypes.html#TYPEswitch">OpamTypes.switch</a> -> unit</code></pre><div class="info">
+<pre><span id="VALswitch"><span class="keyword">val</span> switch</span> : <code class="type">quiet:bool -> warning:bool -> <a href="OpamTypes.html#TYPEswitch">OpamTypes.switch</a> -> unit</code></pre><div class="info">
 Switch to the given compiler. Take the global file lock.<br>
 </div>
-<pre><span id="VALinstall"><span class="keyword">val</span> install</span> : <code class="type">quiet:bool -> <a href="OpamTypes.html#TYPEswitch">OpamTypes.switch</a> -> <a href="OpamTypes.html#TYPEcompiler">OpamTypes.compiler</a> -> unit</code></pre><div class="info">
+<pre><span id="VALinstall"><span class="keyword">val</span> install</span> : <code class="type">quiet:bool -> warning:bool -> <a href="OpamTypes.html#TYPEswitch">OpamTypes.switch</a> -> <a href="OpamTypes.html#TYPEcompiler">OpamTypes.compiler</a> -> unit</code></pre><div class="info">
 Install the given compiler.<br>
 </div>
 <pre><span id="VALimport"><span class="keyword">val</span> import</span> : <code class="type"><a href="OpamTypes.html#TYPEfilename">OpamTypes.filename</a> option -> unit</code></pre><div class="info">

doc/html/OpamClient.API.html

@@ -53,10 +53,10 @@ <h1>Module <a href="type_OpamClient.API.html">OpamClient.API</a></h1>
 OPAM API.<br>
 </div>
 <hr width="100%">
-<pre><span id="VALinit"><span class="keyword">val</span> init</span> : <code class="type"><a href="OpamTypes.html#TYPErepository">OpamTypes.repository</a> -> <a href="OpamTypes.html#TYPEcompiler">OpamTypes.compiler</a> -> jobs:int -> unit</code></pre><div class="info">
+<pre><span id="VALinit"><span class="keyword">val</span> init</span> : <code class="type"><a href="OpamTypes.html#TYPErepository">OpamTypes.repository</a> -><br>       <a href="OpamTypes.html#TYPEcompiler">OpamTypes.compiler</a> -><br>       jobs:int -><br>       <a href="OpamTypes.html#TYPEshell">OpamTypes.shell</a> -> <a href="OpamTypes.html#TYPEfilename">OpamTypes.filename</a> -> [ `ask | `no | `yes ] -> unit</code></pre><div class="info">
 Initialize the client a consistent state.<br>
 </div>
-<pre><span id="VALlist"><span class="keyword">val</span> list</span> : <code class="type">print_short:bool -><br>       installed_only:bool -><br>       ?name_only:bool -> ?case_sensitive:bool -> string list -> unit</code></pre><div class="info">
+<pre><span id="VALlist"><span class="keyword">val</span> list</span> : <code class="type">print_short:bool -><br>       installed_only:bool -><br>       installed_roots:bool -><br>       ?name_only:bool -> ?case_sensitive:bool -> string list -> unit</code></pre><div class="info">
 Display all available packages that matches any of the
      regexps.<br>
 </div>
@@ -80,7 +80,7 @@ <h1>Module <a href="type_OpamClient.API.html">OpamClient.API</a></h1>
 <pre><span id="VALupload"><span class="keyword">val</span> upload</span> : <code class="type"><a href="OpamTypes.html#TYPEupload">OpamTypes.upload</a> -> <a href="OpamTypes.html#TYPErepository_name">OpamTypes.repository_name</a> -> unit</code></pre><div class="info">
 Upload a package to a remote repository.<br>
 </div>
-<pre><span id="VALremove"><span class="keyword">val</span> remove</span> : <code class="type"><a href="OpamTypes.html#TYPEname_set">OpamTypes.name_set</a> -> unit</code></pre><div class="info">
+<pre><span id="VALremove"><span class="keyword">val</span> remove</span> : <code class="type">autoremove:bool -> <a href="OpamTypes.html#TYPEname_set">OpamTypes.name_set</a> -> unit</code></pre><div class="info">
 Remove the given set of packages.<br>
 </div>
 <pre><span class="keyword">module</span> <a href="OpamClient.API.CONFIG.html">CONFIG</a>: <code class="code">sig</code> <a href="OpamClient.API.CONFIG.html">..</a> <code class="code">end</code></pre><div class="info">

doc/html/OpamCompiler.html

@@ -65,8 +65,9 @@ <h1>Module <a href="type_OpamCompiler.html">OpamCompiler</a></h1>
 <pre><span id="VALof_filename"><span class="keyword">val</span> of_filename</span> : <code class="type">OpamFilename.t -> t</code></pre><div class="info">
 Convert a filename into a compiler name<br>
 </div>
-<pre><span id="VALlist"><span class="keyword">val</span> list</span> : <code class="type">OpamFilename.Dir.t -> Set.t</code></pre><div class="info">
-List the compiler available in a directory<br>
+<pre><span id="VALlist"><span class="keyword">val</span> list</span> : <code class="type">OpamFilename.Dir.t -> (OpamFilename.t * OpamFilename.t option) Map.t</code></pre><div class="info">
+List the compiler available in a directory (and their eventual
+   descrition file)<br>
 </div>
 <pre><span id="VALsystem"><span class="keyword">val</span> system</span> : <code class="type">t</code></pre><div class="info">
 System compiler<br>

doc/html/OpamConfigCommand.html

@@ -73,4 +73,13 @@ <h1>Module <a href="type_OpamConfigCommand.html">OpamConfigCommand</a></h1>
 <pre><span id="VALsubst"><span class="keyword">val</span> subst</span> : <code class="type"><a href="OpamTypes.html#TYPEbasename">OpamTypes.basename</a> list -> unit</code></pre><div class="info">
 Substitute files<br>
 </div>
+<pre><span id="VALsetup"><span class="keyword">val</span> setup</span> : <code class="type"><a href="OpamTypes.html#TYPEuser_config">OpamTypes.user_config</a> option -> <a href="OpamTypes.html#TYPEglobal_config">OpamTypes.global_config</a> option -> unit</code></pre><div class="info">
+Update the global and user configuration to use OPAM.<br>
+</div>
+<pre><span id="VALsetup_list"><span class="keyword">val</span> setup_list</span> : <code class="type"><a href="OpamTypes.html#TYPEshell">OpamTypes.shell</a> -> <a href="OpamTypes.html#TYPEfilename">OpamTypes.filename</a> -> unit</code></pre><div class="info">
+Display the global and user configuration for OPAM.<br>
+</div>
+<pre><span id="VALexec"><span class="keyword">val</span> exec</span> : <code class="type">string -> unit</code></pre><div class="info">
+Execute a command in a subshell<br>
+</div>
 </body></html>

doc/html/OpamFile.Filenames.html

@@ -5,6 +5,7 @@
 <meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type">
 <link rel="Start" href="index.html">
 <link rel="previous" href="OpamFile.Urls_txt.html">
+<link rel="next" href="OpamFile.Prefix.html">
 <link rel="Up" href="OpamFile.html">
 <link title="Index of types" rel=Appendix href="index_types.html">
 <link title="Index of exceptions" rel=Appendix href="index_exceptions.html">
@@ -47,7 +48,8 @@
 <body>
 <div class="navbar"><a class="pre" href="OpamFile.Urls_txt.html" title="OpamFile.Urls_txt">Previous</a>
 &nbsp;<a class="up" href="OpamFile.html" title="OpamFile">Up</a>
-&nbsp;</div>
+&nbsp;<a class="post" href="OpamFile.Prefix.html" title="OpamFile.Prefix">Next</a>
+</div>
 <h1>Module <a href="type_OpamFile.Filenames.html">OpamFile.Filenames</a></h1>
 <pre><span class="keyword">module</span> Filenames: <code class="type"><a href="OpamFile.IO_FILE.html">IO_FILE</a></code><code class="type">  with type t = filename_set</code></pre><div class="info">
 List of filenames<br>

doc/html/OpamFile.OPAM.html

@@ -119,6 +119,9 @@ <h1>Module <a href="type_OpamFile.OPAM.html">OpamFile.OPAM</a></h1>
 <pre><span id="VALdoc"><span class="keyword">val</span> doc</span> : <code class="type">t -> string option</code></pre><div class="info">
 API documentation<br>
 </div>
+<pre><span id="VALtags"><span class="keyword">val</span> tags</span> : <code class="type">t -> string list</code></pre><div class="info">
+Classification tags<br>
+</div>
 <pre><span id="VALbuild_test"><span class="keyword">val</span> build_test</span> : <code class="type">t -> <a href="OpamTypes.html#TYPEcommand">OpamTypes.command</a> list</code></pre><div class="info">
 Commands to build and run the tests<br>
 </div>

doc/html/OpamFile.Prefix.html

@@ -0,0 +1,79 @@
+<!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="OpamFile.Filenames.html">
+<link rel="Up" href="OpamFile.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="OpamAction" rel="Chapter" href="OpamAction.html">
+<link title="OpamClient" rel="Chapter" href="OpamClient.html">
+<link title="OpamConfigCommand" rel="Chapter" href="OpamConfigCommand.html">
+<link title="OpamPinCommand" rel="Chapter" href="OpamPinCommand.html">
+<link title="OpamRepositoryCommand" rel="Chapter" href="OpamRepositoryCommand.html">
+<link title="OpamSolution" rel="Chapter" href="OpamSolution.html">
+<link title="OpamState" rel="Chapter" href="OpamState.html">
+<link title="OpamSwitchCommand" rel="Chapter" href="OpamSwitchCommand.html">
+<link title="OpamCompiler" rel="Chapter" href="OpamCompiler.html">
+<link title="OpamFile" rel="Chapter" href="OpamFile.html">
+<link title="OpamFilename" rel="Chapter" href="OpamFilename.html">
+<link title="OpamFormat" rel="Chapter" href="OpamFormat.html">
+<link title="OpamFormula" rel="Chapter" href="OpamFormula.html">
+<link title="OpamMisc" rel="Chapter" href="OpamMisc.html">
+<link title="OpamPackage" rel="Chapter" href="OpamPackage.html">
+<link title="OpamParallel" rel="Chapter" href="OpamParallel.html">
+<link title="OpamPath" rel="Chapter" href="OpamPath.html">
+<link title="OpamProcess" rel="Chapter" href="OpamProcess.html">
+<link title="OpamRepository" rel="Chapter" href="OpamRepository.html">
+<link title="OpamRepositoryName" rel="Chapter" href="OpamRepositoryName.html">
+<link title="OpamSwitch" rel="Chapter" href="OpamSwitch.html">
+<link title="OpamSystem" rel="Chapter" href="OpamSystem.html">
+<link title="OpamTypes" rel="Chapter" href="OpamTypes.html">
+<link title="OpamVariable" rel="Chapter" href="OpamVariable.html">
+<link title="OpamVersion" rel="Chapter" href="OpamVersion.html">
+<link title="OpamDarcs" rel="Chapter" href="OpamDarcs.html">
+<link title="OpamGit" rel="Chapter" href="OpamGit.html">
+<link title="OpamHTTP" rel="Chapter" href="OpamHTTP.html">
+<link title="OpamLocal" rel="Chapter" href="OpamLocal.html">
+<link title="OpamCudf" rel="Chapter" href="OpamCudf.html">
+<link title="OpamHeuristic" rel="Chapter" href="OpamHeuristic.html">
+<link title="OpamSolver" rel="Chapter" href="OpamSolver.html"><title>OpamFile.Prefix</title>
+</head>
+<body>
+<div class="navbar"><a class="pre" href="OpamFile.Filenames.html" title="OpamFile.Filenames">Previous</a>
+&nbsp;<a class="up" href="OpamFile.html" title="OpamFile">Up</a>
+&nbsp;</div>
+<h1>Module <a href="type_OpamFile.Prefix.html">OpamFile.Prefix</a></h1>
+<pre><span class="keyword">module</span> Prefix: <code class="type"><a href="OpamFile.IO_FILE.html">IO_FILE</a></code><code class="type">  with type t = string name_map</code></pre><div class="info">
+Prefix of package directories<br>
+</div>
+<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="OpamFile.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="OpamTypes.html#TYPEfilename">OpamTypes.filename</a> -> <a href="OpamFile.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="OpamTypes.html#TYPEfilename">OpamTypes.filename</a> -> <a href="OpamFile.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="OpamTypes.html#TYPEfilename">OpamTypes.filename</a> -> <a href="OpamFile.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="VALread_from_channel"><span class="keyword">val</span> read_from_channel</span> : <code class="type">Pervasives.in_channel -> <a href="OpamFile.IO_FILE.html#TYPEt">t</a></code></pre><div class="info">
+Read from channel.<br>
+</div>
+<pre><span id="VALwrite_to_channel"><span class="keyword">val</span> write_to_channel</span> : <code class="type">Pervasives.out_channel -> <a href="OpamFile.IO_FILE.html#TYPEt">t</a> -> unit</code></pre><div class="info">
+Write to channel.<br>
+</div>
+</body></html>

doc/html/OpamFile.html

@@ -130,6 +130,9 @@ <h2 id="2_Substitutionfiles">Substitution files</h2><br>
 <pre><span class="keyword">module</span> <a href="OpamFile.Filenames.html">Filenames</a>: <code class="type"><a href="OpamFile.IO_FILE.html">IO_FILE</a></code><code class="type">  with type t = filename_set</code></pre><div class="info">
 List of filenames
 </div>
+<pre><span class="keyword">module</span> <a href="OpamFile.Prefix.html">Prefix</a>: <code class="type"><a href="OpamFile.IO_FILE.html">IO_FILE</a></code><code class="type">  with type t = string name_map</code></pre><div class="info">
+Prefix of package directories
+</div>
 <pre><span id="VALprint_stats"><span class="keyword">val</span> print_stats</span> : <code class="type">unit -> unit</code></pre><div class="info">
 Display statistics about file access.<br>
 </div>

doc/html/OpamFilename.html

@@ -70,7 +70,10 @@ <h1>Module <a href="type_OpamFilename.html">OpamFilename</a></h1>
 <pre><span id="VALmkdir"><span class="keyword">val</span> mkdir</span> : <code class="type">Dir.t -> unit</code></pre><div class="info">
 Create a directory<br>
 </div>
-<pre><span id="VALlist_dirs"><span class="keyword">val</span> list_dirs</span> : <code class="type">Dir.t -> Dir.t list</code></pre><div class="info">
+<pre><span id="VALrec_dirs"><span class="keyword">val</span> rec_dirs</span> : <code class="type">Dir.t -> Dir.t list</code></pre><div class="info">
+List the sub-directory recursively<br>
+</div>
+<pre><span id="VALsub_dirs"><span class="keyword">val</span> sub_dirs</span> : <code class="type">Dir.t -> Dir.t list</code></pre><div class="info">
 List the sub-directory<br>
 </div>
 <pre><span id="VALin_dir"><span class="keyword">val</span> in_dir</span> : <code class="type">Dir.t -> (unit -> 'a) -> 'a</code></pre><div class="info">
@@ -117,6 +120,16 @@ <h1>Module <a href="type_OpamFilename.html">OpamFilename</a></h1>
 <pre><span id="VALraw_file"><span class="keyword">val</span> raw_file</span> : <code class="type">string -> t</code></pre><div class="info">
 Creation from a raw string (as <i>http://&lt;path&gt;</i>)<br>
 </div>
+<pre><span id="VALprettify"><span class="keyword">val</span> prettify</span> : <code class="type">t -> string</code></pre><div class="info">
+Prettify a filename:<ul>
+<li>replace /path/to/opam/foo by &lt;opam&gt;/foo</li>
+<li>replace /path/to/home/foo by ~/foo</li>
+</ul>
+<br>
+</div>
+<pre><span id="VALprettify_dir"><span class="keyword">val</span> prettify_dir</span> : <code class="type">Dir.t -> string</code></pre><div class="info">
+Prettify a dirname.<br>
+</div>
 <pre><span id="VALdirname"><span class="keyword">val</span> dirname</span> : <code class="type">t -> Dir.t</code></pre><div class="info">
 Return the directory name<br>
 </div>
@@ -144,7 +157,7 @@ <h1>Module <a href="type_OpamFilename.html">OpamFilename</a></h1>
 <pre><span id="VALchop_extension"><span class="keyword">val</span> chop_extension</span> : <code class="type">t -> t</code></pre><div class="info">
 Remove the file extension<br>
 </div>
-<pre><span id="VALlist_files"><span class="keyword">val</span> list_files</span> : <code class="type">Dir.t -> t list</code></pre><div class="info">
+<pre><span id="VALrec_files"><span class="keyword">val</span> rec_files</span> : <code class="type">Dir.t -> t list</code></pre><div class="info">
 List all the filenames, recursively<br>
 </div>
 <pre><span id="VALwith_contents"><span class="keyword">val</span> with_contents</span> : <code class="type">(string -> 'a) -> t -> 'a</code></pre><div class="info">
@@ -175,9 +188,12 @@ <h1>Module <a href="type_OpamFilename.html">OpamFilename</a></h1>
 <pre><span id="VALstarts_with"><span class="keyword">val</span> starts_with</span> : <code class="type">Dir.t -> t -> bool</code></pre><div class="info">
 Check wether a filename starts by a given Dir.t<br>
 </div>
-<pre><span id="VALremove_prefix"><span class="keyword">val</span> remove_prefix</span> : <code class="type">prefix:Dir.t -> t -> string</code></pre><div class="info">
+<pre><span id="VALremove_prefix"><span class="keyword">val</span> remove_prefix</span> : <code class="type">Dir.t -> t -> string</code></pre><div class="info">
 Remove a prefix from a file name<br>
 </div>
+<pre><span id="VALremove_suffix"><span class="keyword">val</span> remove_suffix</span> : <code class="type">Base.t -> t -> string</code></pre><div class="info">
+Remove a suffix from a filename<br>
+</div>
 <pre><span id="VALdownload"><span class="keyword">val</span> download</span> : <code class="type">overwrite:bool -> t -> Dir.t -> t</code></pre><div class="info">
 download a remote file in a given directory. Return the location
     of the downloaded file if the download is successful.<br>