update to Cocinelle 1.0.0-rc11
This commit is contained in:
sthen
parent
2a6f9b3f23
commit
97c2764b34
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.14 2011/11/03 22:13:23 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.15 2012/07/18 08:04:43 sthen Exp $
|
||||
|
||||
SHARED_ONLY = Yes
|
||||
|
||||
@ -6,8 +6,7 @@ COMMENT = program matching and transformation engine
|
||||
|
||||
# if updating, check for any additional use of diff/grep which
|
||||
# may need to be switched to gdiff/ggrep
|
||||
DISTNAME = coccinelle-1.0.0-rc7
|
||||
REVISION = 3
|
||||
DISTNAME = coccinelle-1.0.0-rc11
|
||||
PKGNAME = ${DISTNAME:S/-rc/rc/}
|
||||
EXTRACT_SUFX = .tgz
|
||||
|
||||
@ -43,6 +42,7 @@ REGRESS_IS_INTERACTIVE = Yes
|
||||
USE_GMAKE = Yes
|
||||
CONFIGURE_STYLE = simple
|
||||
CONFIGURE_ENV = MAKE_PROGRAM=${MAKE_PROGRAM}
|
||||
CONFIGURE_ARGS = --with-python=${MODPY_BIN}
|
||||
|
||||
REGRESS_TARGET = test
|
||||
SUBST_VARS += MAKE_PROGRAM
|
||||
@ -62,7 +62,7 @@ PKG_ARGS += -DOCAMLOPT=
|
||||
.endif
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/configure ${WRKSRC}/pycaml/Makefile
|
||||
${SUBST_CMD} ${WRKSRC}/pycaml/Makefile
|
||||
perl -pi -e s,/usr/local,${TRUEPREFIX},g ${WRKSRC}/scripts/spatch*
|
||||
|
||||
post-install:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (coccinelle-1.0.0-rc7.tgz) = QVJ1cKAyhwjDhUDfU8RRyA==
|
||||
RMD160 (coccinelle-1.0.0-rc7.tgz) = WpmedR5VIyAVwnQaJepPmDWpGXw=
|
||||
SHA1 (coccinelle-1.0.0-rc7.tgz) = QlRLpbVZd5NiCxezMWEjiGCe+fo=
|
||||
SHA256 (coccinelle-1.0.0-rc7.tgz) = t0q2BpOM1IG9RRW3fzMOZuIexjQLEApvbc/ZJnquU7o=
|
||||
SIZE (coccinelle-1.0.0-rc7.tgz) = 2337344
|
||||
MD5 (coccinelle-1.0.0-rc11.tgz) = Yx/XH+BnMQ3XYAuGMyKryA==
|
||||
RMD160 (coccinelle-1.0.0-rc11.tgz) = 6si/XpLdWyBHNv+mWiEfA8jokuU=
|
||||
SHA1 (coccinelle-1.0.0-rc11.tgz) = pI37mtEHadqWdsnThwQ5eghm/0I=
|
||||
SHA256 (coccinelle-1.0.0-rc11.tgz) = J10L7uWhZe1u39TacLmPn4AubeXVnrwHUEH/jBJtA98=
|
||||
SIZE (coccinelle-1.0.0-rc11.tgz) = 2356524
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Makefile,v 1.4 2011/08/30 10:20:11 sthen Exp $
|
||||
--- Makefile.orig Sat Aug 27 07:26:44 2011
|
||||
+++ Makefile Sat Aug 27 21:27:42 2011
|
||||
@@ -344,7 +344,7 @@ install-man:
|
||||
$OpenBSD: patch-Makefile,v 1.5 2012/07/18 08:04:43 sthen Exp $
|
||||
--- Makefile.orig Sun Mar 11 22:52:49 2012
|
||||
+++ Makefile Wed Mar 14 23:37:53 2012
|
||||
@@ -355,7 +355,7 @@ install-man:
|
||||
mkdir -p $(DESTDIR)$(MANDIR)/man1
|
||||
mkdir -p $(DESTDIR)$(MANDIR)/man3
|
||||
$(INSTALL_DATA) docs/spatch.1 $(DESTDIR)$(MANDIR)/man1/
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-cocci_ml,v 1.3 2011/08/16 08:26:16 sthen Exp $
|
||||
--- cocci.ml.orig Wed Aug 10 20:10:48 2011
|
||||
+++ cocci.ml Thu Aug 11 15:49:26 2011
|
||||
@@ -266,8 +266,8 @@ let show_or_not_diff2 cfile outfile =
|
||||
$OpenBSD: patch-cocci_ml,v 1.4 2012/07/18 08:04:43 sthen Exp $
|
||||
--- cocci.ml.orig Sun Mar 11 22:52:49 2012
|
||||
+++ cocci.ml Wed Mar 14 23:37:53 2012
|
||||
@@ -268,8 +268,8 @@ let show_or_not_diff2 cfile outfile =
|
||||
|
||||
let line =
|
||||
match !Flag_parsing_c.diff_lines with
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-cocci_ml,v 1.3 2011/08/16 08:26:16 sthen Exp $
|
||||
let res = Common.cmd_to_list line in
|
||||
let res =
|
||||
List.map
|
||||
@@ -526,7 +526,7 @@ let worth_trying cfiles tokens =
|
||||
@@ -528,7 +528,7 @@ let worth_trying cfiles tokens =
|
||||
| _ -> s
|
||||
|
||||
) in
|
||||
@ -21,7 +21,7 @@ $OpenBSD: patch-cocci_ml,v 1.3 2011/08/16 08:26:16 sthen Exp $
|
||||
in
|
||||
(match Sys.command com with
|
||||
| 0 (* success *) -> true
|
||||
@@ -2032,7 +2032,7 @@ let check_duplicate_modif2 xs =
|
||||
@@ -2048,7 +2048,7 @@ let check_duplicate_modif2 xs =
|
||||
match res2 with
|
||||
| None -> false
|
||||
| Some res2 ->
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-commons_common_ml,v 1.1 2011/08/16 08:26:16 sthen Exp $
|
||||
--- commons/common.ml.orig Thu Aug 11 15:51:39 2011
|
||||
+++ commons/common.ml Thu Aug 11 15:52:01 2011
|
||||
@@ -5347,7 +5347,7 @@ let (diff: (int -> int -> diff -> unit)-> (string list
|
||||
$OpenBSD: patch-commons_common_ml,v 1.2 2012/07/18 08:04:43 sthen Exp $
|
||||
--- commons/common.ml.orig Sun Mar 11 22:00:27 2012
|
||||
+++ commons/common.ml Wed Mar 14 23:37:53 2012
|
||||
@@ -5352,7 +5352,7 @@ let (diff: (int -> int -> diff -> unit)-> (string list
|
||||
write_file file1 (unwords xs);
|
||||
write_file file2 (unwords ys);
|
||||
command2
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-commons_common_ml,v 1.1 2011/08/16 08:26:16 sthen Exp $
|
||||
let res = cat fileresult in
|
||||
let a = ref 0 in
|
||||
let b = ref 0 in
|
||||
@@ -5375,7 +5375,7 @@ let (diff2: (int -> int -> diff -> unit) -> (string *
|
||||
@@ -5380,7 +5380,7 @@ let (diff2: (int -> int -> diff -> unit) -> (string *
|
||||
write_file "/tmp/diff1" xstr;
|
||||
write_file "/tmp/diff2" ystr;
|
||||
command2
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.3 2011/08/30 10:20:11 sthen Exp $
|
||||
--- configure.orig Wed Aug 10 13:32:11 2011
|
||||
+++ configure Sat Aug 27 21:28:10 2011
|
||||
@@ -186,7 +186,7 @@ if ($opt eq ".opt") {
|
||||
$OpenBSD: patch-configure,v 1.4 2012/07/18 08:04:43 sthen Exp $
|
||||
--- configure.orig Sun Mar 11 22:00:27 2012
|
||||
+++ configure Wed Mar 14 23:37:53 2012
|
||||
@@ -236,7 +236,7 @@ if ($opt eq ".opt") {
|
||||
pr2 "";
|
||||
|
||||
$error += check_config(
|
||||
@ -10,43 +10,3 @@ $OpenBSD: patch-configure,v 1.3 2011/08/30 10:20:11 sthen Exp $
|
||||
"GNU Make [^0-9]*3\.[0-9]+.*", #version 3.79.1, 3.81
|
||||
"make (gnu version) is present.",
|
||||
"The program gnu make is missing or is not a good version.
|
||||
@@ -205,7 +205,7 @@ We need 3.XX",
|
||||
my $PY_VERSION;
|
||||
if($python) {
|
||||
if(check_config(
|
||||
- "python --version 2>&1 |",
|
||||
+ "${MODPY_BIN} --version 2>&1 |",
|
||||
'^Python 2\.([4567]|[4567]\.\S*)$',
|
||||
"python is present",
|
||||
"python is missing or is not a good version."
|
||||
@@ -214,8 +214,8 @@ if($python) {
|
||||
$python=0;
|
||||
}
|
||||
if($python) {
|
||||
- my $PY_PREFIX = `python pycaml/getprefix.py | tr -d '\n'`;
|
||||
- $PY_VERSION = `python pycaml/getversion.py | tr -d '\n'`;
|
||||
+ my $PY_PREFIX = `${MODPY_BIN} pycaml/getprefix.py | tr -d '\n'`;
|
||||
+ $PY_VERSION = `${MODPY_BIN} pycaml/getversion.py | tr -d '\n'`;
|
||||
my $python_hdr = "$PY_PREFIX/include/python$PY_VERSION/Python.h";
|
||||
if(check_config(
|
||||
"ls $python_hdr 2> /dev/null | ",
|
||||
@@ -405,16 +405,16 @@ OPTBIN=$opt
|
||||
my $pythonprefix = $python ? "yes" : "no";
|
||||
pr2 "Support for python scripting: $pythonprefix";
|
||||
`cd python; ln -sf ${pythonprefix}_pycocci.ml pycocci.ml; `;
|
||||
-`cd python; make depend`;
|
||||
+`cd python; ${MAKE_PROGRAM} depend`;
|
||||
|
||||
pr2 "Support for ocaml scripting: $ocamlprefix";
|
||||
`cd ocaml; ln -sf ${ocamlprefix}_prepare_ocamlcocci.ml prepare_ocamlcocci.ml;`;
|
||||
-`cd ocaml; make depend`;
|
||||
+`cd ocaml; ${MAKE_PROGRAM} depend`;
|
||||
|
||||
my $pcresuffix = $pcre ? "pcre" : "str";
|
||||
pr2 "Support for regexp: $pcresuffix";
|
||||
`cd globals; ln -sf regexp_${pcresuffix}.ml regexp.ml; touch regexp.ml;`;
|
||||
-`cd globals; make depend`;
|
||||
+`cd globals; ${MAKE_PROGRAM} depend`;
|
||||
|
||||
pr2 "Modifying globals/config.ml";
|
||||
my $command = "perl -p -e 's#Not_found.\*#Not_found->\\\"$src\\\"#' globals/config.ml.in > globals/config.ml";
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-demos_regexp_cocci,v 1.1 2011/08/30 10:20:11 sthen Exp $
|
||||
|
||||
syntax changed in rc7
|
||||
|
||||
--- demos/regexp.cocci.orig Sat Aug 27 21:59:25 2011
|
||||
+++ demos/regexp.cocci Sat Aug 27 21:59:30 2011
|
||||
@@ -30,7 +30,7 @@ print "Contains foo: %s" % x
|
||||
|
||||
@nocontain@
|
||||
type t;
|
||||
-identifier foo !=~ "foo";
|
||||
+identifier foo !~ "foo";
|
||||
@@
|
||||
|
||||
t foo () {
|
||||
@ -1,27 +0,0 @@
|
||||
$OpenBSD: patch-parsing_cocci_function_prototypes_ml,v 1.1 2011/08/30 10:20:11 sthen Exp $
|
||||
--- parsing_cocci/function_prototypes.ml.orig Sat Aug 27 07:26:45 2011
|
||||
+++ parsing_cocci/function_prototypes.ml Sun Aug 28 11:47:32 2011
|
||||
@@ -153,18 +153,19 @@ and strip =
|
||||
ref [],-1) in
|
||||
|
||||
(* need a case for everything that has an unvisited component and can be in
|
||||
- a function prototype *)
|
||||
+ a function prototype. Also get rid of constraints because pcre
|
||||
+ constraints cannot be compared. *)
|
||||
|
||||
let ident r k e =
|
||||
donothing r k
|
||||
(Ast0.rewrap e
|
||||
(match Ast0.unwrap e with
|
||||
Ast0.MetaId(nm,constraints,seed,pure) ->
|
||||
- Ast0.MetaId(nm,constraints,seed,Ast0.Pure)
|
||||
+ Ast0.MetaId(nm,Ast.IdNoConstraint,seed,Ast0.Pure)
|
||||
| Ast0.MetaFunc(nm,constraints,pure) ->
|
||||
- Ast0.MetaFunc(nm,constraints,Ast0.Pure)
|
||||
+ Ast0.MetaFunc(nm,Ast.IdNoConstraint,Ast0.Pure)
|
||||
| Ast0.MetaLocalFunc(nm,constraints,pure) ->
|
||||
- Ast0.MetaLocalFunc(nm,constraints,Ast0.Pure)
|
||||
+ Ast0.MetaLocalFunc(nm,Ast.IdNoConstraint,Ast0.Pure)
|
||||
| e -> e)) in
|
||||
|
||||
let typeC r k e =
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-scripts_stat_directory_complete_pl,v 1.1.1.1 2011/05/14 15:02:50 sthen Exp $
|
||||
--- scripts/stat_directory_complete.pl.orig Thu May 5 20:04:22 2011
|
||||
+++ scripts/stat_directory_complete.pl Thu May 5 20:04:47 2011
|
||||
@@ -254,7 +254,7 @@ foreach my $c (@cfiles) {
|
||||
$OpenBSD: patch-scripts_stat_directory_complete_pl,v 1.2 2012/07/18 08:04:43 sthen Exp $
|
||||
--- scripts/stat_directory_complete.pl.orig Sun Mar 11 22:52:51 2012
|
||||
+++ scripts/stat_directory_complete.pl Wed Mar 14 23:37:53 2012
|
||||
@@ -256,7 +256,7 @@ foreach my $c (@cfiles) {
|
||||
mylog "found corrected";
|
||||
}
|
||||
my $onlychange = 0;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user