From a735939d1e5b9729e0ebcc1e1fb48031618cf6ca Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Mon, 30 May 2022 20:12:20 +0200
Subject: [PATCH] removed confusing GPL software license reference and
 copyright header from library files. (because of exclusion in output files)
 Reworded software license and exclusion clause somewhat again in attempt to
 make it even clearer.

---
 LICENSE                                    | 8 ++++----
 README.md                                  | 7 ++++---
 compiler/res/prog8lib/atari/syslib.p8      | 3 ---
 compiler/res/prog8lib/atari/textio.p8      | 2 --
 compiler/res/prog8lib/c128/floats.p8       | 2 --
 compiler/res/prog8lib/c128/syslib.p8       | 3 ---
 compiler/res/prog8lib/c128/textio.p8       | 4 ----
 compiler/res/prog8lib/c64/floats.p8        | 4 ----
 compiler/res/prog8lib/c64/syslib.p8        | 4 ----
 compiler/res/prog8lib/c64/textio.p8        | 4 ----
 compiler/res/prog8lib/conv.p8              | 3 ---
 compiler/res/prog8lib/cx16/cx16diskio.p8   | 2 --
 compiler/res/prog8lib/cx16/floats.p8       | 4 ----
 compiler/res/prog8lib/cx16/syslib.p8       | 4 ----
 compiler/res/prog8lib/cx16/textio.p8       | 4 ----
 compiler/res/prog8lib/diskio.p8            | 2 --
 compiler/res/prog8lib/math.asm             | 2 --
 compiler/res/prog8lib/math.p8              | 2 --
 compiler/res/prog8lib/prog8_lib.asm        | 2 --
 compiler/res/prog8lib/prog8_lib.p8         | 2 --
 compiler/res/prog8lib/string.p8            | 3 ---
 compiler/res/prog8lib/virtual/conv.p8      | 3 ---
 compiler/res/prog8lib/virtual/floats.p8    | 2 --
 compiler/res/prog8lib/virtual/math.p8      | 2 --
 compiler/res/prog8lib/virtual/prog8_lib.p8 | 2 --
 compiler/res/prog8lib/virtual/string.p8    | 3 ---
 compiler/res/prog8lib/virtual/syslib.p8    | 3 ---
 compiler/res/prog8lib/virtual/textio.p8    | 2 --
 compiler/res/version.txt                   | 2 +-
 docs/source/index.rst                      | 9 ++++-----
 30 files changed, 13 insertions(+), 86 deletions(-)

diff --git a/LICENSE b/LICENSE
index 8d74f856d..168d8428c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,9 +1,9 @@
 
-This sofware license is for Prog8 the compiler + associated libraries.
+This sofware license is for Prog8 the compiler + associated library files.
 
-Any and all outputs generated by the compiler (intermediary
-source code and compiled binary programs) are excluded from that
-and you can do with them whatever you want.
+Exception: All output files generated by the compiler (intermediary files
+and compiled binary programs) are excluded from this; you can do with those
+whatever you want.
 
 
 
diff --git a/README.md b/README.md
index 05af920b6..c578c6641 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,11 @@ https://prog8.readthedocs.io/
 
 Software license
 ----------------
-GNU GPL 3.0, see file LICENSE
+GNU GPL 3.0 (see file LICENSE), with exception for generated code:
 
-- prog8 (the compiler + libraries) is licensed under GNU GPL 3.0
-- *exception:* the resulting files created by running the compiler are free to use in whatever way desired.
+- The compiler and its libraries are free to use according to the terms of the GNU GPL 3.0
+- *exception:* the resulting files (intermediate source codes and resulting binary program) created by the compiler
+  are excluded from the GPL and are free to use in whatever way desired, commercially or not.
 
 
 What does Prog8 provide?
