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

Conflicts:
	src/opamFile.mli
	src/opamGlobals.ml.in
	src/opamSystem.ml

CHANGES

@@ -1,4 +1,5 @@
 0.7.6 (trunk)
+* major internal API refactoring
 * repositories are now versionned, and we try to auto-update when possible
 
 0.7.5 [Oct 2012]

Makefile

@@ -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

README.md

@@ -1,8 +1,9 @@
 # OPAM - A package manager for OCaml
 
 OPAM is a package manager for OCaml, based on the
-[CUDF](http://mancoosi.org/cudf/) library developped by the
-[Mancoosi](http://www.mancoosi.org/) project, which is, among other
+[CUDF](http://mancoosi.org/cudf/) and the 
+[Dose](http://www.mancoosi.org/software/) libraries developped by the
+[Mancoosi](http://www.mancoosi.org/) project, which are, among other
 things, used by Debian to manage their packages.
 
 ### Prerequisites:

configure

@@ -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;}

configure.ac

@@ -22,7 +22,7 @@ fi
 
 AC_CONFIG_FILES(
   Makefile.config
-  src/globals.ml
+  src/opamGlobals.ml
 )
 AC_OUTPUT