Merge 'dev' ~ 'up-v562-beta' + fixes + build (Makefile.win) improvements

Author: rivy

.vscode/launch.json

@@ -13,11 +13,9 @@
             "externalConsole": false,
             "logging": { "engineLogging": true },
             "MIMode": "gdb",
-            // "miDebuggerPath": "${workspaceFolder}/dbin/gdb-chcp1257.BAT",
             "miDebuggerPath": "gdb.exe",
             "setupCommands": [ { "text": "-enable-pretty-printing", "description": "Enable GDB pretty printing", "ignoreFailures": true } ],
-            // "preLaunchTask": "${defaultBuildTask}", // PENDING: see <https://github.com/microsoft/vscode/pull/80478> , <https://github.com/Microsoft/vscode/issues/32239>
-            "preLaunchTask": "Build (gcc; debug)"
+            "preLaunchTask": "${defaultBuildTask}",
         }
     ]
 }

.vscode/tasks.json

@@ -1,13 +1,29 @@
 {
     "version": "2.0.0",
     "tasks": [
+        {
+            "label": "Build (clang; debug)",
+            "type": "shell",
+            "command": "make",
+            "args": [
+                "-f",
+                "Makefile.win",
+                "CC=clang",
+                "DEBUG=1"
+            ],
+            "group": "build",
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
         {
             "label": "Build (gcc; debug)",
             "type": "shell",
             "command": "make",
             "args": [
                 "-f",
-                "Makefile.win.mingw",
+                "Makefile.win",
+                "CC=gcc",
                 "DEBUG=1"
             ],
             "group": {
@@ -24,33 +40,45 @@
             "command": "make",
             "args": [
                 "-f",
-                "Makefile.win.mingw",
+                "Makefile.win",
                 "clean"
             ],
-            "group": {
-                "kind": "none"
-            },
+            "group": "none",
             "problemMatcher": [
                 "$gcc"
             ]
         },
         {
+            "label": "REBuild (clang; debug)",
             "type": "shell",
-            "label": "clang.exe build active file",
-            "command": "C:\\Users\\Roy\\AppData\\Local\\scoop\\apps\\clang\\7.0.0\\bin\\clang.exe",
+            "command": "make",
             "args": [
-                "-g",
-                "${file}",
-                "-o",
-                "${fileDirname}\\${fileBasenameNoExtension}.exe"
+                "rebuild",
+                "-f",
+                "Makefile.win",
+                "CC=clang",
+                "DEBUG=1"
             ],
-            "options": {
-                "cwd": "C:\\Users\\Roy\\AppData\\Local\\scoop\\apps\\clang\\7.0.0\\bin"
-            },
+            "group": "build",
             "problemMatcher": [
                 "$gcc"
+            ]
+        },
+        {
+            "label": "REBuild (gcc; debug)",
+            "type": "shell",
+            "command": "make",
+            "args": [
+                "rebuild",
+                "-f",
+                "Makefile.win",
+                "CC=gcc",
+                "DEBUG=1"
             ],
-            "group": "build"
-        }
+            "group": "build",
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
     ]
 }

INSTALL.upstream

@@ -183,4 +183,3 @@ operates.
      script, and exit.
 
 `configure' also accepts some other, not widely useful, options.
-

LICENSE.upstream

@@ -24,4 +24,3 @@ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

Makefile.aut

@@ -4,7 +4,7 @@ EMAIL = bug-less@gnu.org
 HOMEPAGE = http://www.greenwoodsoftware.com/less
 SHELL = /bin/sh
 GIT = git
-NROFF = nroff -man
+NROFF = nroff -t -man
 
 srcdir = .