[Pkg-ocaml-maint-commits] [SCM] jocaml packaging branch, master, updated. upstream/3.11.0-17-g7c02d6b

Samuel Mimram samuel.mimram at ens-lyon.org
Fri Feb 27 18:51:44 UTC 2009


The following commit has been merged in the master branch:
commit 595e7ba8dbf8d46e6c39ebbe352e85a5044f7e92
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Fri Feb 27 19:29:27 2009 +0100

    Add missing manpages + fix lintian overrides.

diff --git a/debian/changelog b/debian/changelog
index 8c60802..fd453a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jocaml (3.11.0-1) UNRELEASED; urgency=low
+jocaml (3.11.0-1) unstable; urgency=low
 
   [ Mehdi Dogguy ]
   * Initial release, closes: #451797.
diff --git a/debian/copyright b/debian/copyright
index 4927956..ac6ea74 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,13 +14,12 @@ Upstream authors :
 
 Copyright: 
 
-    Copyright 2000-2008 Institut National de Recherche en Informatique et en
+    Copyright 2000-2009 Institut National de Recherche en Informatique et en
     Automatique (INRIA).
 
 License:
 
-
-    JoCaml licence is exactly Objective Caml licence : 
+    JoCaml licence is exactly Objective Caml's licence:
 
 In the following, "the Library" refers to all files marked "Copyright
 INRIA" in the following directories and their sub-directories:
@@ -651,4 +650,3 @@ That's all there is to it!
 
 The Debian packaging is (C) 2008, Mehdi Dogguy <dogguy at pps.jussieu.fr> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
diff --git a/debian/jocaml.dirs.in b/debian/jocaml.dirs.in
index 2fff24b..7084d85 100644
--- a/debian/jocaml.dirs.in
+++ b/debian/jocaml.dirs.in
@@ -1,2 +1,3 @@
 usr/bin
 @JOCamlStdlibDir@
