[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, master, updated. debian/1.1-1-10-ga081404

Mehdi Dogguy dogguy at pps.jussieu.fr
Fri Sep 4 09:11:22 UTC 2009 

The following commit has been merged in the master branch:
commit 9e0c6b96cc438fb6480c1c0d6e957c591ba9484e
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Wed Sep 2 17:52:53 2009 +0200

    Rewrite 01_makefile to make it simpler and clearer and don't install graph.o as it's not needed anymore

diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.dpatch
index 809ef53..3be82bf 100755
--- a/debian/patches/01_makefile.dpatch
+++ b/debian/patches/01_makefile.dpatch
@@ -1,94 +1,93 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_makefile.dpatch by Mehdi Dogguy <dogguy at pps.jussieu.fr>
+## 01_makefile.dpatch by Mehdi Dogguy <mehdi at debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: make ocamlfind install target choose the "best"
+## DP: Install .o files, prefix binary names with "ocaml"
 
 @DPATCH@
 diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
---- ocamlgraph~/Makefile.in	2009-07-04 23:43:52.000000000 +0200
-+++ ocamlgraph/Makefile.in	2009-07-05 00:17:41.000000000 +0200
-@@ -143,10 +143,13 @@
- 
- viewer: $(VIEWER_DIR)/viewgraph.byte $(VIEWER_DIR)/viewgraph.$(OCAMLBEST)
- 
-+ifeq (@LABLGNOMECANVAS@,yes)
- VIEWER_CMO=viewGraph viewGraph_select viewGraph_utils viewGraph_test
+--- ocamlgraph~/Makefile.in	2009-09-04 10:12:43.000000000 +0200
++++ ocamlgraph/Makefile.in	2009-09-04 10:59:23.000000000 +0200
+@@ -31,7 +31,7 @@
+ OCAMLDOC = @OCAMLDOC@
+ OCAMLLEX = @OCAMLLEX@
+ OCAMLYACC= @OCAMLYACC@
+-OCAMLLIB = @OCAMLLIB@
++OCAMLLIB = @OCAMLLIB@/ocamlgraph/
+ OCAMLBEST= @OCAMLBEST@
+ OCAMLVERSION = @OCAMLVERSION@
+ OCAMLWEB = @OCAMLWEB@
+@@ -147,6 +147,7 @@
  VIEWER_CMO:=$(patsubst %,$(VIEWER_DIR)/%.cmo, $(VIEWER_CMO))
-+endif
  VIEWER_CMX=$(VIEWER_CMO:.cmo=.cmx)
  VIEWER_CMI=$(VIEWER_CMO:.cmo=.cmi)
 +VIEWER_OFILES=$(VIEWER_CMO:.cmo=.o)
  
  VIEWER_INCLUDES= @INCLUDEGTK2@ -I $(VIEWER_DIR) $(INCLUDES) -I .
  
-@@ -240,49 +243,36 @@
+@@ -175,6 +176,7 @@
+ DGRAPH_CMO:=$(patsubst %,$(DGRAPH_DIR)/%.cmo, $(DGRAPH_CMO))
+ DGRAPH_CMX=$(DGRAPH_CMO:.cmo=.cmx)
+ DGRAPH_CMI=$(DGRAPH_CMO:.cmo=.cmi)
++DGRAPH_OFILES=$(DGRAPH_CMO:.cmo=.o)
  
- DESTDIR	=
+ DGRAPH_INCLUDES= @INCLUDEGTK2@ -I $(DGRAPH_DIR) $(INCLUDES) -I .
  
--install: install-$(OCAMLBEST) install-byte
--ifeq (@LABLGNOMECANVAS@,yes)
--ifeq ($(OCAMLBEST),byte)
+@@ -271,41 +273,42 @@
+ install: install-$(OCAMLBEST) install-byte
+ ifeq (@LABLGNOMECANVAS@,yes)
+ ifeq ($(OCAMLBEST),byte)
 -	cp -f $(BINDIR)/graph-editor.byte $(BINDIR)/graph-editor$(EXE)
 -	cp -f $(BINDIR)/graph-viewer.byte $(BINDIR)/graph-viewer$(EXE)
-+ifdef OCAMLFIND
-+install-findlib: META install-bin
-+ifeq ($(OCAMLBEST),opt)
-+	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli view_graph/*.mli view_graph/viewGraph_test.ml \
-+		graph$(LIBEXT) graph.cmx graph.o graph.cmo graph.cmi $(CMA) $(CMXA) \
-+		$(VIEWER_CMX) $(VIEWER_CMO) $(VIEWER_CMI) $(VIEWER_OFILES)
++	mv $(BINDIR)/ocamlgraph-editor.byte $(BINDIR)/ocamlgraph-editor$(EXE)
++	mv $(BINDIR)/ocamlgraph-viewer.byte $(BINDIR)/ocamlgraph-viewer$(EXE)
  else
 -	cp -f $(BINDIR)/graph-editor.opt $(BINDIR)/graph-editor$(EXE)
 -	cp -f $(BINDIR)/graph-viewer.opt $(BINDIR)/graph-viewer$(EXE)
--endif
-+	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli view_graph/*.mli \
-+		graph.cmo graph.cmi $(CMA) view_graph/viewGraph_test.ml \
-+		$(VIEWER_CMO) $(VIEWER_CMI)
++	mv $(BINDIR)/ocamlgraph-editor.opt $(BINDIR)/ocamlgraph-editor$(EXE)
++	mv $(BINDIR)/ocamlgraph-viewer.opt $(BINDIR)/ocamlgraph-viewer$(EXE)
  endif
--
--install-byte: 
--	cp -f graph.cmo graph.cmi $(CMA) "$(DESTDIR)$(OCAMLLIB)"
--ifeq (@LABLGNOMECANVAS@,yes)
+ endif
+ 
+ install-byte: 
++	mkdir -p "$(DESTDIR)$(OCAMLLIB)"
+ 	cp -f graph.cmo graph.cmi $(CMA) "$(DESTDIR)$(OCAMLLIB)"
+ ifeq (@LABLGNOMECANVAS@,yes)
 -	cp -f $(ED_DIR)/editor.byte $(BINDIR)/graph-editor.byte
 -	cp -f $(VIEWER_CMO) "$(DESTDIR)$(OCAMLLIB)"
--	cp -f $(VIEWER_DIR)/viewgraph.byte $(BINDIR)/graph-viewer.byte
+-	cp -f $(DGRAPH_CMO) "$(DESTDIR)$(OCAMLLIB)"
+-	cp -f $(DGRAPH_DIR)/dgraph.byte $(BINDIR)/graph-viewer.byte
++	cp -f $(ED_DIR)/editor.byte $(BINDIR)/ocamlgraph-editor.byte
++	cp -f $(VIEWER_CMO) $(VIEWER_CMI) "$(DESTDIR)$(OCAMLLIB)"
++	cp -f $(DGRAPH_CMO) $(DGRAPH_CMI) "$(DESTDIR)$(OCAMLLIB)"
++	cp -f $(DGRAPH_DIR)/dgraph.byte $(BINDIR)/ocamlgraph-viewer.byte
  endif
  
--install-opt: install-byte
--	cp -f graph$(LIBEXT) graph.cmx $(CMXA) "$(DESTDIR)$(OCAMLLIB)"
--ifeq (@LABLGNOMECANVAS@,yes)
+ install-opt: install-byte
++	mkdir -p "$(DESTDIR)$(OCAMLLIB)"
+ 	cp -f graph$(LIBEXT) graph.cmx $(CMXA) "$(DESTDIR)$(OCAMLLIB)"
+ ifeq (@LABLGNOMECANVAS@,yes)
 -	cp -f $(ED_DIR)/editor.opt $(BINDIR)/graph-editor.opt
 -	cp -f $(VIEWER_CMX) "$(DESTDIR)$(OCAMLLIB)"
--	cp -f $(VIEWER_DIR)/viewgraph.opt $(BINDIR)/graph-viewer.opt
--endif
-+META: META.in Makefile
-+	sed -e s/VERSION/$(VERSION)/ -e s/CMA/$(CMA)/ -e s/CMXA/$(CMXA)/ \
-+		$@.in > $@
+-	cp -f $(DGRAPH_CMX) "$(DESTDIR)$(OCAMLLIB)"
+-	cp -f $(DGRAPH_DIR)/dgraph.opt $(BINDIR)/graph-viewer.opt
++	cp -f $(ED_DIR)/editor.opt $(BINDIR)/ocamlgraph-editor.opt
++	cp -f $(VIEWER_CMX) $(VIEWER_OFILES) "$(DESTDIR)$(OCAMLLIB)"
++	cp -f $(DGRAPH_CMX) $(DGRAPH_OFILES) "$(DESTDIR)$(OCAMLLIB)"
++	cp -f $(DGRAPH_DIR)/dgraph.opt $(BINDIR)/ocamlgraph-viewer.opt
+ endif
  
--install-findlib: META
--ifdef OCAMLFIND
-+install-bin:
+ install-findlib: META
+ ifdef OCAMLFIND
  ifeq (@LABLGNOMECANVAS@,yes)
--	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
+ 	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
 -		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \
--		$(VIEWER_CMX) $(VIEWER_CMO)
-+	cp -f $(ED_DIR)/editor.byte $(BINDIR)/ocamlgraph-editor.byte
-+	cp -f $(VIEWER_DIR)/viewgraph.byte $(BINDIR)/ocamlgraph-viewer.byte
-+ifeq ($(OCAMLBEST),opt)
-+	cp -f $(ED_DIR)/editor.opt $(BINDIR)/ocamlgraph-editor$(EXE)
-+	cp -f $(VIEWER_DIR)/viewgraph.opt $(BINDIR)/ocamlgraph-viewer$(EXE)
+-		$(VIEWER_CMX) $(VIEWER_CMO) $(DGRAPH_CMX) $(DGRAPH_CMO)
++		dgraph/*.mli dgraph/viewer.ml dgraph/dGraphViewer.ml \
++		view_graph/*.mli view_graph/viewGraph_test.ml
  else
 -	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
 -		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
-+	mv -f $(BINDIR)/ocamlgraph-editor.byte $(BINDIR)/ocamlgraph-editor$(EXE)
-+	mv -f $(BINDIR)/ocamlgraph-viewer.byte $(BINDIR)/ocamlgraph-viewer$(EXE)
++	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli
  endif
  endif
  
--META: META.in Makefile
--	sed -e s/VERSION/$(VERSION)/ -e s/CMA/$(CMA)/ -e s/CMXA/$(CMXA)/ \
--		$@.in > $@
--
- # documentation
- ###############
- 

-- 
ocamlgraph packaging

More information about the Pkg-ocaml-maint-commits mailing list