This is an automated email from the git hooks/post-receive script. josch-guest pushed a commit to branch experimental/master in repository dose3.
commit 7ef6c60fc09445c2ab55549df32cc5eeb9186624 Author: josch <j.scha...@email.de> Date: Fri Nov 21 07:19:29 2014 +0100 Imported Upstream version 3.3 --- META.in | 27 ++++++---- Makefile | 61 ++++++++++------------ Makefile.config.in | 12 ++++- applications/dose-tests.py | 8 ++- configure | 21 ++++---- configure.ac | 4 +- deb/printer.ml | 12 ++--- .../apt-external-solvers.tex | 2 +- doc/manpages/apt-cudf-get.pod | 4 +- doc/manpages/apt-cudf.pod | 2 +- doc/manpages/ceve.pod | 2 +- doc/manpages/distcheck.pod | 2 +- dose3.odocl.in | 7 ++- opam_configure.sh | 3 +- 14 files changed, 98 insertions(+), 69 deletions(-) diff --git a/META.in b/META.in index fba7dee..de6fa74 100644 --- a/META.in +++ b/META.in @@ -1,8 +1,8 @@ description = "Dose3 libraries" version = "@PACKAGE_VERSION@" -archive(byte) = "common.cma algo.cma debian.cma eclipse.cma csw.cma" -archive(native) = "common.cmxa algo.cmxa debian.cmxa eclipse.cmxa csw.cmxa" -requires = "extlib, re.pcre, cudf, ocamlgraph, unix, @ZIP@, @BZ2@" +archive(byte) = "common.cma algo.cma debian.cma eclipse.cma csw.cma cv.cma" +archive(native) = "common.cmxa algo.cmxa debian.cmxa eclipse.cmxa csw.cmxa cv.cmxa" +requires = "extlib, re.pcre, cudf, @OCAMLGRAPH@, unix, @ZIP@, @BZ2@" package "common" ( version = "@PACKAGE_VERSION@" @@ -15,7 +15,7 @@ package "algo" ( version = "@PACKAGE_VERSION@" archive(byte) = "algo.cma" archive(native) = "algo.cmxa" -requires = "ocamlgraph, dose3.common" +requires = "@OCAMLGRAPH@, dose3.common" ) package "debian" ( @@ -46,14 +46,21 @@ archive(native) = "rpm.cmxa" requires = "dose3.common" ) -package "boilerplate" ( +package "cv" ( +version = "unreleased" +archive(byte) = "cv.cma" +archive(native) = "cv.cmxa" +requires = "dose3.common" +) + +package "doseparse" ( version = "@PACKAGE_VERSION@" -archive(byte) = "rpm.cma boilerplate.cma" -archive(native) = "rpm.cmxa boilerplate.cmxa" +archive(byte) = "rpm.cma doseparse.cma" +archive(native) = "rpm.cmxa doseparse.cmxa" ) -package "boilerplateNoRpm" ( +package "doseparseNoRpm" ( version = "@PACKAGE_VERSION@" -archive(byte) = "boilerplateNoRpm.cma" -archive(native) = "boilerplateNoRpm.cmxa" +archive(byte) = "doseparseNoRpm.cma" +archive(native) = "doseparseNoRpm.cmxa" ) diff --git a/Makefile b/Makefile index 866604a..bc2d4e1 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ include Makefile.config DIST_DIR = $(NAME)-$(VERSION) DIST_TARBALL = $(DIST_DIR).tar.gz -VERBOSE := -classic-display +#VERBOSE := -classic-display OBFLAGS := $(VERBOSE) -j 10 -no-links -cflags -warn-error,FPSXY APPFLAGS := $(VERBOSE) -j 10 #OBFLAGS := $(OBFLAGS) -tag profile -tag debug @@ -17,18 +17,15 @@ all: itarget $(CAMLP4CMXS) $(BYTELIBS) $(OPTLIBS) $(CMXSLIBS) $(ALIBS) man $(OCAMLBUILD) $(APPFLAGS) applications/apps.otarget apps: itarget $(CAMLP4CMXS) $(BYTELIBS) $(OPTLIBS) - echo $(LIBNAMES) - echo $(BYTELIBS) - echo $(OPTLIBS) $(OCAMLBUILD) $(APPFLAGS) applications/apps.otarget cleandoselib: rm -Rf $(DOSELIBS) itarget: - rm -f applications/apps.itarget + @rm -f applications/apps.itarget @for i in $(TARGETS); do echo $$i >> applications/apps.itarget; done - $(shell \ + @$(shell \ for lib in $(LIBNAMES); do \ libname=`basename "$$lib"` ;\ dirname=`dirname "$$lib"` ;\ @@ -37,10 +34,9 @@ itarget: echo "$$libname.$$ext" >> $$dirname/$$libname.itarget; \ done;\ done) -# @touch applications/.itarget _build/Camlp4MacroParser.cmxs: - mkdir -p _build + @mkdir -p _build ocamlopt -shared $(shell ocamlc -where)/camlp4/Camlp4Parsers/Camlp4MacroParser.cmx -o _build/Camlp4MacroParser.cmxs $(DOSELIBS)/cudf.%: @@ -138,7 +134,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/debian.% $(DOSELIBS)/eclipse.% clean: $(OCAMLBUILD) -clean - rm -f applications/apps.itarget applications/.itarget + rm -f applications/apps.itarget cd doc && $(MAKE) clean distclean: clean @@ -168,46 +164,47 @@ INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cma _build/doselibs/*.cmi) INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cmxa _build/doselibs/*.cmxs) INSTALL_STUFF_ += $(wildcard _build/doselibs/*.a) INSTALL_STUFF_ += $(wildcard _build/*/*.mli) -INSTALL_STUFF_ += $(wildcard _build/rpm/*.so _build/rpm/*.a) +INSTALL_STUFF_ += $(wildcard _build/rpm/*.so) exclude_cudf = $(wildcard _build/doselibs/*cudf* _build/cudf/*) INSTALL_STUFF = $(filter-out $(exclude_cudf), $(INSTALL_STUFF_)) install: META installcudf - test -d $(LIBDIR) || mkdir -p $(LIBDIR) - test -d $(LIBDIR)/stublibs || mkdir -p $(LIBDIR)/stublibs - $(INSTALL) -patch-version $(VERSION) $(NAME) $(INSTALL_STUFF) - - # install applications - cd _build/applications ; \ + @test -d $(LIBDIR) || mkdir -p $(LIBDIR) + @test -d $(LIBDIR)/stublibs || mkdir -p $(LIBDIR)/stublibs + @$(INSTALL) -patch-version $(VERSION) $(NAME) $(INSTALL_STUFF) + @cd _build/applications ; \ install -d $(BINDIR) ; \ for f in $$(ls *.$(OCAMLEXT)) ; do \ install $(INSTALLOPTS) $$f $(BINDIR)/$${f%.$(OCAMLEXT)} ; \ done - ln -s $(BINDIR)/distcheck $(BINDIR)/debcheck - ln -s $(BINDIR)/distcheck $(BINDIR)/rpmcheck - ln -s $(BINDIR)/distcheck $(BINDIR)/eclipsecheck + @ln -s $(BINDIR)/distcheck $(BINDIR)/debcheck + @ln -s $(BINDIR)/distcheck $(BINDIR)/rpmcheck + @ln -s $(BINDIR)/distcheck $(BINDIR)/eclipsecheck + @echo "Install dose librairies to $(LIBDIR)" + @echo "Install dose binaries to $(BINDIR)" uninstall: uninstallcudf - $(OCAMLFIND) remove -destdir $(LIBDIR) $(NAME) - - for f in $$(ls *.$(OCAMLEXT)) ; do \ + @$(OCAMLFIND) remove -destdir $(LIBDIR) $(NAME) + @for f in $$(ls *.$(OCAMLEXT)) ; do \ rm -f $(BINDIR)/$${f%.$(OCAMLEXT)} ; \ done - rm -f $(BINDIR)/debcheck $(BINDIR)/rpmcheck $(BINDIR)/eclipsecheck + @rm -f $(BINDIR)/debcheck $(BINDIR)/rpmcheck $(BINDIR)/eclipsecheck + @echo "Uninstall dose librairies from $(LIBDIR)" + @echo "Uninstall dose binaries from $(BINDIR)" dist: ./$(DIST_TARBALL) ./$(DIST_TARBALL): - if [ -d ./$(DIST_DIR)/ ] ; then rm -rf ./$(DIST_DIR)/ ; fi - if [ -d ./$(DIST_TARBALL) ] ; then rm -f ./$(DIST_TARBALL) ; fi - if [ -d .svn ]; then \ + @if [ -d ./$(DIST_DIR)/ ] ; then rm -rf ./$(DIST_DIR)/ ; fi + @if [ -d ./$(DIST_TARBALL) ] ; then rm -f ./$(DIST_TARBALL) ; fi + @if [ -d .svn ]; then \ svn export . ./$(DIST_DIR) ; \ else \ mkdir ./$(DIST_DIR)/ ; git archive --format=tar HEAD | tar -x -C ./$(DIST_DIR)/ ; \ fi - for f in $(DIST_EXCLUDE) ; do rm -rf ./$(DIST_DIR)/$$f; done - tar cvzf ./$(DIST_TARBALL) ./$(DIST_DIR) - rm -rf ./$(DIST_DIR) + @for f in $(DIST_EXCLUDE) ; do rm -rf ./$(DIST_DIR)/$$f; done + @tar czf ./$(DIST_TARBALL) ./$(DIST_DIR) + @rm -rf ./$(DIST_DIR) @echo "Distribution tarball: ./$(DIST_TARBALL)" changelog: @@ -216,8 +213,8 @@ changelog: credits: @git log --pretty=format:'%aN %aE' | LC_ALL=C sort -u | awk -F'\t' '{printf("\t%s <%s>\n",$$1,$$2)}'; -doc: fast - $(OCAMLBUILD) $(OBFLAGS) dose3.docdir/index.html dose3.docdir/index.dot +doc: all + $(OCAMLBUILD) dose3.docdir/index.html dose3.docdir/index.dot dot -Grotate=0 -Tsvg -o dose3.docdir/index.svg dose3.docdir/index.dot (cd doc && $(MAKE) all) @@ -230,4 +227,4 @@ upload: doc .PHONY: \ common algo debian eclipse rpm cws doseparseNoRpm doseparse \ - all fast opt clean top-level headers test tags install uninstall dist doc man + all clean top-level headers test tags install uninstall dist doc man diff --git a/Makefile.config.in b/Makefile.config.in index acbe883..b0277db 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -84,8 +84,18 @@ LIBNAMES += doseparseNoRpm/doseparseNoRpm \ BYTELIBNAMES=$(notdir $(LIBNAMES)) BYTELIBS=$(BYTELIBNAMES:%=$(DOSELIBS)/%.cma) +ifeq ("@HAS_LIBCUDF@","no") +installcudf: + $(MAKE) -C cudf all @OCAMLBEST@ install +uninstallcudf: + $(MAKE) -C cudf uninstall +else +installcudf: +uninstallcudf: +endif + ifeq ("@OCAMLEXT@","native") - SUFFIX += cmxa cmxs a + SUFFIX += cmxa cmxs a OPTLIBS += $(BYTELIBS:%.cma=%.cmxa) CMXSLIBS += $(BYTELIBS:%.cma=%.cmxs) ALIBS = $(BYTELIBS:%.cma=%.a) diff --git a/applications/dose-tests.py b/applications/dose-tests.py index e5cb148..b712eed 100755 --- a/applications/dose-tests.py +++ b/applications/dose-tests.py @@ -7,7 +7,13 @@ import uuid import os,sys,time import argparse from itertools import groupby, ifilter -import yaml, urllib +from yaml import load +try: + from yaml import CLoader as Loader +except ImportError: + from yaml import Loader + warning('YAML C-library not available, falling back to python') + import filecmp import cStringIO from sets import Set diff --git a/configure b/configure index 5dcc6e9..c5f7a01 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for dose3 3.2.2. +# Generated by GNU Autoconf 2.69 for dose3 3.3. # # Report bugs to <pietro.ab...@pps.univ-paris-diderot.fr>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dose3' PACKAGE_TARNAME='dose3' -PACKAGE_VERSION='3.2.2' -PACKAGE_STRING='dose3 3.2.2' +PACKAGE_VERSION='3.3' +PACKAGE_STRING='dose3 3.3' PACKAGE_BUGREPORT='pietro.ab...@pps.univ-paris-diderot.fr' PACKAGE_URL='' @@ -626,6 +626,7 @@ LIBOBJS OCAMLEXT PKG_XML PKG_CURL +OCAMLGRAPH CONFIG_OCAMLGRAPH PKG_OCAMLGRAPH DOC_OCAMLGRAPH @@ -1308,7 +1309,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 dose3 3.2.2 to adapt to many kinds of systems. +\`configure' configures dose3 3.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1369,7 +1370,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dose3 3.2.2:";; + short | recursive ) echo "Configuration of dose3 3.3:";; esac cat <<\_ACEOF @@ -1466,7 +1467,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dose3 configure 3.2.2 +dose3 configure 3.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1722,7 +1723,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 dose3 $as_me 3.2.2, which was +It was created by dose3 $as_me 3.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4454,6 +4455,7 @@ $as_echo "not found" >&6; } MLPACK_OCAMLGRAPH="Defaultgraphs Statistics Dominators Strongdeps Strongdeps_int Strongconflicts Strongconflicts_int" DOC_OCAMLGRAPH="algo/Strongdeps algo/Strongconflicts algo/Strongdeps_int algo/Strongconflicts_int algo/Defaultgraphs algo/Statistics" CONFIG_OCAMLGRAPH="-DHASOCAMLGRAPH" + OCAMLGRAPH=ocamlgraph fi @@ -5964,6 +5966,7 @@ fi + LDFLAGS="-fstack-protector" @@ -6529,7 +6532,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dose3 $as_me 3.2.2, which was +This file was extended by dose3 $as_me 3.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6582,7 +6585,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dose3 config.status 3.2.2 +dose3 config.status 3.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 85e978e..b4dfb95 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(dose3, 3.2.2, pietro.ab...@pps.univ-paris-diderot.fr) +AC_INIT(dose3, 3.3, pietro.ab...@pps.univ-paris-diderot.fr) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_OCAML @@ -147,6 +147,7 @@ if test "$HAS_OCAMLGRAPH" = "yes" ; then MLPACK_OCAMLGRAPH="Defaultgraphs Statistics Dominators Strongdeps Strongdeps_int Strongconflicts Strongconflicts_int" DOC_OCAMLGRAPH="algo/Strongdeps algo/Strongconflicts algo/Strongdeps_int algo/Strongconflicts_int algo/Defaultgraphs algo/Statistics" CONFIG_OCAMLGRAPH="-DHASOCAMLGRAPH" + OCAMLGRAPH=ocamlgraph fi AC_ARG_WITH(curl, @@ -286,6 +287,7 @@ AC_SUBST(MLPACK_OCAMLGRAPH) AC_SUBST(DOC_OCAMLGRAPH) AC_SUBST(PKG_OCAMLGRAPH) AC_SUBST(CONFIG_OCAMLGRAPH) +AC_SUBST(OCAMLGRAPH) AC_SUBST(PKG_CURL) diff --git a/deb/printer.ml b/deb/printer.ml index 59facc7..abe6ae4 100644 --- a/deb/printer.ml +++ b/deb/printer.ml @@ -35,7 +35,7 @@ let string_of_vpkg = function let pp_vpkg oc vpkg = Printf.fprintf oc "%s" (string_of_vpkg vpkg) let string_of_vpkglist vpkglist = - Util.string_of_list ~sep:"," string_of_vpkg vpkglist + Util.string_of_list ~sep:", " string_of_vpkg vpkglist ;; let pp_vpkglist oc vpkglist = @@ -43,8 +43,8 @@ let pp_vpkglist oc vpkglist = ;; let string_of_vpkgformula vpkgformula = - let string_of_OR = Util.string_of_list ~sep:" |" string_of_vpkg in - let string_of_AND = Util.string_of_list ~sep:"," string_of_OR in + let string_of_OR = Util.string_of_list ~sep:" | " string_of_vpkg in + let string_of_AND = Util.string_of_list ~sep:", " string_of_OR in string_of_AND vpkgformula ;; @@ -112,8 +112,8 @@ let strinf_of_builddep (vpkg,archfilter,buildfilter) = ;; let string_of_builddepformula builddepformula = - let string_of_OR = Util.string_of_list ~sep:" |" strinf_of_builddep in - let string_of_AND = Util.string_of_list ~sep:"," string_of_OR in + let string_of_OR = Util.string_of_list ~sep:" | " strinf_of_builddep in + let string_of_AND = Util.string_of_list ~sep:", " string_of_OR in string_of_AND builddepformula ;; @@ -122,7 +122,7 @@ let pp_builddepformula oc builddepformula = ;; let string_of_builddeplist builddeplist = - Util.string_of_list ~sep:"," strinf_of_builddep builddeplist + Util.string_of_list ~sep:", " strinf_of_builddep builddeplist ;; let pp_builddeplist oc builddeplist = diff --git a/doc/apt-external-solvers.primer/apt-external-solvers.tex b/doc/apt-external-solvers.primer/apt-external-solvers.tex index 726595f..3597ada 100644 --- a/doc/apt-external-solvers.primer/apt-external-solvers.tex +++ b/doc/apt-external-solvers.primer/apt-external-solvers.tex @@ -11,7 +11,7 @@ \documentclass{article} \usepackage[utf8]{inputenc} -%\usepackage{hevea} +\usepackage{hevea} \usepackage{alltt} \input{version} diff --git a/doc/manpages/apt-cudf-get.pod b/doc/manpages/apt-cudf-get.pod index 991cde3..48f98b3 100644 --- a/doc/manpages/apt-cudf-get.pod +++ b/doc/manpages/apt-cudf-get.pod @@ -13,7 +13,7 @@ apt-cudf-get - wrapper for calling apt-get with external solvers =head1 DESCRIPTION -B<apt-cudf-get> is a wrapper that allows to invoke B<apt-get> with +B<apt-cudf-get> is a wrapper that allows one to invoke B<apt-get> with external solvers while ignoring apt's pinning. All options are passed on to apt-get. @@ -48,7 +48,7 @@ Pietro Abate and Roberto Di Cosmo =head1 BUGS -Not all types of arguements to apt are correctly treated by this wrapper, +Not all types of arguments to apt are correctly treated by this wrapper, in particular not the +I<pkg> and -I<pkg> shorthands for installation and removal requests. =head1 SEE ALSO diff --git a/doc/manpages/apt-cudf.pod b/doc/manpages/apt-cudf.pod index f1fb101..6f2dbed 100644 --- a/doc/manpages/apt-cudf.pod +++ b/doc/manpages/apt-cudf.pod @@ -14,7 +14,7 @@ apt-cudf - CUDF solver integration for APT apt-cudf translates back and forth among a CUDF-based dependency solver and the protocol used by APT to talk with external dependency solvers. apt-cudf -therefore allows to use any CUDF solver as an external solver for APT. +therefore allows one to use any CUDF solver as an external solver for APT. apt-cudf relies on its C<argv[0]> name to find the CUDF solver to invoke. In common setups, you should have a CUDF solver specification file under diff --git a/doc/manpages/ceve.pod b/doc/manpages/ceve.pod index 8db8182..45900a3 100644 --- a/doc/manpages/ceve.pod +++ b/doc/manpages/ceve.pod @@ -83,7 +83,7 @@ with the option B<-T >I<dot|gml|grml>. Possible values are: =item . B<syn> for the syntactic graph where disjunctions nodes and conflicts are -explicitely added to the graph. +explicitly added to the graph. =item . diff --git a/doc/manpages/distcheck.pod b/doc/manpages/distcheck.pod index 958d393..9f3b180 100644 --- a/doc/manpages/distcheck.pod +++ b/doc/manpages/distcheck.pod @@ -194,7 +194,7 @@ List all packages that are found not to be installable. List all packages that are found to be installable. May be used together with B<--failures>, in this case the value of the status field in the output -allows to distinguish installable from non-installable packages. +allows one to distinguish installable from non-installable packages. =item B<-e>, B<--explain> diff --git a/dose3.odocl.in b/dose3.odocl.in index d24bd73..7f1a3ec 100644 --- a/dose3.odocl.in +++ b/dose3.odocl.in @@ -22,7 +22,10 @@ applications/Ceve applications/Apt-cudf applications/Outdated applications/Challenged -doseparse/BoilerplateNoRpm -doseparse/Boilerplate +doseparse/StdDebian +doseparse/StdDebug +doseparse/StdLoaders +doseparse/StdOptions +doseparse//StdUtils @DOC_OCAMLGRAPH@ @DOC_RPM@ diff --git a/opam_configure.sh b/opam_configure.sh index ab861ea..9dd5d1b 100755 --- a/opam_configure.sh +++ b/opam_configure.sh @@ -1,4 +1,5 @@ opam init -y eval `opam config env` -opam switch -y 4.02.1 +opam switch -y 4.02.0 +eval `opam config env` opam install -y extlib camlbz2 camlzip ocamlgraph extlib ounit re cudf -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits