GPLv3: copying.awk needs to be adjusted

GPLv3: copying.awk needs to be adjusted

[Joel Brobecker]

There is one thing I haven't done yet, with respect to the transition
to GPLv3: The license printed by GDB when using the "show/info copying"
and "show/info warranty" should be extracted from the COPYING3 files,
not COPYING.

So the associated copying.c rule in Makefile.in needs to be adjusted.

But this is not all: Because the license has changed, the awk script
needs to be adjusted as well. In particular, the awk script is splitting
the contents of the license into two parts: the "copying" part, and
the "warranty" part. With GPLv2, it was using "NO WARRANTY" as the
marker. We need to change it to use "15. Disclaimer of Warranty.".

I tried that, but somehow it failed miseraly.

I've just spent several hours working on this switch and I'm overdosing.
I'll leave that for later unless some good soul takes care of it for me
first.

-- 
Joel

Re: GPLv3: copying.awk needs to be adjusted

[Andreas Schwab]

Joel Brobecker <brobecker@adacore.com> writes:

> But this is not all: Because the license has changed, the awk script
> needs to be adjusted as well. In particular, the awk script is splitting
> the contents of the license into two parts: the "copying" part, and
> the "warranty" part. With GPLv2, it was using "NO WARRANTY" as the
> marker. We need to change it to use "15. Disclaimer of Warranty.".
>
> I tried that, but somehow it failed miseraly.

I have just replaced "NO WARRANTY" by "15\. Disclaimer of Warranty\."
everywhere in the script, and the result looks perfect.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: GPLv3: copying.awk needs to be adjusted

[Joel Brobecker]

> I have just replaced "NO WARRANTY" by "15\. Disclaimer of Warranty\."
> everywhere in the script, and the result looks perfect.

Mama mia, no comprendo - I tried exactly the same thing, and somehow
it didn't work. Would you mind posting a patch for us?

-- 
Joel

Re: GPLv3: copying.awk needs to be adjusted

[Andreas Schwab]

Joel Brobecker <brobecker@adacore.com> writes:

>> I have just replaced "NO WARRANTY" by "15\. Disclaimer of Warranty\."
>> everywhere in the script, and the result looks perfect.
>
> Mama mia, no comprendo - I tried exactly the same thing, and somehow
> it didn't work. Would you mind posting a patch for us?

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.928
diff -u -a -p -r1.928 Makefile.in
--- Makefile.in	10 Aug 2007 17:52:09 -0000	1.928
+++ Makefile.in	19 Aug 2007 08:04:02 -0000
@@ -1386,9 +1386,9 @@ doc/gdb.info:
 
 # Make copying.c from COPYING
 $(srcdir)/copying.c: @MAINTAINER_MODE_TRUE@ \
-		$(srcdir)/COPYING $(srcdir)/copying.awk
+		$(srcdir)/COPYING3 $(srcdir)/copying.awk
 	awk -f $(srcdir)/copying.awk \
-		< $(srcdir)/COPYING > $(srcdir)/copying.tmp
+		< $(srcdir)/COPYING3 > $(srcdir)/copying.tmp
 	mv $(srcdir)/copying.tmp $(srcdir)/copying.c
 
 version.c: Makefile version.in
Index: copying.awk
===================================================================
RCS file: /cvs/src/src/gdb/copying.awk,v
retrieving revision 1.2
diff -u -a -p -r1.2 copying.awk
--- copying.awk	27 Jun 2000 06:45:43 -0000	1.2
+++ copying.awk	19 Aug 2007 08:04:02 -0000
@@ -21,12 +21,12 @@ BEGIN	{
 	  print "{";
 	  print "  immediate_quit++;";
 	}
-NR == 1,/^[ 	]*NO WARRANTY[ 	]*$/	{
+NR == 1,/^[ 	]*15\. Disclaimer of Warranty\.[ 	]*$/	{
 	  if ($0 ~ /\f/)
 	    {
 	      printf "  printf_filtered (\"\\n\");\n";
 	    }
-	  else if ($0 !~ /^[ 	]*NO WARRANTY[ 	]*$/) 
+	  else if ($0 !~ /^[ 	]*15\. Disclaimer of Warranty\.[ 	]*$/) 
 	    {
 	      printf "  printf_filtered (\"";
 	      for (i = 1; i < NF; i++)
@@ -34,7 +34,7 @@ NR == 1,/^[ 	]*NO WARRANTY[ 	]*$/	{
 	      printf "%s\\n\");\n", $NF;
 	    }
 	}
-/^[	 ]*NO WARRANTY[ 	]*$/	{
+/^[	 ]*15\. Disclaimer of Warranty\.[ 	]*$/	{
 	  print "  immediate_quit--;";
 	  print "}";
 	  print "";
@@ -45,7 +45,7 @@ NR == 1,/^[ 	]*NO WARRANTY[ 	]*$/	{
 	  print "{";
 	  print "  immediate_quit++;";
 	}
-/^[ 	]*NO WARRANTY[ 	]*$/, /^[ 	]*END OF TERMS AND CONDITIONS[ 	]*$/{  
+/^[ 	]*15\. Disclaimer of Warranty\.[ 	]*$/, /^[ 	]*END OF TERMS AND CONDITIONS[ 	]*$/{  
 	  if (! ($0 ~ /^[ 	]*END OF TERMS AND CONDITIONS[ 	]*$/)) 
 	    {
 	      printf "  printf_filtered (\"";

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: GPLv3: copying.awk needs to be adjusted

[Daniel Jacobowitz]

On Sun, Aug 19, 2007 at 10:07:08AM +0200, Andreas Schwab wrote:
>  # Make copying.c from COPYING
>  $(srcdir)/copying.c: @MAINTAINER_MODE_TRUE@ \
> -		$(srcdir)/COPYING $(srcdir)/copying.awk
> +		$(srcdir)/COPYING3 $(srcdir)/copying.awk
>  	awk -f $(srcdir)/copying.awk \
> -		< $(srcdir)/COPYING > $(srcdir)/copying.tmp
> +		< $(srcdir)/COPYING3 > $(srcdir)/copying.tmp
>  	mv $(srcdir)/copying.tmp $(srcdir)/copying.c
>  
>  version.c: Makefile version.in

Can we just use the COPYING3 at the top level?

-- 
Daniel Jacobowitz
CodeSourcery