[Pkg-ocaml-maint-commits] [dose3] 01/01: Imported Upstream version 3.3
This is an automated email from the git hooks/post-receive script. josch-guest pushed a commit to annotated tag upstream/3.3 in repository dose3. commit 7cd3a83bb5fce5c34dd391c364390ef95ed48104 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)
[Pkg-ocaml-maint-commits] [dose3] 01/01: Imported Upstream version 3.3
This is an automated email from the git hooks/post-receive script. josch-guest pushed a commit to branch experimental/upstream in repository dose3. commit 1b73267571d28296572600c138f44ecd6c6f8fe6 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)
