[svn:parrot] r37385 - in trunk: config/auto/crypto config/auto/format config/auto/gdbm config/auto/gettext config/auto/gmp config/auto/neg_0 config/auto/opengl config/auto/pcre config/auto/readline src/dynoplibs src/jit/arm src/jit/i386 src/jit/ppc t/codingstd

coke at svn.parrot.org coke at svn.parrot.org
Fri Mar 13 19:25:43 UTC 2009


Author: coke
Date: Fri Mar 13 19:25:41 2009
New Revision: 37385
URL: https://trac.parrot.org/parrot/changeset/37385

Log:
Make the copyright test properly fail on the dual (C) files from chromatic.
- convert the string based RE to a qr//;
- change the RE slightly to help avoid trailing text.
- fixup the comments in a few other files to avoid issues there.

Modified:
   trunk/config/auto/crypto/crypto_c.in
   trunk/config/auto/format/floatval_maxmin_c.in
   trunk/config/auto/format/intval_maxmin_c.in
   trunk/config/auto/gdbm/gdbm_c.in
   trunk/config/auto/gettext/gettext_c.in
   trunk/config/auto/gmp/gmp_c.in
   trunk/config/auto/neg_0/test_c.in
   trunk/config/auto/opengl/opengl_c.in
   trunk/config/auto/pcre/pcre_c.in
   trunk/config/auto/readline/readline_c.in
   trunk/src/dynoplibs/myops.ops
   trunk/src/jit/arm/exec_dep.c
   trunk/src/jit/arm/exec_dep.h
   trunk/src/jit/i386/exec_dep.h
   trunk/src/jit/ppc/exec_dep.c
   trunk/src/jit/ppc/exec_dep.h
   trunk/t/codingstd/copyright.t

Modified: trunk/config/auto/crypto/crypto_c.in
==============================================================================
--- trunk/config/auto/crypto/crypto_c.in	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/config/auto/crypto/crypto_c.in	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,5 +1,7 @@
-/* Copyright (C) 2008, Parrot Foundation. */
-/* $Id$ */
+/*
+  Copyright (C) 2008, Parrot Foundation.
+  $Id$
+*/
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/config/auto/format/floatval_maxmin_c.in
==============================================================================
--- trunk/config/auto/format/floatval_maxmin_c.in	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/config/auto/format/floatval_maxmin_c.in	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,5 +1,7 @@
-/* Copyright (C) 2008-2009, Parrot Foundation. */
-/* $Id$ */
+/*
+  Copyright (C) 2008-2009, Parrot Foundation.
+  $Id$
+*/
 
 #include <float.h>
 

Modified: trunk/config/auto/format/intval_maxmin_c.in
==============================================================================
--- trunk/config/auto/format/intval_maxmin_c.in	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/config/auto/format/intval_maxmin_c.in	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,5 +1,7 @@
-/* Copyright (C) 2008-2009, Parrot Foundation. */
-/* $Id$ */
+/*
+  Copyright (C) 2008-2009, Parrot Foundation.
+  $Id$
+*/
 
 #if @i_limits@ == "define"
 #  include <limits.h>

Modified: trunk/config/auto/gdbm/gdbm_c.in
==============================================================================
--- trunk/config/auto/gdbm/gdbm_c.in	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/config/auto/gdbm/gdbm_c.in	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,5 +1,7 @@
-/* Copyright (C) 2001-2009, Parrot Foundation. */
-/* $Id$ */
+/*
+  Copyright (C) 2001-2009, Parrot Foundation.
+  $Id$
+*/
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/config/auto/gettext/gettext_c.in
==============================================================================
--- trunk/config/auto/gettext/gettext_c.in	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/config/auto/gettext/gettext_c.in	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,5 +1,7 @@
-/* Copyright (C) 2008-2009, Parrot Foundation. */
-/* $Id$ */
+/*
+  Copyright (C) 2008-2009, Parrot Foundation.
+  $Id$
+*/
 
 #define PACKAGE   "hello"
 #define LOCALEDIR "."

Modified: trunk/config/auto/gmp/gmp_c.in
==============================================================================
--- trunk/config/auto/gmp/gmp_c.in	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/config/auto/gmp/gmp_c.in	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,5 +1,7 @@
-/* Copyright (C) 2001-2005, Parrot Foundation. */
-/* $Id$ */
+/*
+  Copyright (C) 2001-2005, Parrot Foundation.
+  $Id$
+*/
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/config/auto/neg_0/test_c.in
==============================================================================
--- trunk/config/auto/neg_0/test_c.in	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/config/auto/neg_0/test_c.in	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,5 +1,7 @@
-/* Copyright (C) 2009, Parrot Foundation. */
-/* $Id$ */
+/*
+  Copyright (C) 2009, Parrot Foundation.
+  $Id$
+*/
 
 #include <stdio.h>
 

