[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, patched, updated. patched/0.1.6.deb+a-3-13-ga7f34a5
Eugeniy Meshcheryakov
eugen at debian.org
Thu Apr 16 20:17:12 UTC 2009
The following commit has been merged in the patched branch:
commit a7f34a596708affd7360d65abb40399dd319b094
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Thu Apr 16 22:15:12 2009 +0200
Patches for version 0.1.7.deb-1
diff --git a/debian/patches/debian/documentation-paths.diff b/debian/patches/debian/documentation-paths.diff
index 6f90071..4876d94 100644
--- a/debian/patches/debian/documentation-paths.diff
+++ b/debian/patches/debian/documentation-paths.diff
@@ -59,4 +59,4 @@ index c38cdc7..b3c1b28 100644
.SH REFERENCES
Y. Padioleau, J.L. Lawall, R.R Hansen, G. Muller
--
-tg: (4d496e1..) debian/documentation-paths (depends on: master)
+tg: (ee0f058..) debian/documentation-paths (depends on: master)
diff --git a/debian/patches/fixes/system-menhir.diff b/debian/patches/fixes/system-menhir.diff
index 26bb2a0..64d4c8c 100644
--- a/debian/patches/fixes/system-menhir.diff
+++ b/debian/patches/fixes/system-menhir.diff
@@ -11,27 +11,28 @@ Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
-index 20475be..c0620b7 100644
+index 631c43b..e1b883e 100644
--- a/Makefile
+++ b/Makefile
-@@ -55,9 +55,9 @@ LIBS=commons/commons.cma globals/globals.cma\
- engine/cocciengine.cma popl09/popl.cma \
- extra/extra.cma $(PYCMA) python/coccipython.cma
+@@ -59,10 +59,10 @@ LIBS=commons/commons.cma \
--MAKESUBDIRS=commons globals menhirlib $(PYDIR) ctl parsing_cocci parsing_c \
-+MAKESUBDIRS=commons globals $(PYDIR) ctl parsing_cocci parsing_c \
- engine popl09 extra python
--INCLUDEDIRS=commons commons/ocamlextra globals menhirlib $(PYDIR) ctl \
-+INCLUDEDIRS=commons commons/ocamlextra globals $(PYDIR) ctl \
- parsing_cocci parsing_c engine popl09 extra python
+ #used for clean: and depend: and a little for rec & rec.opt
+ MAKESUBDIRS=commons ocamlsexp \
+- globals menhirlib $(PYDIR) ctl parsing_cocci parsing_c \
++ globals $(PYDIR) ctl parsing_cocci parsing_c \
+ engine extra python
+ INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
+- globals menhirlib $(PYDIR) ctl \
++ globals $(PYDIR) ctl \
+ parsing_cocci parsing_c engine extra python
##############################################################################
diff --git a/parsing_cocci/Makefile b/parsing_cocci/Makefile
-index b0044d9..23bdc0b 100644
+index cf02ae3..8fb2bfe 100644
--- a/parsing_cocci/Makefile
+++ b/parsing_cocci/Makefile
@@ -40,8 +40,8 @@ get_constants.ml get_constants2.ml parse_cocci.ml
- LIBS=../commons/commons.cma ../globals/globals.cma
+ LIBS=../commons/commons.cma ../globals/globals.cma
SYSLIBS = str.cma unix.cma
-#MENHIR_PATH=$(shell ocamlfind query menhirLib)
@@ -42,4 +43,4 @@ index b0044d9..23bdc0b 100644
INCLUDES = -I ../commons -I ../commons/ocamlextra -I ../globals \
-I $(MENHIR_PATH)
--
-tg: (b7f2651..) fixes/system-menhir (depends on: fixes/system-pycaml)
+tg: (df6f9a4..) fixes/system-menhir (depends on: fixes/system-pycaml)
diff --git a/debian/patches/fixes/system-ocamlsexp.diff b/debian/patches/fixes/system-ocamlsexp.diff
new file mode 100644
index 0000000..3683596
--- /dev/null
+++ b/debian/patches/fixes/system-ocamlsexp.diff
@@ -0,0 +1,102 @@
+From: Eugeniy Meshcheryakov <eugen at debian.org>
+Subject: [PATCH] fixes/system-ocamlsexp
+
+Use Debian's ocamlsexp
+
+Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
+
+---
+ Makefile | 12 +++++-------
+ commons/Makefile | 2 +-
+ commons/sexp_common.ml | 1 +
+ testing.ml | 1 +
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e1b883e..013c9b3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -50,7 +50,7 @@ SEXPSYSCMA=bigarray.cma nums.cma
+
+ SYSLIBS=str.cma unix.cma $(SEXPSYSCMA)
+ LIBS=commons/commons.cma \
+- ocamlsexp/sexplib1.cma commons/commons_sexp.cma \
++ sexplib.cma commons/commons_sexp.cma \
+ globals/globals.cma \
+ ctl/ctl.cma \
+ parsing_cocci/cocci_parser.cma parsing_c/parsing_c.cma \
+@@ -58,10 +58,10 @@ LIBS=commons/commons.cma \
+ extra/extra.cma $(PYCMA) python/coccipython.cma
+
+ #used for clean: and depend: and a little for rec & rec.opt
+-MAKESUBDIRS=commons ocamlsexp \
++MAKESUBDIRS=commons \
+ globals $(PYDIR) ctl parsing_cocci parsing_c \
+ engine extra python
+-INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
++INCLUDEDIRS=commons commons/ocamlextra \
+ globals $(PYDIR) ctl \
+ parsing_cocci parsing_c engine extra python
+
+@@ -90,8 +90,8 @@ OPTFLAGS=
+ # but is now defined above in this file
+ #OPTLIBFLAGS=-cclib dllpycaml_stubs.so
+
+-OCAMLC=ocamlc$(OPTBIN) $(OCAMLCFLAGS) $(INCLUDES)
+-OCAMLOPT=ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES)
++OCAMLC=ocamlc$(OPTBIN) $(OCAMLCFLAGS) $(INCLUDES) -I $(shell ocamlfind query sexplib)
++OCAMLOPT=ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES) -I $(shell ocamlfind query sexplib)
+ OCAMLLEX=ocamllex #-ml # -ml for debugging lexer, but slightly slower
+ OCAMLYACC=ocamlyacc -v
+ OCAMLDEP=ocamldep $(INCLUDES)
+@@ -124,13 +124,11 @@ world: all opt
+
+ subdirs:
+ $(MAKE) -C commons
+- $(MAKE) -C ocamlsexp
+ $(MAKE) -C commons sexp
+ +for D in $(MAKESUBDIRS); do $(MAKE) $$D || exit 1 ; done
+
+ subdirs.opt:
+ $(MAKE) all.opt -C commons
+- $(MAKE) -C ocamlsexp all.opt
+ $(MAKE) -C commons sexp.opt
+ +for D in $(MAKESUBDIRS); do $(MAKE) $$D.opt || exit 1 ; done
+
+diff --git a/commons/Makefile b/commons/Makefile
+index 4073a1f..7a76d19 100644
+--- a/commons/Makefile
++++ b/commons/Makefile
+@@ -72,7 +72,7 @@ REGEXPINCLUDES=-I ../ocamlpcre/lib -I ../../ocamlpcre/lib
+
+ #sexplib
+ MYSEXPSRC=sexp_common.ml
+-SEXPINCLUDES=-I ../ocamlsexp -I ../ocamltarzan/lib-sexp -I ../../ocamltarzan/lib-sexp
++SEXPINCLUDES=-I `ocamlfind query sexplib` -I ../ocamltarzan/lib-sexp -I ../../ocamltarzan/lib-sexp
+ #binprot
+ MYBINSRC=bin_common.ml
+ BININCLUDES=-I ../ocamltarzan/lib-binprot -I ../../ocamltarzan/lib-binprot
+diff --git a/commons/sexp_common.ml b/commons/sexp_common.ml
+index ac5b6a8..2f0c6a0 100644
+--- a/commons/sexp_common.ml
++++ b/commons/sexp_common.ml
+@@ -1,4 +1,5 @@
+ open Common
++open Sexplib
+
+ let either_of_sexp__ =
+ let _loc = "Xxx.either"
+diff --git a/testing.ml b/testing.ml
+index 8dffbb7..8777859 100644
+--- a/testing.ml
++++ b/testing.ml
+@@ -21,6 +21,7 @@
+
+
+ open Common
++open Sexplib
+
+ (*****************************************************************************)
+ (* Test framework *)
+--
+tg: (6adb55e..) fixes/system-ocamlsexp (depends on: fixes/system-menhir)
diff --git a/debian/patches/fixes/system-pycaml.diff b/debian/patches/fixes/system-pycaml.diff
index d50de52..fa04337 100644
--- a/debian/patches/fixes/system-pycaml.diff
+++ b/debian/patches/fixes/system-pycaml.diff
@@ -6,46 +6,47 @@ Use Debian's pycaml instead of included one
Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
---
- Makefile | 9 ++++-----
+ Makefile | 11 +++++------
python/Makefile | 2 +-
python/yes_pycocci.ml | 24 ++++++++++++++++++++----
- 3 files changed, 25 insertions(+), 10 deletions(-)
+ 3 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
-index f516238..20475be 100644
+index 551e7c2..631c43b 100644
--- a/Makefile
+++ b/Makefile
-@@ -35,11 +35,11 @@ SRC=flag_cocci.ml cocci.ml testing.ml test.ml main.ml
-
+@@ -34,11 +34,11 @@ TARGET=spatch
+ SRC=flag_cocci.ml cocci.ml testing.ml test.ml main.ml
ifeq ($(FEATURE_PYTHON),1)
-PYCMA=pycaml/pycaml.cma
-PYDIR=pycaml
-PYLIB=dllpycaml_stubs.so
+-# the following is essential for Coccinelle to compile under gentoo (weird)
+-OPTLIBFLAGS=-cclib dllpycaml_stubs.so
+PYCMA=pycaml.cma
+PYDIR=
+PYLIB=
- # the following is essential for Coccinelle to compile under gentoo (wierd)
--OPTLIBFLAGS=-cclib dllpycaml_stubs.so
++# the following is essential for Coccinelle to compile under gentoo (wierd)
+OPTLIBFLAGS=
else
PYCMA=
PYDIR=
-@@ -224,7 +224,6 @@ install-python:
- $(DESTDIR)$(SHAREDIR)/python/coccilib
- $(INSTALL_DATA) python/coccilib/coccigui/*.py \
+@@ -229,7 +229,6 @@ install-python:
+ $(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
+ $(INSTALL_DATA) python/coccilib/coccigui/pygui.gladep \
$(DESTDIR)$(SHAREDIR)/python/coccilib/coccigui
- $(INSTALL_LIB) dllpycaml_stubs.so $(DESTDIR)$(LIBDIR)
- # user will use spatch to run spatch.opt (native)
- install: all.opt install-common
+ install:
+ @if test -x spatch -a ! -x spatch.opt ; then \
diff --git a/python/Makefile b/python/Makefile
-index 9f16961..c2bf291 100644
+index 16a9407..33e2642 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -30,7 +30,7 @@ TARGET=coccipython
- SOURCES= pycocci_aux.ml pycocci.ml
+ SOURCES= pycocci_aux.ml pycocci.ml
-INCLUDEDIRS = ../commons ../commons/ocamlextra ../globals ../pycaml \
+INCLUDEDIRS = ../commons ../commons/ocamlextra ../globals \
@@ -53,7 +54,7 @@ index 9f16961..c2bf291 100644
SYSLIBS = str.cma unix.cma
diff --git a/python/yes_pycocci.ml b/python/yes_pycocci.ml
-index bb877d5..e8aefff 100644
+index 2ef2807..7949d91 100644
--- a/python/yes_pycocci.ml
+++ b/python/yes_pycocci.ml
@@ -66,6 +66,11 @@ let load_module module_name =
@@ -103,14 +104,14 @@ index bb877d5..e8aefff 100644
let (rule, name) = (Array.get a 1, Array.get a 2) in
let orule = pystring_asstring rule in
let oname = pystring_asstring name in
- let e = List.exists (function (x,y) -> orule = x && oname = y) env in
+ let e = List.exists (function (x,y) -> orule =$= x && oname =$= y) env in
- if e then pytrue () else pyfalse ()
+ if e then _pycocci_true () else _pycocci_false ()
let pyoutputinstance = ref (pynone ())
let pyoutputdict = ref (pynone ())
@@ -178,6 +191,9 @@ let contains_binding e (_,(r,m)) =
- let _ = List.find (function ((re, rm), _) -> r = re && m = rm) e in true
+ let _ = List.find (function ((re, rm), _) -> r =$= re && m =$= rm) e in true
with Not_found -> false
+let _pycocci_tuple6 (a,b,c,d,e,f) =
@@ -129,4 +130,4 @@ index bb877d5..e8aefff 100644
pystring_fromstring (Printf.sprintf "%d" line),
pystring_fromstring (Printf.sprintf "%d" col),
--
-tg: (2e13e9d..) fixes/system-pycaml (depends on: upstream)
+tg: (0f08eb3..) fixes/system-pycaml (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
index a933d25..8b55d32 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
debian/documentation-paths.diff -p1
-fixes/clean-fixes.diff -p1
-fixes/dont-overwrite-config.diff -p1
fixes/system-menhir.diff -p1
fixes/system-pycaml.diff -p1
+fixes/system-ocamlsexp.diff -p1
--
Debian packaging for coccinelle
More information about the Pkg-ocaml-maint-commits
mailing list