programs/testing: Post-SVN tidy (#430)

- Move source code from `trunk` into root directory for each program.
- Update build files and ASM include paths. Add SPDX license header where appropriate.
- Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.

(Work towards [#75](KolibriOS/kolibrios#75), point 3)

Reviewed-on: KolibriOS/kolibrios#430
Reviewed-by: Mikhail Frolov <mixa.frolov2003@gmail.com>
Reviewed-by: Burer <burer@kolibrios.org>
Co-authored-by: Andrew <dent.ace@gmail.com>
Co-committed-by: Andrew <dent.ace@gmail.com>

data/Tupfile.lua

@@ -418,25 +418,25 @@ tup.append_table(img_files, {
  {"COLRDIAL", VAR_PROGS .. "/system/colrdial/color_dialog"},
  {"CROPFLAT", VAR_PROGS .. "/system/cropflat/cropflat"},
  {"CPU", VAR_PROGS .. "/system/cpu/cpu"},
- {"CPUID", VAR_PROGS .. "/testing/cpuid/trunk/CPUID"},
+ {"CPUID", VAR_PROGS .. "/testing/cpuid/CPUID"},
  {"DOCPACK", VAR_PROGS .. "/system/docpack/docpack"},
  {"DEFAULT.SKN", VAR_SKINS .. "/../skins/Leency/Shkvorka/Shkvorka.skn"},
- {"DISPTEST", VAR_PROGS .. "/testing/disptest/trunk/disptest"},
+ {"DISPTEST", VAR_PROGS .. "/testing/disptest/disptest"},
  {"END", VAR_PROGS .. "/system/end/light/end"},
  {"ESKIN", VAR_PROGS .. "/system/eskin/eskin"},
  {"FSPEED", VAR_PROGS .. "/testing/fspeed/fspeed"},
  {"GMON", VAR_PROGS .. "/system/gmon/gmon"},
  {"HDD_INFO", VAR_PROGS .. "/system/hdd_info/hdd_info"},
- {"KBD", VAR_PROGS .. "/testing/kbd/trunk/kbd"},
+ {"KBD", VAR_PROGS .. "/testing/kbd/kbd"},
  {"KPACK", VAR_PROGS .. "/other/kpack/trunk/kpack"},
  {"LAUNCHER", VAR_PROGS .. "/system/launcher/launcher"},
  {"LOADDRV", VAR_PROGS .. "/system/loaddrv/loaddrv"},
  {"MAGNIFY", VAR_PROGS .. "/system/magnify/magnify"},
- {"MGB", VAR_PROGS .. "/testing/mgb/trunk/mgb"},
+ {"MGB", VAR_PROGS .. "/testing/mgb/mgb"},
  {"MOUSEMUL", VAR_PROGS .. "/system/mousemul/mousemul"},
  {"MADMOUSE", VAR_PROGS .. "/other/madmouse/madmouse"},
  {"MYKEY", VAR_PROGS .. "/system/MyKey/MyKey"},
- {"PCIDEV", VAR_PROGS .. "/testing/pcidev/trunk/PCIDEV"},
+ {"PCIDEV", VAR_PROGS .. "/testing/pcidev/PCIDEV"},
  {"RDSAVE", VAR_PROGS .. "/system/rdsave/rdsave"},
  {"RTFREAD", VAR_PROGS .. "/other/rtfread/rtfread"},
  {"SEARCHAP", VAR_PROGS .. "/system/searchap/searchap"},
@@ -444,7 +444,7 @@ tup.append_table(img_files, {
  {"SETUP", VAR_PROGS .. "/system/setup/setup"},
  {"SKINCFG", VAR_PROGS .. "/system/skincfg/skincfg"},
  {"TERMINAL", VAR_PROGS .. "/system/terminal/terminal"},
- {"TEST", VAR_PROGS .. "/testing/protection/trunk/test"},
+ {"TEST", VAR_PROGS .. "/testing/protection/test"},
  {"TINYPAD", VAR_PROGS .. "/develop/tinypad/tinypad"},
  {"TINFO", VAR_PROGS .. "/system/tinfo/tinfo"},
  {"TIMER", VAR_PROGS .. "/other/Timer/Timer"},

programs/build_all.bat

@@ -60,19 +60,19 @@ fasm system\calendar\calendar.asm %BIN%\calendar
 fasm system\board\board.asm %BIN%\develop\board
 rem fasm system\commouse\trunk\commouse.asm %BIN%\commouse
 fasm system\cpu\cpu.asm %BIN%\cpu
-rem fasm system\cpuid\trunk\cpuid.asm %BIN%\cpuid
+fasm testing\cpuid\cpuid.asm %BIN%\cpuid
 fasm system\skincfg\skincfg.asm %BIN%\skincfg
 fasm system\docpack\docpack.asm %BIN%\docpack
 fasm system\end\end.asm %BIN%\end
 fasm system\gmon\gmon.asm %BIN%\gmon
 fasm system\icon\icon.asm %BIN%\icon
-rem fasm system\kbd\trunk\kbd.ASM %BIN%\kbd
+fasm testing\kbd\kbd.ASM %BIN%\kbd
 fasm system\launcher\launcher.asm %BIN%\launcher
 fasm system\menu\menu.asm %BIN%\@menu
-rem fasm system\mgb\trunk\mgb.asm %BIN%\mgb
+fasm testing\mgb\mgb.asm %BIN%\mgb
 fasm system\mousemul\mousemul.asm %BIN%\mousemul
 fasm system\taskbar\TASKBAR.ASM %BIN%\@TASKBAR
-rem fasm system\pcidev\trunk\pcidev.asm %BIN%\pcidev
+fasm testing\pcidev\pcidev.asm %BIN%\pcidev
 rem fasm system\RB\trunk\@RB.ASM %BIN%\@RB
 fasm system\rdsave\rdsave.asm %BIN%\rdsave
 fasm system\run\run.asm %BIN%\run
@@ -238,7 +238,7 @@ fasm develop\heed\heed.asm %BIN%\nightbuild\heed
 fasm develop\tinypad\tinypad.asm %BIN%\nightbuild\tinypad
 fasm system\skincfg\skincfg.asm %BIN%\nightbuild\skincfg
 fasm system\hdd_info\hdd_info.asm %BIN%\nightbuild\hdd_info
-rem fasm system\mgb\trunk\mgb.asm %BIN%\nightbuild\mgb
+fasm testing\mgb\mgb.asm %BIN%\nightbuild\mgb
 fasm system\rdsave\rdsave.asm %BIN%\nightbuild\rdsave
 fasm other\kpack\trunk\kpack.asm %BIN%\nightbuild\kpack
 fasm other\rtfread\rtfread.asm %BIN%\nightbuild\rtfread

programs/testing/cpuid/CPUID.ASM

@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;******************************************************************************
 ; project name:  CPUID                                                        *
 ; platform:      KolibriOS, x86 (IA-32), x86-64 achitectures                  *
@@ -15,8 +18,7 @@
 ;                your changes to the maintainer or make about post changes    *
 ;                at forum  http://board.kolibrios.org/viewtopic.php?f=42&t=594*
 ;-----------------------------------------------------------------------------*
-; English comments                                                            *
-;------------------------------------------------------------------------------
+
 use32
   org    0x0
   db     'MENUET01'
@@ -28,10 +30,10 @@ use32
   dd     0x0
   dd     path
 
-include '..\..\..\develop\libraries\box_lib\load_lib.mac'
-include '..\..\..\macros.inc'
-include '../../../gui_patterns.inc'
-include '../../../KOSfuncs.inc'
+include '../../develop/libraries/box_lib/load_lib.mac'
+include '../../macros.inc'
+include '../../gui_patterns.inc'
+include '../../KOSfuncs.inc'
 include 'lang.inc' ; Language support for locales: it_IT, en_US.
 include 'draw.inc'
 include 'brand.inc'     ; brand ID decoding

programs/testing/cpuid/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/testing/disptest/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/testing/disptest/disptest.ASM

@@ -1,3 +1,8 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
 ;------------------------------------------------------------------------------
 ; Display Test for KolibriOS
 ;------------------------------------------------------------------------------
@@ -13,12 +18,12 @@
 
 ; <--- include all MeOS stuff --->
 include "lang.inc" ; Language support for locales: ru_RU (CP866), en_US.
-include "../../../macros.inc"
+include "../../macros.inc"
 
 ; <--- start of MenuetOS application --->
 MEOS_APP_START
 
-;include "..\..\..\debug.inc"
+;include "../../debug.inc"
 
 
 ; <--- start of code --->

programs/testing/kbd/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/testing/kbd/kbd.ASM

@@ -1,4 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
 ;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ; Kolibri Bus Disconnect
 ;   Test for bus disconnect
 ;
@@ -6,7 +11,7 @@
 ;
 ;
 
-include '..\..\..\macros.inc'
+include '../../macros.inc'
 include 'lang.inc' ; Language support for locales: it_IT, en_US.
 
 memsize = 1000h
@@ -613,4 +618,3 @@ I_END:
 sc      system_colors
 val_hdd dd ?
 val_sgd dd ?
-

programs/testing/latency/latency.asm

@@ -1,4 +1,7 @@
-			;;      CPU latency test -- Art J    ;;
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; CPU latency test -- Art J
 
 
   use32 	     ;
@@ -13,7 +16,7 @@
   dd	 0x0	     ;
   dd	 0x0	     ;
 
-include '..\..\..\macros.inc' ;
+include '../../macros.inc' ;
 
 
 START:

programs/testing/mgb/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/testing/mgb/mgb.asm

@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ;=============================================================================
 ; Kolibri Graphics Benchmark 0.9
 ;--------------------------------------
@@ -80,13 +86,13 @@ use32
 	dd fname_buf
 	dd cur_dir_path
 
-include '../../../config.inc'		;for nightbuild
-include '../../../macros.inc'
-include '../../../proc32.inc'
-;include '../../../debug.inc'
-include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
-include '../../../develop/libraries/box_lib/load_lib.mac'
-include 'lang.inc'	;language support
+include '../../config.inc'		;for nightbuild
+include '../../macros.inc'
+include '../../proc32.inc'
+;include '../../debug.inc'
+include '../../develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../develop/libraries/box_lib/load_lib.mac'
+include 'lang.inc' ; Language support for locales: it_IT, ru_RU (CP866), en_US
 	@use_library
 ;---------------------------------------------------------------------
 start:

programs/testing/pcidev/PCIDEV.ASM

@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;***************************************************************
 ; project name:    PCI Device Enumeration
 ; target platform: KolibriOS
@@ -29,10 +32,10 @@
 	dd file_name	; I_Param
 	dd path		; APPLICATION PATH
 ;-----------------------------------------------------------------------------
-include 'lang.inc'	;language support
-include '../../../KOSfuncs.inc'
-include '../../../macros.inc'
-include	'../../../load_lib.mac'
+include 'lang.inc' ; Language support for locales: it_IT, en_US
+include '../../KOSfuncs.inc'
+include '../../macros.inc'
+include	'../../load_lib.mac'
 ;-----------------------------------------------------------------------------
 @use_library	; load_lib macro
 ;-----------------------------------------------------------------------------

programs/testing/pcidev/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/testing/protection/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 

programs/testing/protection/test.asm

@@ -1,3 +1,8 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
 ;-------------------------------------------------------------------------------
 ;
 ;    PROTECTION TEST
@@ -21,8 +26,8 @@ use32
         dd 0x0          ; I_Param
         dd 0x0          ; I_Icon
 ;-------------------------------------------------------------------------------
-include '../../../macros.inc'
-include 'lang.inc'
+include '../../macros.inc'
+include 'lang.inc' ; Language support for locales: it_IT, ru_RU (CP866), en_US
 ;-------------------------------------------------------------------------------
 START:                          ; start of execution
 red:                            ; redraw