Modified: trunk/config/auto/opengl/opengl_c.in
==============================================================================
--- trunk/config/auto/opengl/opengl_c.in	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/config/auto/opengl/opengl_c.in	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,5 +1,7 @@
-/* Copyright (C) 2008-2009, Parrot Foundation. */
-/* $Id$ */
+/*
+  Copyright (C) 2008-2009, Parrot Foundation.
+  $Id$
+*/
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/config/auto/pcre/pcre_c.in
==============================================================================
--- trunk/config/auto/pcre/pcre_c.in	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/config/auto/pcre/pcre_c.in	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,5 +1,7 @@
-/* Copyright (C) 2008-2009, Parrot Foundation. */
-/* $Id$ */
+/*
+  Copyright (C) 2008-2009, Parrot Foundation.
+  $Id$
+*/
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/config/auto/readline/readline_c.in
==============================================================================
--- trunk/config/auto/readline/readline_c.in	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/config/auto/readline/readline_c.in	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,5 +1,7 @@
-/* Copyright (C) 2001-2009, Parrot Foundation. */
-/* $Id$ */
+/*
+  Copyright (C) 2001-2009, Parrot Foundation.
+  $Id$
+*/
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/src/dynoplibs/myops.ops
==============================================================================
--- trunk/src/dynoplibs/myops.ops	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/src/dynoplibs/myops.ops	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,5 +1,7 @@
-/* Copyright (C) 2003-2008, Parrot Foundation. */
-/* $Id$ */
+/*
+  Copyright (C) 2003-2008, Parrot Foundation.
+  $Id$
+*/
 
 #include "parrot/dynext.h"
 #include <stdlib.h>

Modified: trunk/src/jit/arm/exec_dep.c
==============================================================================
--- trunk/src/jit/arm/exec_dep.c	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/src/jit/arm/exec_dep.c	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,10 +1,11 @@
-/* Copyright (C) 2003-2008, Parrot Foundation. */
+/*
+  Copyright (C) 2003-2008, Parrot Foundation.
+  $Id$
+*/
 
 /*
  * exec_dep.c
  *
- * SVN Info
- *    $Id$
  * Overview:
  *    ARM dependent functions to emit an executable.
  * History:

Modified: trunk/src/jit/arm/exec_dep.h
==============================================================================
--- trunk/src/jit/arm/exec_dep.h	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/src/jit/arm/exec_dep.h	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,10 +1,11 @@
-/* Copyright (C) 2003-2008, Parrot Foundation. */
+/*
+  Copyright (C) 2003-2008, Parrot Foundation.
+  $Id$
+*/
 
 /*
  * exec_dep.h
  *
- * SVN Info
- *    $Id$
  * Overview:
  *    ARM dependent functions to emit an executable.
  * History:

Modified: trunk/src/jit/i386/exec_dep.h
==============================================================================
--- trunk/src/jit/i386/exec_dep.h	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/src/jit/i386/exec_dep.h	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,10 +1,11 @@
-/* Copyright (C) 2003-2008, Parrot Foundation.  */
+/*
+  Copyright (C) 2003-2008, Parrot Foundation.
+  $Id$
+*/
 
 /*
  * exec_dep.h
  *
- * SVN Info
- *    $Id$
  * Overview:
  *    i386 dependent functions to emit an executable.
  * History:

Modified: trunk/src/jit/ppc/exec_dep.c
==============================================================================
--- trunk/src/jit/ppc/exec_dep.c	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/src/jit/ppc/exec_dep.c	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,10 +1,11 @@
-/* Copyright (C) 2003-2008, Parrot Foundation.  */
+/*
+  Copyright (C) 2003-2008, Parrot Foundation.
+  $Id$
+*/
 
 /*
  * exec_dep.c
  *
- * SVN Info
- *    $Id$
  * Overview:
  *    PPC dependent functions to emit an executable.
  * History:

Modified: trunk/src/jit/ppc/exec_dep.h
==============================================================================
--- trunk/src/jit/ppc/exec_dep.h	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/src/jit/ppc/exec_dep.h	Fri Mar 13 19:25:41 2009	(r37385)
@@ -1,10 +1,11 @@
-/* Copyright (C) 2003-2008, Parrot Foundation.  */
+/*
+  Copyright (C) 2003-2008, Parrot Foundation.
+  $Id$
+*/
 
 /*
  * exec_dep.h
  *
- * SVN Info
- *    $Id$
  * Overview:
  *    PPC dependent functions to emit an executable.
  * History:

Modified: trunk/t/codingstd/copyright.t
==============================================================================
--- trunk/t/codingstd/copyright.t	Fri Mar 13 17:37:55 2009	(r37384)
+++ trunk/t/codingstd/copyright.t	Fri Mar 13 19:25:41 2009	(r37385)
@@ -43,8 +43,8 @@
 my @files = @ARGV ? <@ARGV> : @all_files;
 my ( @no_copyright_files, @bad_format_copyright_files );
 
-my $copyright_text =
-    "Copyright \\(C\\) (\\d{4}\\-\\d{4}|\\d{4}), Parrot Foundation.";
+my $copyright_re =
+    qr/Copyright \(C\) (?:\d{4}\-)?\d{4}, Parrot Foundation\.$/m;
 
 foreach my $file (@files) {
 
@@ -61,7 +61,7 @@
     }
 
     # is the copyright text correct?
-    if ( $buf !~ m{$copyright_text}m ) {
+    if ( ! ($buf =~ $copyright_re) ) {
         push @bad_format_copyright_files, $path;
     }
 }


More information about the parrot-commits mailing list