This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository opam.
commit 79a9ff7c181da2bf39cd511b412e7cd0af0ef187
Author: Mehdi Dogguy <me...@debian.org>
Date: Mon Jul 20 23:51:44 2015 +0000
Use upstream's build system
---
debian/buildsys/_tags | 4 --
debian/buildsys/byte.itarget | 3 --
debian/buildsys/myocamlbuild.ml | 83 -----------------------------------------
debian/buildsys/opt.itarget | 3 --
debian/changelog | 2 +
debian/opam-docs.install | 1 +
debian/opam.install | 1 +
debian/rules | 18 ++-------
8 files changed, 8 insertions(+), 107 deletions(-)
diff --git a/debian/buildsys/_tags b/debian/buildsys/_tags
deleted file mode 100644
index e1055a3..0000000
--- a/debian/buildsys/_tags
+++ /dev/null
@@ -1,4 +0,0 @@
-<**/*>: debug, thread
-<**/*.ml*>: annot
-<src/core> or <src/client> or <src/repositories> or <src/scripts> or
<src/solver>: include
-<thirdparty/uutf> or <thirdparty/jsonm>: include
diff --git a/debian/buildsys/byte.itarget b/debian/buildsys/byte.itarget
deleted file mode 100644
index 5ca046b..0000000
--- a/debian/buildsys/byte.itarget
+++ /dev/null
@@ -1,3 +0,0 @@
-src/client/opamMain.byte
-src/tools/opam_admin.byte
-src/tools/opam_installer.byte
diff --git a/debian/buildsys/myocamlbuild.ml b/debian/buildsys/myocamlbuild.ml
deleted file mode 100644
index 6016091..0000000
--- a/debian/buildsys/myocamlbuild.ml
+++ /dev/null
@@ -1,83 +0,0 @@
-(**************************************************************************)
-(* Copyright © 2013 Mehdi Dogguy <me...@debian.org> *)
-(* *)
-(* This program is free software: you can redistribute it and/or modify *)
-(* it under the terms of the GNU General Public License as published by *)
-(* the Free Software Foundation, either version 3 of the License, or (at *)
-(* your option) any later version, with the additional exemption that *)
-(* compiling, linking, and/or using OpenSSL is allowed. *)
-(* *)
-(* This program is distributed in the hope that it will be useful, but *)
-(* WITHOUT ANY WARRANTY; without even the implied warranty of *)
-(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *)
-(* Affero General Public License for more details. *)
-(* *)
-(* You should have received a copy of the GNU General Public License *)
-(* along with this program. If not, see <http://www.gnu.org/licenses/>. *)
-(**************************************************************************)
-
-open Printf
-open Ocamlbuild_plugin
-
-let name = "ben"
-let packages = [
- "cudf";
- "ocamlgraph";
- "dose3.algo";
- "dose3.debian";
- "unix";
- "re.glob";
- "re.pcre";
- "re.str";
- "cmdliner";
- "extlib";
-]
-
-exception Require_findlib
-exception Missing_findlib_package of string
-exception Subprocess_died_unexpectedly of Unix.process_status
-
-let try_exec cmd =
- Sys.command (sprintf "%s >/dev/null 2>&1" cmd) = 0
-
-let require pkg =
- if not (try_exec (sprintf "ocamlfind query %s" pkg)) then
- raise (Missing_findlib_package pkg)
-
-let ocamlfind x = S[A"ocamlfind"; A x]
-let has_ocamlopt = try_exec "which ocamlopt"
-let best =
- try Sys.getenv "OCAMLBEST"
- with Not_found -> if has_ocamlopt then "native" else "byte"
-let () = if not (try_exec "ocamlfind printconf") then raise Require_findlib
-let () = List.iter require packages
-let main_executable = sprintf "bin/%s.%s" name best
-
-let () =
- dispatch begin function
-
- | Before_options ->
- Options.ocamlc := ocamlfind "ocamlc";
- Options.ocamlopt := ocamlfind "ocamlopt";
- Options.ocamldep := ocamlfind "ocamldep";
- Options.ocamldoc := ocamlfind "ocamldoc";
- (* Options.use_menhir := true;*)
-
- | After_rules ->
- List.iter
- (fun dir ->
- Pathname.define_context dir ["lib"]
- )
- ["client"; "core"; "repositories"; "scripts"; "solver"];
- flag ["ocaml"; "link"; "program"] & A"-linkpkg";
- List.iter
- (fun pkg ->
- let flag x = flag (x::["ocaml"]) & S[A"-package"; A pkg] in
- List.iter flag ["ocamldep"; "compile"; "link"; "doc"])
- packages;
-
- (* why isn't this done by default? *)
- flag ["library"; "link"; "thread"] (A"-thread");
-
- | _ -> ()
- end
diff --git a/debian/buildsys/opt.itarget b/debian/buildsys/opt.itarget
deleted file mode 100644
index 7790aef..0000000
--- a/debian/buildsys/opt.itarget
+++ /dev/null
@@ -1,3 +0,0 @@
-src/client/opamMain.native
-src/tools/opam_admin.native
-src/tools/opam_installer.native
diff --git a/debian/changelog b/debian/changelog
index 0c04c7a..ea0b8c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ opam (1.2.2-1) UNRELEASED; urgency=medium
- New Build-Dependency: libjsonm-ocaml-dev
- Drop old patches.
- Requires libcmdliner-ocaml-dev (>= 0.9.7)
+ * Use upstream's makefile based build system instead of crafting our
+ own one.
-- Mehdi Dogguy <me...@debian.org> Mon, 20 Jul 2015 01:41:30 +0000
diff --git a/debian/opam-docs.install b/debian/opam-docs.install
new file mode 100644
index 0000000..5ed5bcf
--- /dev/null
+++ b/debian/opam-docs.install
@@ -0,0 +1 @@
+usr/share/man/man1/*.1
diff --git a/debian/opam.install b/debian/opam.install
new file mode 100644
index 0000000..1df36c6
--- /dev/null
+++ b/debian/opam.install
@@ -0,0 +1 @@
+usr/bin/*
diff --git a/debian/rules b/debian/rules
index 8b0e589..49fd6ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# -*- makefile -*-
-DESTDIR=$(CURDIR)/debian/opam
+DESTDIR=$(CURDIR)/debian/tmp
include /usr/share/ocaml/ocamlvars.mk
OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
BINEXT = $(if $(OCAML_OPT_ARCH),native,byte)
@@ -12,16 +12,12 @@ BINEXT = $(if $(OCAML_OPT_ARCH),native,byte)
.PHONY: override_dh_auto_configure
override_dh_auto_configure:
./configure
- $(MAKE) -C src core/opamGitVersion.ml core/opamScript.ml
- for file in `ls -1 debian/buildsys/`; do \
- ln -s debian/buildsys/$$file; \
- done
.PHONY: override_dh_auto_build
override_dh_auto_build:
- ocamlbuild $(OCAML_BEST).otarget
+ $(MAKE)
ifneq (,$(findstring opam-docs, $(shell dh_listpackages)))
- $(MAKE) -C doc OPAM=../opamMain.$(BINEXT)
OPAM_ADMIN=../opam_admin.$(BINEXT) OPAM_INSTALLER=../opam_installer.$(BINEXT)
man
+ $(MAKE) man
$(RM) -f doc/dev-manual/dev-manual.pdf
$(MAKE) -C doc/dev-manual
endif
@@ -32,10 +28,7 @@ override_dh_auto_test:
.PHONY: override_dh_auto_install
override_dh_auto_install:
- mkdir -p $(DESTDIR)/usr/bin
- cp _build/src/client/opamMain.$(BINEXT)
$(DESTDIR)/usr/bin/opam
- cp _build/src/tools/opam_admin.$(BINEXT)
$(DESTDIR)/usr/bin/opam-admin
- cp _build/src/tools/opam_installer.$(BINEXT)
$(DESTDIR)/usr/bin/opam-installer
+ $(MAKE) install prefix=$(DESTDIR)/usr
.PHONY: override_dh_install
override_dh_install:
@@ -43,9 +36,6 @@ override_dh_install:
.PHONY: override_dh_auto_clean
override_dh_auto_clean:
- for file in `ls -1 debian/buildsys/`; do \
- $(RM) -f $$file || true; \
- done
$(MAKE) clean || true
$(RM) -rf _build
$(RM) -f src/core/opamVersion.ml src/core/opamGitVersion.ml
src/core/opamScript.ml Makefile.config config.log config.status *.$(BINEXT)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/opam.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
