On Sat, Sep 24, 2016 at 09:37:45AM +0100, Stuart Henderson wrote:
> On 2016/09/24 16:35, Jonathan Gray wrote:
> > Update coccinelle to 1.0.5, changes described here:
> > http://coccinelle.lip6.fr/distrib/changes.html
>
> I tried updating this at Cambridge (it seemed fitting ;) - my diff is
> nearly the same, only packaging changes - lib/coccinelle/spgen/spgen.opt
> should be in PFRAG.dynlink instead of PLIST - but I dropped it because
> the regression tests didn't look good and I didn't know where to start
> with debugging it.
Ah, indeed running make test gives:
--------------------------------
regression testing information
--------------------------------
regression file: tests/SCORE_expected.sexp
--------------------------------
total score
--------------------------------
good = 218/492
Current score is lower than expected :(
(was expecting 451 but got 218)
>
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/coccinelle/Makefile,v
> > retrieving revision 1.33
> > diff -u -p -r1.33 Makefile
> > --- Makefile 26 Jun 2016 14:36:58 -0000 1.33
> > +++ Makefile 24 Sep 2016 05:36:03 -0000
> > @@ -4,9 +4,8 @@ COMMENT = program matching and transform
> >
> > # if updating, check for any additional use of diff/grep which
> > # may need to be switched to gdiff/ggrep
> > -DISTNAME = coccinelle-1.0.4
> > +DISTNAME = coccinelle-1.0.5
> > EXTRACT_SUFX = .tgz
> > -REVISION = 0
> >
> > CATEGORIES = devel
> >
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/devel/coccinelle/distinfo,v
> > retrieving revision 1.12
> > diff -u -p -r1.12 distinfo
> > --- distinfo 29 Oct 2015 15:41:36 -0000 1.12
> > +++ distinfo 24 Sep 2016 06:13:42 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (coccinelle-1.0.4.tgz) =
> > f4I4E6LqKZwPbAHYQZuDxNxmFxFtMrqZ1yZEOhwisG0=
> > -SIZE (coccinelle-1.0.4.tgz) = 2484218
> > +SHA256 (coccinelle-1.0.5.tgz) =
> > XvsJO1OBRbdSagaUbAnHyqpxUAZlivIEn6qHOfRZdDs=
> > +SIZE (coccinelle-1.0.5.tgz) = 5660596
> > Index: patches/patch-Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/coccinelle/patches/patch-Makefile,v
> > retrieving revision 1.10
> > diff -u -p -r1.10 patch-Makefile
> > --- patches/patch-Makefile 29 Oct 2015 15:41:36 -0000 1.10
> > +++ patches/patch-Makefile 24 Sep 2016 06:18:02 -0000
> > @@ -1,10 +1,10 @@
> > $OpenBSD: patch-Makefile,v 1.10 2015/10/29 15:41:36 sthen Exp $
> > ---- Makefile.orig Wed Oct 28 14:07:59 2015
> > -+++ Makefile Thu Oct 29 15:36:45 2015
> > +--- Makefile.orig Sat Jun 4 02:11:03 2016
> > ++++ Makefile Sat Sep 24 16:17:43 2016
> > @@ -347,7 +347,7 @@ install-man:
> > $(INSTALL_DATA) docs/spatch.1 $(DESTDIR)$(MANDIR)/man1/
> > $(INSTALL_DATA) docs/pycocci.1 $(DESTDIR)$(MANDIR)/man1/
> > - # $(INSTALL_DATA) docs/spgen.1 $(DESTDIR)$(MANDIR)/man1/
> > + $(INSTALL_DATA) docs/spgen.1 $(DESTDIR)$(MANDIR)/man1/
> > - $(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/
> > + $(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/Coccilib.3
> >
> > Index: patches/patch-cocci_ml
> > ===================================================================
> > RCS file: /cvs/ports/devel/coccinelle/patches/patch-cocci_ml,v
> > retrieving revision 1.7
> > diff -u -p -r1.7 patch-cocci_ml
> > --- patches/patch-cocci_ml 27 Oct 2015 14:43:07 -0000 1.7
> > +++ patches/patch-cocci_ml 24 Sep 2016 06:18:06 -0000
> > @@ -1,7 +1,7 @@
> > $OpenBSD: patch-cocci_ml,v 1.7 2015/10/27 14:43:07 sthen Exp $
> > ---- cocci.ml.orig Mon Oct 26 16:22:50 2015
> > -+++ cocci.ml Tue Oct 27 14:33:27 2015
> > -@@ -245,8 +245,8 @@ let show_or_not_diff2 cfile outfile =
> > +--- cocci.ml.orig Sat Jun 4 02:11:03 2016
> > ++++ cocci.ml Sat Sep 24 16:15:04 2016
> > +@@ -252,8 +252,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.7 2015/10/2
> > let res = Common.cmd_to_list line in
> > (match res with
> > [] -> ()
> > -@@ -524,7 +524,7 @@ let worth_trying2 cfiles (tokens,_,query,_) =
> > +@@ -531,7 +531,7 @@ let worth_trying2 cfiles (tokens,_,query,_) =
> >
> > ) in
> > let com =
> > @@ -21,7 +21,7 @@ $OpenBSD: patch-cocci_ml,v 1.7 2015/10/2
> > (String.concat "|" tokens) (String.concat " " cfiles) in
> > (match Sys.command com with
> > | 0 (* success *) -> true
> > -@@ -2293,7 +2293,7 @@ let check_duplicate_modif2 xs =
> > +@@ -2210,7 +2210,7 @@ let check_duplicate_modif2 xs =
> > match res2 with
> > | None -> false
> > | Some res2 ->
> > Index: patches/patch-commons_common_ml
> > ===================================================================
> > RCS file: /cvs/ports/devel/coccinelle/patches/patch-commons_common_ml,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 patch-commons_common_ml
> > --- patches/patch-commons_common_ml 27 Oct 2015 14:43:07 -0000 1.6
> > +++ patches/patch-commons_common_ml 24 Sep 2016 06:18:00 -0000
> > @@ -1,7 +1,7 @@
> > $OpenBSD: patch-commons_common_ml,v 1.6 2015/10/27 14:43:07 sthen Exp $
> > ---- commons/common.ml.orig Mon Oct 26 16:22:50 2015
> > -+++ commons/common.ml Tue Oct 27 14:23:22 2015
> > -@@ -3277,7 +3277,7 @@ let glob pattern =
> > +--- commons/common.ml.orig Sat Jun 4 02:11:03 2016
> > ++++ commons/common.ml Sat Sep 24 16:15:04 2016
> > +@@ -3276,7 +3276,7 @@ let glob pattern =
> > let files_of_dir_or_files ext xs =
> > xs +> List.map (fun x ->
> > if is_directory x
> > @@ -10,7 +10,7 @@ $OpenBSD: patch-commons_common_ml,v 1.6
> > else [x]
> > ) +> List.concat
> >
> > -@@ -3287,7 +3287,7 @@ let files_of_dir_or_files_no_vcs ext xs =
> > +@@ -3286,7 +3286,7 @@ let files_of_dir_or_files_no_vcs ext xs =
> > if is_directory x
> > then
> > cmd_to_list
> > @@ -19,7 +19,7 @@ $OpenBSD: patch-commons_common_ml,v 1.6
> > "| grep -v /.hg/ |grep -v /CVS/ | grep -v /.git/ |grep -v
> > /_darcs/"
> > )
> > else [x]
> > -@@ -3300,7 +3300,7 @@ let files_of_dir_or_files_no_vcs_post_filter regex
> > xs
> > +@@ -3299,7 +3299,7 @@ let files_of_dir_or_files_no_vcs_post_filter regex
> > xs
> > then
> > cmd_to_list
> > ("find " ^ x ^
> > @@ -28,7 +28,7 @@ $OpenBSD: patch-commons_common_ml,v 1.6
> > )
> > +> List.filter (fun s -> s =~ regex)
> > else [x]
> > -@@ -5241,7 +5241,7 @@ let (diff: (int -> int -> diff -> unit)-> (string
> > list
> > +@@ -5251,7 +5251,7 @@ let (diff: (int -> int -> diff -> unit)-> (string
> > list
> > write_file file1 (unwords xs);
> > write_file file2 (unwords ys);
> > command2
> > @@ -37,7 +37,7 @@ $OpenBSD: patch-commons_common_ml,v 1.6
> > let res = cat fileresult in
> > let a = ref 0 in
> > let b = ref 0 in
> > -@@ -5269,7 +5269,7 @@ let (diff2: (int -> int -> diff -> unit) -> (string
> > *
> > +@@ -5279,7 +5279,7 @@ let (diff2: (int -> int -> diff -> unit) -> (string
> > *
> > write_file "/tmp/diff1" xstr;
> > write_file "/tmp/diff2" ystr;
> > command2
> > Index: pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/devel/coccinelle/pkg/PLIST,v
> > retrieving revision 1.12
> > diff -u -p -r1.12 PLIST
> > --- pkg/PLIST 24 Jun 2016 15:59:11 -0000 1.12
> > +++ pkg/PLIST 24 Sep 2016 06:19:53 -0000
> > @@ -3,6 +3,7 @@
> > bin/pycocci
> > bin/spatch
> > bin/spatch.byte
> > +bin/spgen
> > lib/coccinelle/
> > lib/coccinelle/ocaml/
> > lib/coccinelle/ocaml/ast0_cocci.cmi
> > @@ -12,6 +13,7 @@ lib/coccinelle/ocaml/coccilib.cmi
> > lib/coccinelle/ocaml/common.cmi
> > lib/coccinelle/ocaml/config.cmi
> > lib/coccinelle/ocaml/exposed_modules.cmi
> > +lib/coccinelle/ocaml/externalanalysis.cmi
> > lib/coccinelle/ocaml/flag.cmi
> > lib/coccinelle/ocaml/iteration.cmi
> > lib/coccinelle/ocaml/lexer_c.cmi
> > @@ -23,8 +25,8 @@ lib/coccinelle/ocaml/prepare_ocamlcocci.
> > lib/coccinelle/ocaml/pretty_print_c.cmi
> > lib/coccinelle/ocaml/regexp.cmi
> > lib/coccinelle/ocaml/run_ocamlcocci.cmi
> > -lib/coccinelle/ocaml/type_cocci.cmi
> > lib/coccinelle/ocaml/visitor_c.cmi
> > +lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmi
> > lib/coccinelle/python/
> > lib/coccinelle/python/coccilib/
> > lib/coccinelle/python/coccilib/__init__.py
> > @@ -39,17 +41,22 @@ lib/coccinelle/python/coccilib/coccigui/
> > lib/coccinelle/python/coccilib/coccigui/vimeditor.py
> > lib/coccinelle/python/coccilib/coccigui/vimembed.py
> > lib/coccinelle/python/coccilib/elems.py
> > +lib/coccinelle/python/coccilib/iteration.py
> > lib/coccinelle/python/coccilib/org.py
> > lib/coccinelle/python/coccilib/output.py
> > lib/coccinelle/python/coccilib/report.py
> > lib/coccinelle/python/coccilib/trac.py
> > lib/coccinelle/python/coccilib/xml_firehose.py
> > @bin lib/coccinelle/spatch
> > +lib/coccinelle/spgen/
> > +@bin lib/coccinelle/spgen/spgen
> > +@bin lib/coccinelle/spgen/spgen.opt
> > lib/coccinelle/standard.h
> > lib/coccinelle/standard.iso
> > lib/ocaml/stublibs/dllpycaml_stubs.so
> > @man man/man1/pycocci.1
> > @man man/man1/spatch.1
> > +@man man/man1/spgen.1
> > @man man/man3/Coccilib.3
> > share/doc/coccinelle/
> > share/doc/coccinelle/contents_motif.gif
> > @@ -72,6 +79,7 @@ share/doc/coccinelle/main_grammar012.htm
> > share/doc/coccinelle/main_grammar013.html
> > share/doc/coccinelle/main_grammar014.html
> > share/doc/coccinelle/main_grammar015.html
> > +share/doc/coccinelle/main_grammar016.html
> > share/doc/coccinelle/manual.pdf
> > share/doc/coccinelle/next_motif.gif
> > share/doc/coccinelle/options.pdf
> >
>
