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

CHANGES

@@ -1,4 +1,7 @@
-0.8.2 (trunk)
+0.9.0 (trunk)
+* improve (but break) the command-line interface by using cmdliner
+
+0.8.2 [Dec 2012]
 * Fix an issue with 'opam reinstall <packages>' where packages were reinstalled in reverse order
 
 0.8.1 [Nov 2012]

Makefile

@@ -58,20 +58,20 @@ tests-git:
 %-install:
 	@if [ -e _obuild/$*/$*.asm ]; then \
 	  echo "install _obuild/$*/$*.asm" && \
-	  cp _obuild/$*/$*.asm $(prefix)/bin/$*; \
+	  cp _obuild/$*/$*.asm $(DESTDIR)$(prefix)/bin/$*; \
 	else \
 	  echo "install _obuild/$*/$*.byte" && \
-	  cp _obuild/$*/$*.byte $(prefix)/bin/$*; \
+	  cp _obuild/$*/$*.byte $(DESTDIR)$(prefix)/bin/$*; \
 	fi
 
 META: META.in
 	sed 's/@VERSION@/$(version)/g' < $< > $@
 
 .PHONY: uninstall install
 install:
-	mkdir -p $(prefix)/bin
+	mkdir -p $(DESTDIR)$(prefix)/bin
 	$(MAKE) $(TARGETS:%=%-install)
-	mkdir -p $(mandir)/man1 && cp doc/man/* $(mandir)/man1
+	mkdir -p $(DESTDIR)$(mandir)/man1 && cp doc/man/* $(DESTDIR)$(mandir)/man1
 
 uninstall:
 	rm -f $(prefix)/bin/opam*
@@ -99,8 +99,7 @@ doc: compile
 	  -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
-	$(MAKE) -C doc/tutorials
+	$(MAKE) -C doc
 
 trailing:
 	find src -name "*.ml*" -exec \
@@ -115,4 +114,4 @@ archive:
 
 configure: configure.ac m4/*.m4
 	aclocal -I m4
-	autoconf
+	autoconf

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for opam 0.8.2.
+# Generated by GNU Autoconf 2.61 for opam 0.9.0.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='opam'
 PACKAGE_TARNAME='opam'
-PACKAGE_VERSION='0.8.2'
-PACKAGE_STRING='opam 0.8.2'
+PACKAGE_VERSION='0.9.0'
+PACKAGE_STRING='opam 0.9.0'
 PACKAGE_BUGREPORT=''
 
 ac_subst_vars='SHELL
@@ -1151,7 +1151,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures opam 0.8.2 to adapt to many kinds of systems.
+\`configure' configures opam 0.9.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1212,7 +1212,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of opam 0.8.2:";;
+     short | recursive ) echo "Configuration of opam 0.9.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1293,7 +1293,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-opam configure 0.8.2
+opam configure 0.9.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1309,7 +1309,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by opam $as_me 0.8.2, which was
+It was created by opam $as_me 0.9.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -4204,7 +4204,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by opam $as_me 0.8.2, which was
+This file was extended by opam $as_me 0.9.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4247,7 +4247,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-opam config.status 0.8.2
+opam config.status 0.9.0
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(opam,0.8.2)
+AC_INIT(opam,0.9.0)
 AC_COPYRIGHT(Copyright 2012 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])

depends.ocp.in

@@ -26,11 +26,6 @@ begin library "graph"
   generated = true
 end
 
-begin library "arg"
-  dirname  = "%{lib}%/ocaml-arg"
-  generated = true
-end
-
 begin library "cudf"
   dirname  = "%{lib}%/cudf"
   generated = true
@@ -48,3 +43,7 @@ begin library "extLib"
   generated = true
 end
 
+begin library "cmdliner"
+  dirname = "%{lib}%/cmdliner"
+  generated = true
+end

doc/Makefile

@@ -0,0 +1,16 @@
+OPAM    = ../_obuild/opam/opam.byte
+TOPICS  = $(shell $(OPAM) help topics)
+HELPFMT = --help=groff
+
+.PHONY: man pdf
+all: man pdf
+
+man:
+	rm man/*
+	$(OPAM) $(HELP) > man/opam.1
+	for i in $(TOPICS); do\
+	  $(OPAM) $$i $(HELPFMT) > man/opam-$$i.1; \
+	done
+
+pdf:
+	$(MAKE) -C tutorials