+usr/share/lintian/overrides
diff --git a/debian/jocaml.install.in b/debian/jocaml.install.in
index 50cef81..4eca1cf 100644
--- a/debian/jocaml.install.in
+++ b/debian/jocaml.install.in
@@ -25,3 +25,4 @@ usr/bin/jocamlyacc
 @JOCamlStdlibDir@/vmthreads/*.mli
 @JOCamlStdlibDir@/vmthreads/*.a
 @JOCamlStdlibDir@/vmthreads/*.cmi
+usr/share/lintian/overrides/jocaml
diff --git a/debian/jocaml.lintian-overrides.in b/debian/jocaml.lintian-overrides.in
index cfa1636..03b1511 100644
--- a/debian/jocaml.lintian-overrides.in
+++ b/debian/jocaml.lintian-overrides.in
@@ -1,14 +1,14 @@
-ocaml-nox: script-not-executable . at JOCamlStdlibDir@/camlheader
-W: jocaml: unusual-interpreter ./usr/bin/jocaml #!/usr/bin/jocamlrun
-W: jocaml: unusual-interpreter ./usr/bin/jocamlc #!/usr/bin/jocamlrun
-W: jocaml: unusual-interpreter ./usr/bin/jocamlcp #!/usr/bin/jocamlrun
-W: jocaml: unusual-interpreter ./usr/bin/jocamldep #!/usr/bin/jocamlrun
-W: jocaml: unusual-interpreter ./usr/bin/jocamllex #!/usr/bin/jocamlrun
-W: jocaml: unusual-interpreter ./usr/bin/jocamlmklib #!/usr/bin/jocamlrun
-W: jocaml: unusual-interpreter ./usr/bin/jocamlopt #!/usr/bin/jocamlrun
-W: jocaml: unusual-interpreter ./usr/bin/jocamlprof #!/usr/bin/jocamlrun
-W: jocaml: unusual-interpreter . at JOCamlStdlibDir@/addlabels #!/usr/bin/jocamlrun
-W: jocaml: unusual-interpreter . at JOCamlStdlibDir@/camlheader #!/usr/bin/jocamlrun
-W: jocaml: unusual-interpreter . at JOCamlStdlibDir@/expunge #!/usr/bin/jocamlrun
-W: jocaml: unusual-interpreter . at JOCamlStdlibDir@/extract_crc #!/usr/bin/jocamlrun
-W: jocaml: unusual-interpreter . at JOCamlStdlibDir@/scrapelabels #!/usr/bin/jocamlrun
+jocaml: script-not-executable . at JOCamlStdlibDir@/camlheader
+jocaml: unusual-interpreter ./usr/bin/jocaml #!/usr/bin/jocamlrun
+jocaml: unusual-interpreter ./usr/bin/jocamlc #!/usr/bin/jocamlrun
+jocaml: unusual-interpreter ./usr/bin/jocamlcp #!/usr/bin/jocamlrun
+jocaml: unusual-interpreter ./usr/bin/jocamldep #!/usr/bin/jocamlrun
+jocaml: unusual-interpreter ./usr/bin/jocamllex #!/usr/bin/jocamlrun
+jocaml: unusual-interpreter ./usr/bin/jocamlmklib #!/usr/bin/jocamlrun
+jocaml: unusual-interpreter ./usr/bin/jocamlopt #!/usr/bin/jocamlrun
+jocaml: unusual-interpreter ./usr/bin/jocamlprof #!/usr/bin/jocamlrun
+jocaml: unusual-interpreter . at JOCamlStdlibDir@/addlabels #!/usr/bin/jocamlrun
+jocaml: unusual-interpreter . at JOCamlStdlibDir@/camlheader #!/usr/bin/jocamlrun
+jocaml: unusual-interpreter . at JOCamlStdlibDir@/expunge #!/usr/bin/jocamlrun
+jocaml: unusual-interpreter . at JOCamlStdlibDir@/extract_crc #!/usr/bin/jocamlrun
+jocaml: unusual-interpreter . at JOCamlStdlibDir@/scrapelabels #!/usr/bin/jocamlrun
diff --git a/debian/jocaml.manpages b/debian/jocaml.manpages
index 3383eff..b68ed0a 100644
--- a/debian/jocaml.manpages
+++ b/debian/jocaml.manpages
@@ -1,8 +1,10 @@
 debian/man/jocaml.1
 debian/man/jocamlc.1
+debian/man/jocamlcp.1
 debian/man/jocamldep.1
 debian/man/jocamllex.1
 debian/man/jocamlmktop.1
 debian/man/jocamlopt.1
+debian/man/jocamlprof.1
 debian/man/jocamlyacc.1
 debian/man/jocamlmklib.1
diff --git a/debian/man/jocamlcp.1 b/debian/man/jocamlcp.1
new file mode 100644
index 0000000..57c414a
--- /dev/null
+++ b/debian/man/jocamlcp.1
@@ -0,0 +1,99 @@
+\" $Id: ocamlcp.m,v 1.4 2008/09/15 14:05:30 doligez Exp $
+
+.TH JOCAMLCP 1
+
+.SH NAME
+Jocamlcp \- The JoCaml profiling compiler
+
+.SH SYNOPSIS
+.B jocamlcp
+[
+.I jocamlcp options
+]
+[
+.BI \-p \ flags
+]
+.I filename ...
+
+.SH DESCRIPTION
+The
+.B jocamlcp
+command is a front-end to
+.BR jocamlc (1)
+that instruments the source code, adding code to record how many times
+functions are called, branches of conditionals are taken, ...
+Execution of instrumented code produces an execution profile in the
+file ocamlprof.dump, which can be read using
+.BR jocamlprof (1).
+
+.B jocamlcp
+accepts the same arguments and options as
+.BR jocamlc (1).
+
+.SH OPTIONS
+
+In addition to the
+.BR jocamlc (1)
+options,
+.B jocamlcp
+accepts the following option controlling the amount of profiling
+information:
+.TP
+.BI \-p \ letters
+The
+.I letters
+indicate which parts of the program should be profiled:
+.TP
+.B a
+all options
+.TP
+.B f
+function calls : a count point is set at the beginning of each function body
+.TP
+.B i
+.BR if \ ... \ then \ ... \ else :
+count points are set in both
+.BR then \ and \ else
+branches
+.TP
+.B l
+\BR while , \ for
+loops: a count point is set at the beginning of the loop body
+.TP
+.B m
+.B match
+branches: a count point is set at the beginning of the
+body of each branch of a pattern-matching
+.TP
+.B t
+.BR try \ ... \ with
+branches: a count point is set at the beginning of the body of each
+branch of an exception catcher
+
+.PP
+For instance, compiling with
+.B jocamlcp\ \-pfilm
+profiles function calls,
+.BR if \ ... \ then \ ... \ else \ ...,
+loops, and pattern matching.
+
+Calling
+.BR jocamlcp (1)
+without the
+.B \-p
+option defaults to
+.B \-p\ fm
+meaning that only function calls and pattern matching are profiled.
+
+Note: due to the implementation of streams and stream patterns as
+syntactic sugar, it is hard to predict what parts of stream expressions
+and patterns will be profiled by a given flag.  To profile a program with
+streams, we recommend using
+.BR jocamlcp\ \-p\ a .
+
+.SH SEE ALSO
+.BR jocamlc (1),
+.BR jocamlprof (1).
+.br
+.IR "The Objective Caml user's manual" ,
+chapter "Profiling".
diff --git a/debian/man/jocamlprof.1 b/debian/man/jocamlprof.1
new file mode 100644
index 0000000..a0d855f
--- /dev/null
+++ b/debian/man/jocamlprof.1
@@ -0,0 +1,73 @@
+\" $Id: ocamlprof.m,v 1.6 2008/09/15 14:25:42 doligez Exp $
+.TH JOCAMLPROF 1
+
+.SH NAME
+jocamlprof \- The JoCaml profiler
+
+.SH SYNOPSIS
+.B jocamlprof
+[
+.BI \-f \ dump-file
+]
+[
+.BI \-F \ text
+]
+.I filename ...
+
+.SH DESCRIPTION
+The
+.B jocamlprof
+command prints execution counts gathered during the execution of a
+Objective Caml program instrumented with
+.BR jocamlcp (1).
+
+It produces a source listing of the program modules given as arguments
+where execution counts have been inserted as comments. For instance,
+
+.B jocamlprof foo.ml
+
+prints the source code for the foo module, with comments indicating
+how many times the functions in this module have been called. Naturally,
+this information is accurate only if the source file has not been modified
+since the profiling execution took place.
+
+.SH OPTIONS
+
+.TP
+.BI \-f \ dumpfile
+Specifies an alternate dump file of profiling information.
+.TP
+.BI \-F \ string
+Specifies an additional string to be output with profiling information.
+By default,
+.BR jocamlprof (1)
+will annotate programs with comments of the form
+.BI (* \ n \ *)
+where
+.I n
+is the counter value for a profiling point. With option
+.BI \-F \ s
+the annotation will be
+.BI (* \ sn \ *)
+.TP
+.BI \-impl \ filename
+Compile the file
+.I filename
+as an implementation file, even if its extension is not .ml.
+.TP
+.BI \-intf \ filename
+Compile the file
+.I filename
+as an interface file, even if its extension is not .mli.
+.TP
+.B \-version
+Print the version number of jocamlprof and exit.
+.TP
+.BR \-help \ or \ \-\-help
+Display a short usage summary and exit.
+
+.SH SEE ALSO
+.BR jocamlcp (1).
+.br
+.IR "The Objective Caml user's manual" ,
+chapter "Profiling".
diff --git a/debian/rules b/debian/rules
index d8b667c..9df4e96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,7 +74,7 @@ install: build-arch build-indep
 	dh_prep
 	dh_installdirs
 ifneq ($(JOCAML_OPT_ARCH),)
-	cp  debian/jocaml.links.opt debian/jocaml.links
+	cp debian/jocaml.links.opt debian/jocaml.links
 endif
 	mkdir -p $(CURDIR)/debian/tmp/usr
 	$(MAKE) PREFIX=$(CURDIR)/debian/tmp/usr LIBDIR=$(CURDIR)/debian/tmp/usr/lib/jocaml/$(JOCAML_ABI) install
@@ -82,7 +82,8 @@ endif
 	    for i in ocamldep ocamldep.opt ocamlprof ocamlcp ocamlmktop ocamlmklib; do \
 	        if [ -e $i ]; then mv $$i j$$i; fi; \
 	    done
-
+	mkdir -p debian/tmp/usr/share/lintian/overrides
+	cp debian/jocaml.lintian-overrides debian/tmp/usr/share/lintian/overrides/jocaml
 
 binary-common:
 	dh_testdir

-- 
jocaml packaging



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