[Pkg-ocaml-maint-commits] r2634 - in
trunk/packages/menhir/trunk/debian: . patches
Samuel Mimram
smimram at costa.debian.org
Wed Apr 19 19:33:45 UTC 2006
Author: smimram
Date: 2006-04-19 19:33:44 +0000 (Wed, 19 Apr 2006)
New Revision: 2634
Added:
trunk/packages/menhir/trunk/debian/menhir.1
trunk/packages/menhir/trunk/debian/patches/
trunk/packages/menhir/trunk/debian/patches/00list
trunk/packages/menhir/trunk/debian/patches/makefile.dpatch
Modified:
trunk/packages/menhir/trunk/debian/
trunk/packages/menhir/trunk/debian/changelog
trunk/packages/menhir/trunk/debian/control
trunk/packages/menhir/trunk/debian/rules
Log:
Finalized package.
Property changes on: trunk/packages/menhir/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Modified: trunk/packages/menhir/trunk/debian/changelog
===================================================================
--- trunk/packages/menhir/trunk/debian/changelog 2006-04-19 17:33:50 UTC (rev 2633)
+++ trunk/packages/menhir/trunk/debian/changelog 2006-04-19 19:33:44 UTC (rev 2634)
@@ -1,6 +1,6 @@
menhir (20060412-1) unstable; urgency=low
- * Initial release Closes: #nnnn (nnnn is the bug number of your ITP)
+ * Initial release, closes: #363539.
-- Samuel Mimram <smimram at debian.org> Wed, 19 Apr 2006 19:11:20 +0200
Modified: trunk/packages/menhir/trunk/debian/control
===================================================================
--- trunk/packages/menhir/trunk/debian/control 2006-04-19 17:33:50 UTC (rev 2633)
+++ trunk/packages/menhir/trunk/debian/control 2006-04-19 19:33:44 UTC (rev 2634)
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09), ocaml-findlib
+Build-Depends: debhelper (>= 4.0.0), dpatch, ocaml-nox (>= 3.09), ocaml-findlib
Standards-Version: 3.6.2
Package: menhir
@@ -11,10 +11,10 @@
Description: Parser generator for OCaml
Menhir is a LR(1) parser generator for OCaml. It is mostly compatible
with the standard ocamlyacc and has the following enhancements:
- * it accepts LR(1) grammars,
- * it offers parameterized nonterminal symbols as well as a library of
- standard definitions,
- * it explains conflicts in terms of the grammar,
- * it allows grammar specifications to be split over multiple files and
- parametrized by OCaml modules,
- * it produces reentrant parsers.
+ * it accepts LR(1) grammars,
+ * it offers parameterized nonterminal symbols as well as a library of
+ standard definitions,
+ * it explains conflicts in terms of the grammar,
+ * it allows grammar specifications to be split over multiple files and
+ parametrized by OCaml modules,
+ * it produces reentrant parsers.
Added: trunk/packages/menhir/trunk/debian/menhir.1
===================================================================
--- trunk/packages/menhir/trunk/debian/menhir.1 2006-04-19 17:33:50 UTC (rev 2633)
+++ trunk/packages/menhir/trunk/debian/menhir.1 2006-04-19 19:33:44 UTC (rev 2634)
@@ -0,0 +1,125 @@
+.\" Hey, EMACS: -*- nroff -*-
+.TH MENHIR 1 "April 19, 2006"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+
+
+.SH NAME
+menhir \- parser generator for OCaml
+
+
+.SH SYNOPSIS
+.B menhir
+.RI [ options ] " files"
+.SH DESCRIPTION
+.B menhir
+is a LR(1) parser generator for the Objective Caml programming language. That is, Menhir compiles LR(1) grammar specifications down to Objective Caml code. It is mostly compatible with
+.BR ocamlyacc (1).
+
+
+.SH OPTIONS
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.BI \-b,\ \-\-base\ basename
+Specifies a base name for the output file(s).
+.TP
+.B \-\-comment
+Include comments in the generated code.
+.TP
+.B \-\-depend
+Invoke ocamldep and display dependencies.
+.TP
+.B \-\-dump
+Describe the automaton in
+.IR basename .automaton.
+.TP
+.B \-\-error\-recovery
+Attempt recovery by discarding tokens after errors.
+.TP
+.B \-\-explain
+Explain conflicts in
+.IR basename .conflicts.
+.TP
+.BI \-\-external\-tokens\ module
+Import token type definition from
+.IR module .
+.TP
+.B \-\-graph
+Write the grammar's dependency graph to
+.IR basename .dot.
+.TP
+.B \-\-infer
+Invoke ocamlc for ahead of time type inference.
+.TP
+.BI \-la,\ \-\-log\-automaton\ level
+Log information about the automaton.
+.TP
+.BI \-lc,\ \-\-log\-code\ level
+Log information about the generated code.
+.TP
+.BI \-lg,\ \-\-log\-grammar\ level
+Log information about the grammar.
+.TP
+.B \-\-no\-code\-inlining
+(undocumented)
+.TP
+.B \-\-no\-inline
+Ignore the %inline keyword.
+.TP
+.B \-\-no\-prefix
+(undocumented)
+.TP
+.B \-\-no\-stdlib
+Do not load the standard library.
+.TP
+.BI \-\-ocamlc\ command
+Specifies how ocamlc should be invoked.
+.TP
+.BI \-\-ocamldep\ command
+Specifies how ocamldep should be invoked.
+.TP
+.B \-\-only\-preprocess
+Print a simplified grammar and exit.
+.TP
+.B \-\-only\-tokens
+Generate token type definition only, no code.
+.TP
+.B \-\-timings
+Display internal timings.
+.TP
+.B \-\-trace
+Include tracing instructions in the generated code.
+.TP
+.BI \-\-stdlib\ directory
+Specify where the standard library lies.
+.TP
+.B \-v
+Synonymous with
+.BR \-\-dump\ \-\-explain .
+
+
+.SH SEE ALSO
+.BR ocaml (1).
+
+
+.SH AUTHOR
+.B menhir
+was written by Francois Pottier and Yann Regis-Gianas.
+.PP
+This manual page was written by Samuel Mimram <smimram at debian.org>,
+for the Debian project (but may be used by others).
Added: trunk/packages/menhir/trunk/debian/patches/00list
===================================================================
--- trunk/packages/menhir/trunk/debian/patches/00list 2006-04-19 17:33:50 UTC (rev 2633)
+++ trunk/packages/menhir/trunk/debian/patches/00list 2006-04-19 19:33:44 UTC (rev 2634)
@@ -0,0 +1 @@
+makefile
Added: trunk/packages/menhir/trunk/debian/patches/makefile.dpatch
===================================================================
--- trunk/packages/menhir/trunk/debian/patches/makefile.dpatch 2006-04-19 17:33:50 UTC (rev 2633)
+++ trunk/packages/menhir/trunk/debian/patches/makefile.dpatch 2006-04-19 19:33:44 UTC (rev 2634)
@@ -0,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## makefile.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allow compilation on non-native archs.
+
+ at DPATCH@
+diff -urNad menhir-20060412~/Makefile menhir-20060412/Makefile
+--- menhir-20060412~/Makefile 2006-04-19 19:28:11.000000000 +0000
++++ menhir-20060412/Makefile 2006-04-19 19:28:11.000000000 +0000
+@@ -52,6 +52,7 @@
+ libdir := ${PREFIX}/share/$(EXECUTABLE)
+ DOCS := manual.pdf demos
+ LIBS := standard.mly
++BEST := opt
+
+ # ----------------------------------------------------------------------------
+ # Common compilation rules.
+@@ -93,7 +94,7 @@
+ # Checking the version of the ocaml compiler.
+
+ versioncheck:
+- @ echo Checking that $(CAMLOPT) is recent enough...
+- @ $(CAMLOPT) str.cmxa check-ocaml-version.ml -o check-ocaml-version
++ @ echo Checking that $(CAMLC) is recent enough...
++ @ $(CAMLC) str.cma check-ocaml-version.ml -o check-ocaml-version
+ @ ./check-ocaml-version --verbose --gt "3.09"
+
+diff -urNad menhir-20060412~/Makefile.common menhir-20060412/Makefile.common
+--- menhir-20060412~/Makefile.common 2006-04-19 19:28:11.000000000 +0000
++++ menhir-20060412/Makefile.common 2006-04-19 19:29:37.000000000 +0000
+@@ -50,8 +50,8 @@
+ grammar item lr0 lr1 lr1partial derivation conflict \
+ invariant code traverse inliner back
+
+-OBJECTS := $(MODULES:=.cmo)
+-XBJECTS := $(MODULES:=.cmx)
++CM := $(shell if [ $(BEST) = opt ]; then echo cmx; else echo cmo; fi)
++OBJECTS := $(MODULES:=.$(CM))
+
+ # -------------------------------------------------------------------------
+
+@@ -97,11 +97,12 @@
+
+ executables: $(EXECUTABLE)
+
+-$(EXECUTABLE): $(XBJECTS)
+- $(CAMLOPT) -o $(EXECUTABLE) $(LNKOFLAGS) $(XBJECTS)
+-
+-$(EXECUTABLE).byte: $(OBJECTS)
+- $(CAMLC) -o $(EXECUTABLE).byte $(LNKBFLAGS) $(OBJECTS)
++$(EXECUTABLE): $(OBJECTS)
++ if [ $(BEST) = opt ] ; then \
++ $(CAMLOPT) -o $(EXECUTABLE) $(LNKOFLAGS) $(OBJECTS); \
++ else \
++ $(CAMLC) -o $(EXECUTABLE) $(LNKBFLAGS) $(OBJECTS); \
++ fi
+
+ # -------------------------------------------------------------------------
+
Property changes on: trunk/packages/menhir/trunk/debian/patches/makefile.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/menhir/trunk/debian/rules
===================================================================
--- trunk/packages/menhir/trunk/debian/rules 2006-04-19 17:33:50 UTC (rev 2633)
+++ trunk/packages/menhir/trunk/debian/rules 2006-04-19 19:33:44 UTC (rev 2634)
@@ -9,13 +9,20 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# Include dpatch stuff.
+include /usr/share/dpatch/dpatch.make
+
build: build-stamp
-build-stamp:
+build-stamp: patch-stamp
dh_testdir
- $(MAKE)
+ if [ -e /usr/bin/ocamlopt ]; then \
+ $(MAKE); \
+ else \
+ $(MAKE) BEST=byte; \
+ fi
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -31,6 +38,7 @@
dh_installdirs
$(MAKE) install PREFIX=$(CURDIR)/debian/menhir/usr
+ rm -rf $(CURDIR)/debian/menhir/usr/doc
# Build architecture-independent files here.
@@ -45,7 +53,7 @@
dh_installdocs
dh_installexamples
dh_install
- dh_installman
+ dh_installman debian/menhir.1
dh_link
dh_strip
dh_compress
@@ -57,4 +65,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
More information about the Pkg-ocaml-maint-commits
mailing list