New upstream version.
This commit is contained in:
Jerry James
parent
578745370d
commit
ae9a69dec7
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
/menhir-20140422.tar.gz
|
||||
/menhir-20141215.tar.gz
|
||||
|
||||
@ -1,123 +1,33 @@
|
||||
From 9b49e1917d623f7058a135bbfe1facbe1f700540 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Tsai <scottt.tw@gmail.com>
|
||||
Date: Sat, 17 Dec 2011 09:35:18 +0800
|
||||
Subject: [PATCH] Makfile: use menhir-ocamldep instead off ocamldep.wrapper
|
||||
|
||||
---
|
||||
demos/Makefile.shared | 2 +-
|
||||
demos/OMakefile.shared | 2 +-
|
||||
demos/calc-param/Makefile | 1 -
|
||||
demos/calc-param/OMakefile | 6 +++---
|
||||
demos/calc-two/Makefile | 1 -
|
||||
demos/calc-two/OMakefile | 5 ++---
|
||||
demos/calc/Makefile | 1 -
|
||||
demos/calc/OMakefile | 1 -
|
||||
8 files changed, 7 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/demos/Makefile.shared b/demos/Makefile.shared
|
||||
index 93add01..29e2207 100644
|
||||
--- a/demos/Makefile.shared
|
||||
+++ b/demos/Makefile.shared
|
||||
--- a/demos/calc-param/Makefile 2014-12-15 08:25:48.000000000 -0700
|
||||
+++ b/demos/calc-param/Makefile 2015-01-05 09:31:35.269645018 -0700
|
||||
@@ -7,7 +7,7 @@ PGFLAGS := --infer
|
||||
GENERATED := parser.ml parser.mli lexer.ml tokens.ml tokens.mli
|
||||
MODULES := parser lexer calc
|
||||
EXECUTABLE := calc
|
||||
-OCAMLDEPWRAPPER := ../ocamldep.wrapper
|
||||
+OCAMLDEPWRAPPER := /usr/bin/menhir-ocamldep
|
||||
include ../Makefile.shared
|
||||
$(eval $(call menhir_monomodule,tokens,--only-tokens))
|
||||
$(eval $(call menhir_multimodule,parser,tokens.mly parser.mly,--external-tokens Tokens))
|
||||
--- a/demos/calc-two/Makefile 2014-12-15 08:25:48.000000000 -0700
|
||||
+++ b/demos/calc-two/Makefile 2015-01-05 09:31:14.749651303 -0700
|
||||
@@ -7,7 +7,7 @@ PGFLAGS := --infer
|
||||
GENERATED := tokens.ml tokens.mli algebraic.ml algebraic.mli reverse.ml reverse.mli lexer.ml
|
||||
MODULES := algebraic reverse lexer calc
|
||||
EXECUTABLE := calc
|
||||
-OCAMLDEPWRAPPER := ../ocamldep.wrapper
|
||||
+OCAMLDEPWRAPPER := /usr/bin/menhir-ocamldep
|
||||
include ../Makefile.shared
|
||||
$(eval $(call menhir_monomodule,tokens,--only-tokens))
|
||||
$(eval $(call menhir_multimodule,algebraic,tokens.mly algebraic.mly common.mly,--external-tokens Tokens))
|
||||
--- a/demos/Makefile.shared 2014-12-15 08:25:48.000000000 -0700
|
||||
+++ b/demos/Makefile.shared 2015-01-05 09:32:05.653628941 -0700
|
||||
@@ -119,7 +119,7 @@ ifndef OCAMLDEP
|
||||
endif
|
||||
|
||||
ifndef OCAMLDEPWRAPPER
|
||||
- OCAMLDEPWRAPPER:= ./ocamldep.wrapper
|
||||
+ OCAMLDEPWRAPPER:= $(shell which menhir-ocamldep)
|
||||
+ OCAMLDEPWRAPPER:= /usr/bin/menhir-ocamldep
|
||||
endif
|
||||
|
||||
ifndef OCAMLLEX
|
||||
diff --git a/demos/OMakefile.shared b/demos/OMakefile.shared
|
||||
index af8e0ca..4ff1157 100644
|
||||
--- a/demos/OMakefile.shared
|
||||
+++ b/demos/OMakefile.shared
|
||||
@@ -139,7 +139,7 @@ if $(not $(defined OCAMLDEP))
|
||||
export
|
||||
|
||||
if $(not $(defined OCAMLDEPWRAPPER))
|
||||
- OCAMLDEPWRAPPER = ./ocamldep.wrapper
|
||||
+ OCAMLDEPWRAPPER = $(shell which menhir-ocamldep)
|
||||
export
|
||||
|
||||
if $(not $(defined OCAMLLEX))
|
||||
diff --git a/demos/calc-param/Makefile b/demos/calc-param/Makefile
|
||||
index 35d91ef..2f10b9a 100644
|
||||
--- a/demos/calc-param/Makefile
|
||||
+++ b/demos/calc-param/Makefile
|
||||
@@ -3,7 +3,6 @@ PGFLAGS := --infer
|
||||
GENERATED := parser.ml parser.mli lexer.ml tokens.ml tokens.mli
|
||||
MODULES := parser lexer calc
|
||||
EXECUTABLE := calc
|
||||
-OCAMLDEPWRAPPER := ../ocamldep.wrapper
|
||||
include ../Makefile.shared
|
||||
$(eval $(call menhir_monomodule,tokens,--only-tokens))
|
||||
$(eval $(call menhir_multimodule,parser,tokens.mly parser.mly,--external-tokens Tokens))
|
||||
diff --git a/demos/calc-param/OMakefile b/demos/calc-param/OMakefile
|
||||
index 3a54e55..9241e7a 100644
|
||||
--- a/demos/calc-param/OMakefile
|
||||
+++ b/demos/calc-param/OMakefile
|
||||
@@ -1,7 +1,7 @@
|
||||
-GENERATED = parser.ml parser.mli lexer.ml
|
||||
+GENERATED = parser.ml parser.mli lexer.ml tokens.ml tokens.mli
|
||||
MODULES = parser lexer calc
|
||||
EXECUTABLE = calc
|
||||
-OCAMLDEPWRAPPER = ../ocamldep.wrapper
|
||||
include ../OMakefile.shared
|
||||
-MenhirAuto()
|
||||
+MenhirMono(tokens,--only-tokens)
|
||||
+MenhirMulti(parser,tokens.mly parser.mly,--external-tokens Tokens)
|
||||
.DEFAULT: $(EXECUTABLE)$(OSUFFIX)
|
||||
diff --git a/demos/calc-two/Makefile b/demos/calc-two/Makefile
|
||||
index 29a6d52..c5dbc39 100644
|
||||
--- a/demos/calc-two/Makefile
|
||||
+++ b/demos/calc-two/Makefile
|
||||
@@ -3,7 +3,6 @@ PGFLAGS := --infer
|
||||
GENERATED := tokens.ml tokens.mli algebraic.ml algebraic.mli reverse.ml reverse.mli lexer.ml
|
||||
MODULES := algebraic reverse lexer calc
|
||||
EXECUTABLE := calc
|
||||
-OCAMLDEPWRAPPER := ../ocamldep.wrapper
|
||||
include ../Makefile.shared
|
||||
$(eval $(call menhir_monomodule,tokens,--only-tokens))
|
||||
$(eval $(call menhir_multimodule,algebraic,tokens.mly algebraic.mly common.mly,--external-tokens Tokens))
|
||||
diff --git a/demos/calc-two/OMakefile b/demos/calc-two/OMakefile
|
||||
index 0cb1482..b725fa6 100644
|
||||
--- a/demos/calc-two/OMakefile
|
||||
+++ b/demos/calc-two/OMakefile
|
||||
@@ -1,9 +1,8 @@
|
||||
GENERATED = tokens.ml tokens.mli algebraic.ml algebraic.mli reverse.ml reverse.mli lexer.ml
|
||||
MODULES = algebraic reverse lexer calc
|
||||
EXECUTABLE = calc
|
||||
-OCAMLDEPWRAPPER = ../ocamldep.wrapper
|
||||
include ../OMakefile.shared
|
||||
MenhirMono(tokens,--only-tokens)
|
||||
-MenhirMulti(algebraic,tokens.mly algebraic.mly,--external-tokens Tokens)
|
||||
-MenhirMulti(reverse,tokens.mly reverse.mly,--external-tokens Tokens)
|
||||
+MenhirMulti(algebraic,tokens.mly algebraic.mly common.mly,--external-tokens Tokens)
|
||||
+MenhirMulti(reverse,tokens.mly reverse.mly common.mly,--external-tokens Tokens)
|
||||
.DEFAULT: $(EXECUTABLE)$(OSUFFIX)
|
||||
diff --git a/demos/calc/Makefile b/demos/calc/Makefile
|
||||
index f411226..f80582d 100644
|
||||
--- a/demos/calc/Makefile
|
||||
+++ b/demos/calc/Makefile
|
||||
@@ -3,6 +3,5 @@ PGFLAGS := --infer
|
||||
GENERATED := parser.ml parser.mli lexer.ml
|
||||
MODULES := parser lexer calc
|
||||
EXECUTABLE := calc
|
||||
-OCAMLDEPWRAPPER := ../ocamldep.wrapper
|
||||
include ../Makefile.shared
|
||||
include ../Makefile.auto
|
||||
diff --git a/demos/calc/OMakefile b/demos/calc/OMakefile
|
||||
index 3a54e55..00e1a5c 100644
|
||||
--- a/demos/calc/OMakefile
|
||||
+++ b/demos/calc/OMakefile
|
||||
@@ -1,7 +1,6 @@
|
||||
GENERATED = parser.ml parser.mli lexer.ml
|
||||
MODULES = parser lexer calc
|
||||
EXECUTABLE = calc
|
||||
-OCAMLDEPWRAPPER = ../ocamldep.wrapper
|
||||
include ../OMakefile.shared
|
||||
MenhirAuto()
|
||||
.DEFAULT: $(EXECUTABLE)$(OSUFFIX)
|
||||
--
|
||||
1.7.7.4
|
||||
|
||||
|
||||
@ -7,13 +7,12 @@
|
||||
%endif
|
||||
|
||||
Name: ocaml-menhir
|
||||
Version: 20140422
|
||||
Release: 7%{?dist}
|
||||
Version: 20141215
|
||||
Release: 1%{?dist}
|
||||
Summary: LR(1) parser generator for OCaml
|
||||
|
||||
# The library is LGPLv2+ with a linking exception.
|
||||
# The remaining code is QPL, with an exception granted to clause 6c.
|
||||
License: (QPL with exceptions) and (LGPLv2+ with exceptions)
|
||||
# The generator is QPL, with an exception granted to clause 6c.
|
||||
License: QPL with exceptions
|
||||
URL: http://gallium.inria.fr/~fpottier/menhir/
|
||||
Source0: http://gallium.inria.fr/~fpottier/menhir/menhir-%{version}.tar.gz
|
||||
# Patch from Scott Tsai to allow demos to build outside of source tree
|
||||
@ -30,6 +29,7 @@ Yann Régis-Gianas.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
# The library is LGPLv2+ with a linking exception.
|
||||
License: LGPLv2+ with exceptions
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
@ -42,24 +42,24 @@ for developing applications that use %{name}.
|
||||
%patch0 -p1
|
||||
|
||||
# Fix encodings
|
||||
for f in AUTHORS menhir.1 src/standard.mly; do
|
||||
for f in AUTHORS menhir.1 src/standard.mly src/*.ml src/*.mli; do
|
||||
iconv -f ISO8859-1 -t UTF-8 $f > $f.fixed
|
||||
touch -r $f $f.fixed
|
||||
mv -f $f.fixed $f
|
||||
done
|
||||
|
||||
# Fix a dependency
|
||||
sed "s|/usr/bin/env ocaml|/usr/bin/ocaml|" demos/ocamldep.wrapper > foo
|
||||
touch -r demos/ocamldep.wrapper foo
|
||||
mv -f foo demos/ocamldep.wrapper
|
||||
sed -i.orig "s|/usr/bin/env ocaml|/usr/bin/ocaml|" demos/ocamldep.wrapper
|
||||
touch -r demos/ocamldep.wrapper.orig demos/ocamldep.wrapper
|
||||
rm -f demos/ocamldep.wrapper.orig
|
||||
chmod a+x demos/ocamldep.wrapper
|
||||
|
||||
# Prevent embedding buildroot paths into the executable
|
||||
sed -i 's/install: all/install:/' Makefile
|
||||
|
||||
# Enable debuginfo
|
||||
sed -i 's/-j 0/-cflag -g -lflag -g &/' src/Makefile
|
||||
|
||||
# Don't ship version control files
|
||||
find demos -name .gitignore\* | xargs rm -f
|
||||
|
||||
%build
|
||||
make PREFIX=%{_prefix} TARGET=%{target}
|
||||
make -C demos clean
|
||||
@ -84,6 +84,9 @@ mv demos/ocamldep.wrapper $RPM_BUILD_ROOT%{_bindir}/menhir-ocamldep
|
||||
%{_libdir}/ocaml/menhirLib/
|
||||
|
||||
%changelog
|
||||
* Mon Jan 5 2015 Jerry James <loganjerry@gmail.com> - 20141215-1
|
||||
- New upstream version
|
||||
|
||||
* Sun Aug 31 2014 Richard W.M. Jones <rjones@redhat.com> - 20140422-7
|
||||
- ocaml-4.02.0 final rebuild.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user