diff --git a/compiler/res/prog8lib/atari/syslib.p8 b/compiler/res/prog8lib/atari/syslib.p8
index 8aae53812..3bd31b5aa 100644
--- a/compiler/res/prog8lib/atari/syslib.p8
+++ b/compiler/res/prog8lib/atari/syslib.p8
@@ -1,8 +1,5 @@
 ; Prog8 definitions for the Atari800XL
 ; Including memory registers, I/O registers, Basic and Kernal subroutines.
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-;
 
 atari {
 
diff --git a/compiler/res/prog8lib/atari/textio.p8 b/compiler/res/prog8lib/atari/textio.p8
index 19e60fae7..81aa574f2 100644
--- a/compiler/res/prog8lib/atari/textio.p8
+++ b/compiler/res/prog8lib/atari/textio.p8
@@ -1,6 +1,4 @@
 ; Prog8 definitions for the Text I/O and Screen routines for the Atari 800XL
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
 
 %import syslib
 %import conv
diff --git a/compiler/res/prog8lib/c128/floats.p8 b/compiler/res/prog8lib/c128/floats.p8
index 950c538a1..6c6da35b0 100644
--- a/compiler/res/prog8lib/c128/floats.p8
+++ b/compiler/res/prog8lib/c128/floats.p8
@@ -1,6 +1,4 @@
 ; Prog8 definitions for floating point handling on the Commodore 128
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
 
 %option enable_floats
 %import floats_functions
diff --git a/compiler/res/prog8lib/c128/syslib.p8 b/compiler/res/prog8lib/c128/syslib.p8
index be742a32e..cad21d33d 100644
--- a/compiler/res/prog8lib/c128/syslib.p8
+++ b/compiler/res/prog8lib/c128/syslib.p8
@@ -1,8 +1,5 @@
 ; Prog8 definitions for the Commodore-128
 ; Including memory registers, I/O registers, Basic and Kernal subroutines.
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-;
 
 c64 {
 
diff --git a/compiler/res/prog8lib/c128/textio.p8 b/compiler/res/prog8lib/c128/textio.p8
index 9ead73121..be645ddfd 100644
--- a/compiler/res/prog8lib/c128/textio.p8
+++ b/compiler/res/prog8lib/c128/textio.p8
@@ -1,8 +1,4 @@
 ; Prog8 definitions for the Text I/O and Screen routines for the Commodore-64
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-;
-; indent format: TABS, size=8
 
 %import syslib
 %import conv
diff --git a/compiler/res/prog8lib/c64/floats.p8 b/compiler/res/prog8lib/c64/floats.p8
index 892faf4ea..dc5c5b204 100644
--- a/compiler/res/prog8lib/c64/floats.p8
+++ b/compiler/res/prog8lib/c64/floats.p8
@@ -1,8 +1,4 @@
 ; Prog8 definitions for floating point handling on the Commodore-64
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-;
-; indent format: TABS, size=8
 
 %option enable_floats
 %import floats_functions
diff --git a/compiler/res/prog8lib/c64/syslib.p8 b/compiler/res/prog8lib/c64/syslib.p8
index 9f0a675e8..895eac13c 100644
--- a/compiler/res/prog8lib/c64/syslib.p8
+++ b/compiler/res/prog8lib/c64/syslib.p8
@@ -1,9 +1,5 @@
 ; Prog8 definitions for the Commodore-64
 ; Including memory registers, I/O registers, Basic and Kernal subroutines.
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-;
-; indent format: TABS, size=8
 
 c64 {
         &ubyte  TIME_HI         = $a0       ; software jiffy clock, hi byte
diff --git a/compiler/res/prog8lib/c64/textio.p8 b/compiler/res/prog8lib/c64/textio.p8
index 118d3fa71..f59df6b07 100644
--- a/compiler/res/prog8lib/c64/textio.p8
+++ b/compiler/res/prog8lib/c64/textio.p8
@@ -1,8 +1,4 @@
 ; Prog8 definitions for the Text I/O and Screen routines for the Commodore-64
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-;
-; indent format: TABS, size=8
 
 %import syslib
 %import conv
diff --git a/compiler/res/prog8lib/conv.p8 b/compiler/res/prog8lib/conv.p8
index 35fb81c6f..a7b74ca4c 100644
--- a/compiler/res/prog8lib/conv.p8
+++ b/compiler/res/prog8lib/conv.p8
@@ -1,7 +1,4 @@
 ; Number conversions routines.
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-
 
 conv {
 
diff --git a/compiler/res/prog8lib/cx16/cx16diskio.p8 b/compiler/res/prog8lib/cx16/cx16diskio.p8
index e2c41d5ed..071ff70ec 100644
--- a/compiler/res/prog8lib/cx16/cx16diskio.p8
+++ b/compiler/res/prog8lib/cx16/cx16diskio.p8
@@ -1,6 +1,4 @@
 ; Cx16 specific disk drive I/O routines.
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
 
 %import diskio
 
diff --git a/compiler/res/prog8lib/cx16/floats.p8 b/compiler/res/prog8lib/cx16/floats.p8
index 7b7c0e5bd..8bbc2c622 100644
--- a/compiler/res/prog8lib/cx16/floats.p8
+++ b/compiler/res/prog8lib/cx16/floats.p8
@@ -1,8 +1,4 @@
 ; Prog8 definitions for floating point handling on the CommanderX16
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-;
-; indent format: TABS, size=8
 
 %option enable_floats
 %import floats_functions
diff --git a/compiler/res/prog8lib/cx16/syslib.p8 b/compiler/res/prog8lib/cx16/syslib.p8
index 9af6fedf2..953809f36 100644
--- a/compiler/res/prog8lib/cx16/syslib.p8
+++ b/compiler/res/prog8lib/cx16/syslib.p8
@@ -1,9 +1,5 @@
 ; Prog8 definitions for the CommanderX16
 ; Including memory registers, I/O registers, Basic and Kernal subroutines.
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-;
-; indent format: TABS, size=8
 
 c64 {
 
diff --git a/compiler/res/prog8lib/cx16/textio.p8 b/compiler/res/prog8lib/cx16/textio.p8
index f7c946ea4..ce61d7f6f 100644
--- a/compiler/res/prog8lib/cx16/textio.p8
+++ b/compiler/res/prog8lib/cx16/textio.p8
@@ -1,8 +1,4 @@
 ; Prog8 definitions for the Text I/O and Screen routines for the CommanderX16
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-;
-; indent format: TABS, size=8
 
 %import syslib
 %import conv
diff --git a/compiler/res/prog8lib/diskio.p8 b/compiler/res/prog8lib/diskio.p8
index 7fa9169b9..b7a1adb5b 100644
--- a/compiler/res/prog8lib/diskio.p8
+++ b/compiler/res/prog8lib/diskio.p8
@@ -1,6 +1,4 @@
 ; C64 and Cx16 disk drive I/O routines.
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
 
 %import textio
 %import string
diff --git a/compiler/res/prog8lib/math.asm b/compiler/res/prog8lib/math.asm
index 665c3e19b..51d4b9963 100644
--- a/compiler/res/prog8lib/math.asm
+++ b/compiler/res/prog8lib/math.asm
@@ -1,8 +1,6 @@
 ; Internal Math library routines - always included by the compiler
 ; Generic machine independent 6502 code.
 ;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-;
 ;  some more interesting routines can be found here:
 ;	http://6502org.wikidot.com/software-math
 ;	http://codebase64.org/doku.php?id=base:6502_6510_maths
diff --git a/compiler/res/prog8lib/math.p8 b/compiler/res/prog8lib/math.p8
index 1faa953b5..97d2e4f1e 100644
--- a/compiler/res/prog8lib/math.p8
+++ b/compiler/res/prog8lib/math.p8
@@ -1,6 +1,4 @@
 ; Internal Math library routines - always included by the compiler
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
 
 math {
 	%asminclude "library:math.asm"
diff --git a/compiler/res/prog8lib/prog8_lib.asm b/compiler/res/prog8lib/prog8_lib.asm
index ba0b1a501..03c3599a8 100644
--- a/compiler/res/prog8lib/prog8_lib.asm
+++ b/compiler/res/prog8lib/prog8_lib.asm
@@ -1,7 +1,5 @@
 ; Internal library routines - always included by the compiler
 ; Generic machine independent 6502 code.
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
 
 
 orig_stackpointer	.byte  0	; stores the Stack pointer register at program start
diff --git a/compiler/res/prog8lib/prog8_lib.p8 b/compiler/res/prog8lib/prog8_lib.p8
index 0a2b4e5b3..2e63bd41a 100644
--- a/compiler/res/prog8lib/prog8_lib.p8
+++ b/compiler/res/prog8lib/prog8_lib.p8
@@ -1,6 +1,4 @@
 ; Internal library routines - always included by the compiler
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
 
 prog8_lib {
 	%asminclude "library:prog8_lib.asm"
diff --git a/compiler/res/prog8lib/string.p8 b/compiler/res/prog8lib/string.p8
index 1c66c38ac..52bad608d 100644
--- a/compiler/res/prog8lib/string.p8
+++ b/compiler/res/prog8lib/string.p8
@@ -1,7 +1,4 @@
 ; 0-terminated string manipulation routines.
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-
 
 string {
 
diff --git a/compiler/res/prog8lib/virtual/conv.p8 b/compiler/res/prog8lib/virtual/conv.p8
index 652b37666..6518366c8 100644
--- a/compiler/res/prog8lib/virtual/conv.p8
+++ b/compiler/res/prog8lib/virtual/conv.p8
@@ -1,7 +1,4 @@
 ; Number conversions routines.
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-
 
 conv {
 
diff --git a/compiler/res/prog8lib/virtual/floats.p8 b/compiler/res/prog8lib/virtual/floats.p8
index 691e9d702..a47aac23b 100644
--- a/compiler/res/prog8lib/virtual/floats.p8
+++ b/compiler/res/prog8lib/virtual/floats.p8
@@ -1,6 +1,4 @@
 ; Prog8 definitions for floating point handling on the VirtualMachine
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
 
 %option enable_floats
 
diff --git a/compiler/res/prog8lib/virtual/math.p8 b/compiler/res/prog8lib/virtual/math.p8
index c88fce153..b8b107e11 100644
--- a/compiler/res/prog8lib/virtual/math.p8
+++ b/compiler/res/prog8lib/virtual/math.p8
@@ -1,6 +1,4 @@
 ; Internal Math library routines - always included by the compiler
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
 
 math {
 
diff --git a/compiler/res/prog8lib/virtual/prog8_lib.p8 b/compiler/res/prog8lib/virtual/prog8_lib.p8
index d457a25cd..59a2864e6 100644
--- a/compiler/res/prog8lib/virtual/prog8_lib.p8
+++ b/compiler/res/prog8lib/virtual/prog8_lib.p8
@@ -1,6 +1,4 @@
 ; Internal library routines - always included by the compiler
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
 
 %import textio
 
diff --git a/compiler/res/prog8lib/virtual/string.p8 b/compiler/res/prog8lib/virtual/string.p8
index 06aa15243..dbe2cbb4e 100644
--- a/compiler/res/prog8lib/virtual/string.p8
+++ b/compiler/res/prog8lib/virtual/string.p8
@@ -1,7 +1,4 @@
 ; 0-terminated string manipulation routines. For the Virtual Machine target.
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-
 
 string {
     sub length(str st) -> ubyte {
diff --git a/compiler/res/prog8lib/virtual/syslib.p8 b/compiler/res/prog8lib/virtual/syslib.p8
index b78844c26..68803cc36 100644
--- a/compiler/res/prog8lib/virtual/syslib.p8
+++ b/compiler/res/prog8lib/virtual/syslib.p8
@@ -1,7 +1,4 @@
 ; Prog8 definitions for the Virtual Machine
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
-;
 
 sys {
     ; ------- lowlevel system routines --------
diff --git a/compiler/res/prog8lib/virtual/textio.p8 b/compiler/res/prog8lib/virtual/textio.p8
index 3e37d2ee2..35ea70fe0 100644
--- a/compiler/res/prog8lib/virtual/textio.p8
+++ b/compiler/res/prog8lib/virtual/textio.p8
@@ -1,6 +1,4 @@
 ; Prog8 definitions for the Text I/O console routines for the Virtual Machine
-;
-; Written by Irmen de Jong (irmen@razorvine.net) - license: GNU GPL 3.0
 
 %import conv
 
diff --git a/compiler/res/version.txt b/compiler/res/version.txt
index b8eb02635..b80da0699 100644
--- a/compiler/res/version.txt
+++ b/compiler/res/version.txt
@@ -1 +1 @@
-8.1
+8.2-dev
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 0793e472c..7370f457d 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -30,11 +30,10 @@ Prog8 is copyright © Irmen de Jong (irmen@razorvine.net | http://www.razorvine.
 The project is on github: https://github.com/irmen/prog8.git
 
 **License:**
-The compiler itself and included libraries are free to use, but licensed under the GNU GPL 3.0, as written here https://www.gnu.org/licenses/gpl.html
-Any and all *outputs, generated by the compiler* (intermediary codes and compiled binary programs) are excluded from that and you
-can do with those whatever you want.
-This means, for instance, that you can freely use Prog8 to create commercial software but you can only sell/redistribute *the actual resulting program*.
-The *compiler itself* or any derivative made from it has to adhere to the GNU GPL 3.0 free open-source license linked above.
+This software is free to use, as defined in the GNU GPL 3.0 (https://www.gnu.org/licenses/gpl.html)
+*Exception:* All output files generated by the compiler (intermediary files and compiled binary programs)
+are excluded from this and you can do with those *whatever you want*.
+This means, for instance, that you can use the Prog8 compiler to create commercial software as long as only sell *the actual resulting program*.
 
 
 .. image:: _static/cube3d.png