programs/system: Post-SVN tidy

- Tidy `build_all.bat` build file; comment out absent programs.

contrib/C_Layer/ASM/loadboxlib.asm

@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 format coff
 use32                                   ; Tell compiler to use 32 bit instructions
 
@@ -8,7 +11,7 @@ include '../../../programs/macros.inc'
 purge section,mov,add,sub
 
 include '../../../programs/develop/libraries/box_lib/trunk/box_lib.mac'
-include '../../../programs/system/run/trunk/txtbut.inc'
+include '../../../programs/system/run/txtbut.inc'
 include '../../../programs/dll.inc'
 
 public init_boxlib as '_kolibri_boxlib_init'

data/Tupfile.lua

@@ -61,7 +61,7 @@ img_files = {
  {"SETTINGS/FB2READ.INI", "common/settings/fb2read.ini"},
  {"SETTINGS/HA.CFG", SRC_PROGS .. "/other/ha/SETTINGS/HA.CFG"},
  {"SETTINGS/ICON.INI", build_type .. "/settings/icon.ini"},
- {"SETTINGS/KEYMAP.KEY", SRC_PROGS .. "/system/taskbar/trunk/KEYMAP.KEY"},
+ {"SETTINGS/KEYMAP.KEY", SRC_PROGS .. "/system/taskbar/KEYMAP.KEY"},
  {"SETTINGS/KOLIBRI.LBL", build_type .. "/settings/kolibri.lbl"},
  {"SETTINGS/LANG.INI", build_type .. "/settings/lang.ini"},
  {"SETTINGS/MENU.DAT", build_type .. "/settings/menu.dat"},
@@ -80,7 +80,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"GAMES/DESCENT", build_type .. "/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/rus/.shell"},
  {"SETTINGS/GAMES.INI", "ru_RU/settings/games.ini"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "ru_RU/settings/syspanel.ini"},
 }) elseif build_type == "en_US" then tup.append_table(img_files, {
  {"WELCOME.HTM", VAR_DATA .. "/" .. build_type .. "/welcome.htm.kpack"},
@@ -90,7 +90,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"GAMES/DESCENT", "common/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"},
  {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) elseif build_type == "es_ES" then tup.append_table(img_files, {
  {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"},
@@ -99,7 +99,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"GAMES/DESCENT", "common/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"},
  {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) elseif build_type == "it_IT" then tup.append_table(img_files, {
  {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"},
@@ -107,7 +107,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
  {"GAMES/DESCENT", "common/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey_it.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey_it.ini"},
  {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
  {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) else tup.append_table(img_files, {
@@ -117,7 +117,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"GAMES/DESCENT", "common/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"},
  {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) end
 
@@ -316,14 +316,14 @@ if build_type == "ru_RU" then tup.append_table(extra_files, {
  {"Docs/cp866/Hot_Keys.txt", build_type .. "/docs/Hot_Keys.txt"},
  {"Docs/cp866/Install.txt", build_type .. "/docs/Install.txt"},
  {"Docs/cp866/Credits.txt", build_type .. "/docs/Credits.txt"},
- {"Docs/cp866/SysFuncr.txt", VAR_PROGS .. "/system/docpack/trunk/SysFuncr.txt"},
+ {"Docs/cp866/SysFuncr.txt", VAR_PROGS .. "/system/docpack/SysFuncr.txt"},
  {"Docs/cp1251/Config.txt", VAR_DATA .. "/" .. build_type .. "/docs/CONFIG.WIN.TXT", cp1251_from = build_type .. "/docs/Config.txt"},
  {"Docs/cp1251/Copying.txt", "$(VAR_DATA)/$(build_type)/docs/COPYING.WIN.TXT", cp1251_from = build_type .. "/docs/Copying.txt"},
  {"Docs/cp1251/History.txt", "$(VAR_DATA)/$(build_type)/docs/HISTORY.WIN.TXT", cp1251_from = build_type .. "/docs/History.txt"},
  {"Docs/cp1251/Hot_Keys.txt", "$(VAR_DATA)/$(build_type)/docs/HOT_KEYS.WIN.TXT", cp1251_from = build_type .. "/docs/Hot_Keys.txt"},
  {"Docs/cp1251/Install.txt", "$(VAR_DATA)/$(build_type)/docs/INSTALL.WIN.TXT", cp1251_from = build_type .. "/docs/Install.txt"},
  {"Docs/cp1251/credits.txt", "$(VAR_DATA)/$(build_type)/docs/CREDITS.WIN.TXT", cp1251_from = build_type .. "/docs/Credits.txt"},
- {"Docs/cp1251/SysFuncr.txt", "$(VAR_DATA)/$(build_type)/docs/SYSFUNCR.WIN.TXT", cp1251_from = SRC_PROGS .. "/system/docpack/trunk/SysFuncr.txt"},
+ {"Docs/cp1251/SysFuncr.txt", "$(VAR_DATA)/$(build_type)/docs/SYSFUNCR.WIN.TXT", cp1251_from = SRC_PROGS .. "/system/docpack/SysFuncr.txt"},
  {"HD_Load/9x2klbr/", SRC_PROGS .. "/hd_load/9x2klbr/readme_dos.txt"},
  {"HD_Load/9x2klbr/", SRC_PROGS .. "/hd_load/9x2klbr/readme_win.txt"},
  {"HD_Load/mtldr/", SRC_PROGS .. "/hd_load/mtldr/install.txt"},
@@ -346,7 +346,7 @@ if build_type == "ru_RU" then tup.append_table(extra_files, {
  {"Docs/Hot_Keys.txt", build_type .. "/docs/Hot_Keys.txt"},
  {"Docs/Install.txt", build_type .. "/docs/Install.txt"},
  {"Docs/Credits.txt", build_type .. "/docs/Credits.txt"},
- {"Docs/SysFuncs.txt", VAR_PROGS .. "/system/docpack/trunk/SysFuncs.txt"},
+ {"Docs/SysFuncs.txt", VAR_PROGS .. "/system/docpack/SysFuncs.txt"},
  {"HD_Load/9x2klbr/", SRC_PROGS .. "/hd_load/9x2klbr/readme.txt"},
  {"HD_Load/mtldr/install.txt", SRC_PROGS .. "/hd_load/mtldr/install_eng.txt"},
  {"HD_Load/USB_Boot/readme.txt", SRC_PROGS .. "/hd_load/usb_boot/readme_eng.txt"},
@@ -397,13 +397,13 @@ tup.append_table(iso_extra_files, {
 if tup.getconfig('NO_FASM') ~= 'full' then
 tup.append_table(img_files, {
  {"KERNEL.MNT", VAR_PROGS .. "/../kernel/trunk/kernel.mnt"},
- {"@DOCKY", VAR_PROGS .. "/system/docky/trunk/docky"},
+ {"@DOCKY", VAR_PROGS .. "/system/docky/docky"},
  {"@HA", VAR_PROGS .. "/other/ha/HA"},
  {"@ICON", VAR_PROGS .. "/system/icon_new/icon"},
- {"@MENU", VAR_PROGS .. "/system/menu/trunk/menu"},
+ {"@MENU", VAR_PROGS .. "/system/menu/menu"},
  {"@NOTIFY", VAR_PROGS .. "/system/notify3/notify"},
  {"@OPEN", VAR_PROGS .. "/system/open/open"},
- {"@TASKBAR", VAR_PROGS .. "/system/taskbar/trunk/TASKBAR"},
+ {"@TASKBAR", VAR_PROGS .. "/system/taskbar/TASKBAR"},
  {"@SS", VAR_PROGS .. "/system/scrsaver/scrsaver"},
  {"@VOLUME", VAR_PROGS .. "/media/volume/volume"},
  {"HACONFIG", VAR_PROGS .. "/other/ha/HACONFIG"},
@@ -411,42 +411,42 @@ tup.append_table(img_files, {
  {"APM", VAR_PROGS .. "/system/apm/apm"},
  {"CALC", VAR_PROGS .. "/other/calc/calc"},
  {"CALCPLUS", VAR_PROGS .. "/other/calcplus/calcplus"},
- {"CALENDAR", VAR_PROGS .. "/system/calendar/trunk/calendar"},
+ {"CALENDAR", VAR_PROGS .. "/system/calendar/calendar"},
  {"COLRDIAL", VAR_PROGS .. "/system/colrdial/color_dialog"},
  {"CROPFLAT", VAR_PROGS .. "/system/cropflat/cropflat"},
- {"CPU", VAR_PROGS .. "/system/cpu/trunk/cpu"},
+ {"CPU", VAR_PROGS .. "/system/cpu/cpu"},
  {"CPUID", VAR_PROGS .. "/testing/cpuid/trunk/CPUID"},
- {"DOCPACK", VAR_PROGS .. "/system/docpack/trunk/docpack"},
+ {"DOCPACK", VAR_PROGS .. "/system/docpack/docpack"},
  {"DEFAULT.SKN", VAR_SKINS .. "/../skins/Leency/Shkvorka/Shkvorka.skn"},
  {"DISPTEST", VAR_PROGS .. "/testing/disptest/trunk/disptest"},
  {"END", VAR_PROGS .. "/system/end/light/end"},
- {"ESKIN", VAR_PROGS .. "/system/eskin/trunk/eskin"},
+ {"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/trunk/hdd_info"},
+ {"HDD_INFO", VAR_PROGS .. "/system/hdd_info/hdd_info"},
  {"KBD", VAR_PROGS .. "/testing/kbd/trunk/kbd"},
  {"KPACK", VAR_PROGS .. "/other/kpack/trunk/kpack"},
- {"LAUNCHER", VAR_PROGS .. "/system/launcher/trunk/launcher"},
+ {"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"},
- {"MOUSEMUL", VAR_PROGS .. "/system/mousemul/trunk/mousemul"},
+ {"MOUSEMUL", VAR_PROGS .. "/system/mousemul/mousemul"},
  {"MADMOUSE", VAR_PROGS .. "/other/madmouse/madmouse"},
- {"MYKEY", VAR_PROGS .. "/system/MyKey/trunk/MyKey"},
+ {"MYKEY", VAR_PROGS .. "/system/MyKey/MyKey"},
  {"PCIDEV", VAR_PROGS .. "/testing/pcidev/trunk/PCIDEV"},
- {"RDSAVE", VAR_PROGS .. "/system/rdsave/trunk/rdsave"},
+ {"RDSAVE", VAR_PROGS .. "/system/rdsave/rdsave"},
  {"RTFREAD", VAR_PROGS .. "/other/rtfread/rtfread"},
  {"SEARCHAP", VAR_PROGS .. "/system/searchap/searchap"},
  {"SCRSHOOT", VAR_PROGS .. "/media/scrshoot/scrshoot"},
- {"SETUP", VAR_PROGS .. "/system/setup/trunk/setup"},
+ {"SETUP", VAR_PROGS .. "/system/setup/setup"},
- {"SKINCFG", VAR_PROGS .. "/system/skincfg/trunk/skincfg"},
+ {"SKINCFG", VAR_PROGS .. "/system/skincfg/skincfg"},
  {"TERMINAL", VAR_PROGS .. "/system/terminal/terminal"},
  {"TEST", VAR_PROGS .. "/testing/protection/trunk/test"},
  {"TINYPAD", VAR_PROGS .. "/develop/tinypad/trunk/tinypad"},
  {"TINFO", VAR_PROGS .. "/system/tinfo/tinfo"},
  {"TIMER", VAR_PROGS .. "/other/Timer/Timer"},
  {"UNZ", VAR_PROGS .. "/fs/unz/unz"},
- {"ZKEY", VAR_PROGS .. "/system/zkey/trunk/ZKEY"},
+ {"ZKEY", VAR_PROGS .. "/system/zkey/ZKEY"},
  {"3D/3DWAV", VAR_PROGS .. "/demos/3dwav/trunk/3dwav"},
  {"3D/CROWNSCR", VAR_PROGS .. "/demos/crownscr/trunk/crownscr"},
  {"3D/3DCUBE2", VAR_PROGS .. "/demos/3dcube2/trunk/3DCUBE2"},
@@ -467,7 +467,7 @@ tup.append_table(img_files, {
  {"DEMOS/UNVWATER", VAR_PROGS .. "/demos/unvwater/unvwater"},
  {"DEMOS/WEB", VAR_PROGS .. "/demos/web/trunk/web"},
  {"DEMOS/ZEROLINE", VAR_PROGS .. "/demos/zeroline/trunk/zeroline"},
- {"DEVELOP/BOARD", VAR_PROGS .. "/system/board/trunk/board"},
+ {"DEVELOP/BOARD", VAR_PROGS .. "/system/board/board"},
  {"DEVELOP/DBGBOARD", VAR_PROGS .. "/system/dbgboard/dbgboard"},
  {"DEVELOP/CEDIT", SRC_PROGS .. "/develop/cedit/CEDIT"},
  {"DEVELOP/CHARSETS", VAR_PROGS .. "/develop/charsets/charsets"},

programs/bcc32/include/kos_unpack.inc

@@ -1,7 +1,10 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 @@unpack$qqspvt1 equ unpack
 
-include "..\..\system\skincfg\trunk\kglobals.inc"
+include "..\..\system\skincfg\kglobals.inc"
-include "..\..\system\skincfg\trunk\unpacker.inc"
+include "..\..\system\skincfg\unpacker.inc"
 
 IncludeIGlobals
 IncludeUGlobals

programs/build_all.bat

@@ -56,32 +56,32 @@ for %%i in (%BIN% %BIN%\demos %BIN%\develop %BIN%\lib %BIN%\games %BIN%\network
 echo *
 echo Building system
 echo *
-fasm system\calendar\trunk\calendar.asm %BIN%\calendar
+fasm system\calendar\calendar.asm %BIN%\calendar
-fasm system\board\trunk\board.asm %BIN%\develop\board
+fasm system\board\board.asm %BIN%\develop\board
-fasm system\commouse\trunk\commouse.asm %BIN%\commouse
+rem fasm system\commouse\trunk\commouse.asm %BIN%\commouse
-fasm system\cpu\trunk\cpu.asm %BIN%\cpu
+fasm system\cpu\cpu.asm %BIN%\cpu
-fasm system\cpuid\trunk\cpuid.asm %BIN%\cpuid
+rem fasm system\cpuid\trunk\cpuid.asm %BIN%\cpuid
-fasm system\skincfg\trunk\skincfg.asm %BIN%\skincfg
+fasm system\skincfg\skincfg.asm %BIN%\skincfg
-fasm system\docpack\trunk\docpack.asm %BIN%\docpack
+fasm system\docpack\docpack.asm %BIN%\docpack
-fasm system\end\trunk\end.asm %BIN%\end
+fasm system\end\end.asm %BIN%\end
 fasm system\gmon\gmon.asm %BIN%\gmon
-fasm system\icon\trunk\icon.asm %BIN%\icon
+fasm system\icon\icon.asm %BIN%\icon
-fasm system\kbd\trunk\kbd.ASM %BIN%\kbd
+rem fasm system\kbd\trunk\kbd.ASM %BIN%\kbd
-fasm system\launcher\trunk\launcher.asm %BIN%\launcher
+fasm system\launcher\launcher.asm %BIN%\launcher
-fasm system\menu\trunk\menu.asm %BIN%\@menu
+fasm system\menu\menu.asm %BIN%\@menu
-fasm system\mgb\trunk\mgb.asm %BIN%\mgb
+rem fasm system\mgb\trunk\mgb.asm %BIN%\mgb
-fasm system\mousemul\trunk\mousemul.asm %BIN%\mousemul
+fasm system\mousemul\mousemul.asm %BIN%\mousemul
-fasm system\PANEL\trunk\@TASKBAR.ASM %BIN%\@TASKBAR
+fasm system\PANEL\@TASKBAR.ASM %BIN%\@TASKBAR
-fasm system\pcidev\trunk\pcidev.asm %BIN%\pcidev
+rem fasm system\pcidev\trunk\pcidev.asm %BIN%\pcidev
-fasm system\RB\trunk\@RB.ASM %BIN%\@RB
+rem fasm system\RB\trunk\@RB.ASM %BIN%\@RB
-fasm system\rdsave\trunk\rdsave.asm %BIN%\rdsave
+fasm system\rdsave\rdsave.asm %BIN%\rdsave
-fasm system\run\trunk\run.asm %BIN%\run
+fasm system\run\run.asm %BIN%\run
-fasm system\setup\trunk\setup.asm %BIN%\setup
+fasm system\setup\setup.asm %BIN%\setup
-fasm system\skinsel\skinsel.asm %BIN%\skinsel
+rem fasm system\skinsel\skinsel.asm %BIN%\skinsel
-fasm system\ss\trunk\@ss.asm %BIN%\@ss
+rem fasm system\ss\trunk\@ss.asm %BIN%\@ss
-fasm system\vrr\trunk\vrr.asm %BIN%\vrr
+rem fasm system\vrr\trunk\vrr.asm %BIN%\vrr
-fasm system\vrr_m\trunk\vrr_m.asm %BIN%\vrr_m
+rem fasm system\vrr_m\trunk\vrr_m.asm %BIN%\vrr_m
-fasm system\zkey\trunk\zkey.asm %BIN%\zkey
+fasm system\zkey\zkey.asm %BIN%\zkey
 
 echo *
 echo Building develop
@@ -237,10 +237,10 @@ fasm media\animage\animage.asm %BIN%\nightbuild\animage
 fasm media\midamp\trunk\midamp.asm %BIN%\nightbuild\midamp
 fasm develop\heed\trunk\heed.asm %BIN%\nightbuild\heed
 fasm develop\tinypad\trunk\tinypad.asm %BIN%\nightbuild\tinypad
-fasm system\skincfg\trunk\skincfg.asm %BIN%\nightbuild\skincfg
+fasm system\skincfg\skincfg.asm %BIN%\nightbuild\skincfg
-fasm system\hdd_info\trunk\hdd_info.asm %BIN%\nightbuild\hdd_info
+fasm system\hdd_info\hdd_info.asm %BIN%\nightbuild\hdd_info
-fasm system\mgb\trunk\mgb.asm %BIN%\nightbuild\mgb
+rem fasm system\mgb\trunk\mgb.asm %BIN%\nightbuild\mgb
-fasm system\rdsave\trunk\rdsave.asm %BIN%\nightbuild\rdsave
+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
 ;restore

programs/develop/kol_f_edit/kol_f_edit.asm

@@ -1,3 +1,8 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
 use32
 	org 0
 	db 'MENUET01'
@@ -9,8 +14,8 @@ include '../../proc32.inc'
 include '../../load_lib.mac'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 include '../../dll.inc'
-include '../../system/skincfg/trunk/kglobals.inc'
+include '../../system/skincfg/kglobals.inc'
-include '../../system/skincfg/trunk/unpacker.inc'
+include '../../system/skincfg/unpacker.inc'
 include 'strlen.inc'
 include 'obj_codes.inc'
 

programs/develop/libraries/box_lib/trunk/box_lib.asm

@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page Windows 1251 - Cyrillic
+
+
 ;*****************************************************************************
 ; Box_Lib - library of graphical components
 ; Copyright (C) KolibriOS team 2008-2020. All rights reserved.
@@ -22,8 +28,8 @@ include '../../../../KOSfuncs.inc'
 include 'box_lib.mac' ;macro which should make life easier :)
 ;include '../../../../debug.inc'
 include 'keys.inc'
-include '../../../../system/skincfg/trunk/kglobals.inc'
+include '../../../../system/skincfg/kglobals.inc'
-include '../../../../system/skincfg/trunk/unpacker.inc'
+include '../../../../system/skincfg/unpacker.inc'
 
 ;-----------------------------------------------------------------------------
 mem.alloc   dd ? ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

programs/develop/libraries/libs-dev/libimg/xcf/xcf.asm

@@ -27,7 +27,7 @@
 ;;                                                                                                ;;
 ;;================================================================================================;;
 include	'xcf.inc'
-;include	'../../../../../system/board/trunk/debug.inc'
+;include	'../../../../../system/board/debug.inc'
 
 MAX_LAYERS		=	255
 

programs/games/snake/snake.asm

@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;;===HEADER====================================================================================================================
 
 use32
@@ -11,7 +14,7 @@ include '../../proc32.inc'
 include '../../macros.inc'
 include '../../dll.inc'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
-;include '../../system/board/trunk/debug.inc'
+;include '../../system/board/debug.inc'
 
 ;;===Define_chapter============================================================================================================
 

programs/other/t_edit/t_edit.asm

@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ;<3B><>஬<EFBFBD><E0AEAC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>୮<EFBFBD><E0ADAE><EFBFBD> <20>ᥬ, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD>/ᮢ<>⮬/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ...
 
 use32
@@ -17,8 +23,8 @@ include '../../KOSfuncs.inc'
 include '../../load_img.inc'
 include '../../load_lib.mac'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
-include '../../system/skincfg/trunk/kglobals.inc'
+include '../../system/skincfg/kglobals.inc'
-include '../../system/skincfg/trunk/unpacker.inc'
+include '../../system/skincfg/unpacker.inc'
 include 'lang.inc'
 
 include 't_data.inc'

programs/other/t_edit_synt/te_syntax.asm

@@ -1,3 +1,8 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
 use32
   org 0
   db 'MENUET01' ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20>ᯮ<EFBFBD><E1AFAE>塞<EFBFBD><EFA5AC><EFBFBD> 䠩<><E4A0A9> <20>ᥣ<EFBFBD><E1A5A3> 8 <20><><EFBFBD><EFBFBD>
@@ -13,8 +18,8 @@ include '../../KOSfuncs.inc'
 include '../../load_img.inc'
 include '../../load_lib.mac'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
-include '../../system/skincfg/trunk/kglobals.inc'
+include '../../system/skincfg/kglobals.inc'
-include '../../system/skincfg/trunk/unpacker.inc'
+include '../../system/skincfg/unpacker.inc'
 include 'te_data.inc'
 include 'te_work.inc' ;text work functions
 

programs/system/MyKey/ASPAPI.INC

@@ -1,4 +1,7 @@
-include '../../../proc32.inc'
+; SPDX-License-Identifier: NOASSERTION
+;
+
+include '../../proc32.inc'
 
 macro start_draw_window x,y,xsize,ysize,areacolor,caption,capsize
 {
@@ -160,4 +163,3 @@ macro putpixel x,y,color
   mov edx, color
   int 0x40
 }
-

programs/system/MyKey/MyKey.asm

@@ -1,4 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
 ;
+
 ;   MyKey. Version 0.2.
 ;
 ;   Author:         Asper
@@ -23,13 +25,13 @@ include 'lang.inc' ; Language support for locales: it_IT, en_US.
 
 include 'string.inc'
 ;include 'macros.inc'
-include '../../../macros.inc'
+include '../../macros.inc'
 include 'ASPAPI.INC'
 ;include 'editbox_ex.mac'
-include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 ;include 'load_lib.mac'
-include '../../../develop/libraries/box_lib/load_lib.mac'
+include '../../develop/libraries/box_lib/load_lib.mac'
-include '../../../dll.inc'
+include '../../dll.inc'
 
 include 'debug.inc'
 DEBUG	 equ 0;1

programs/system/MyKey/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/system/board/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/system/board/board.asm

@@ -1,3 +1,8 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
 ;------------------------------------------------------------------------------
 ; DEBUG BOARD for APPLICATIONS and KERNEL DEVELOPMENT
 ; See f63
@@ -15,8 +20,8 @@ org 0
         dd      0
 ;------------------------------------------------------------------------------
 include 'lang.inc'
-include '../../../macros.inc'
+include '../../macros.inc'
-include '../../../debug.inc'
+include '../../debug.inc'
 purge   newline
 ;SMALL FONT
 MAXSTRINGS = 45

programs/system/calendar/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/system/calendar/calendar.asm

@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ; Calendar for KolibriOS
 ;
 ; v1.5 - time redesign by Heavyiron
@@ -21,7 +24,7 @@ use32
   dd	 0x1000
   dd	 0x0
   dd	 0x0
-include '..\..\..\macros.inc'
+include '..\..\macros.inc'
 include 'lang.inc'
 include 'data.inc'
 

programs/system/cpu/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/system/cpu/cpu.asm

@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;-----------------------;
 ; CPU - process manager ;
 ;-----------------------;
@@ -17,10 +20,10 @@
         dd      cur_dir_path     ; path
 ;-------------------------------------------------------------------------------
 include "lang.inc" ; Language support for locales (UTF-8): de_DE, et_EE, ru_RU, it_IT, en_US.
-include "../../../macros.inc"
+include "../../macros.inc"
-include "../../../develop/libraries/box_lib/trunk/box_lib.mac"
+include "../../develop/libraries/box_lib/trunk/box_lib.mac"
-include "../../../KOSfuncs.inc"
+include "../../KOSfuncs.inc"
-include "../../../load_lib.mac"
+include "../../load_lib.mac"
 ;-------------------------------------------------------------------------------
 DISPLAY_PROCESSES = 20  ;number of processes to show
 ;-------------------------------------------------------------------------------

programs/system/docky/docky.asm

@@ -1,15 +1,19 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+
     use32
     org     0x0
 ;-------------------------------------------------------------------------------
     db        "MENUET01"
     dd        1, main, __dataend, __memend, __stackend, 0, sys_path
 ;-------------------------------------------------------------------------------
-    include "../../../macros.inc"
+    include "../../macros.inc"
-    include "../../../proc32.inc"
+    include "../../proc32.inc"
-    include "../../../dll.inc"
+    include "../../dll.inc"
-    include "../../../KOSfuncs.inc"
+    include "../../KOSfuncs.inc"
-    include "../../../load_lib.mac"
+    include "../../load_lib.mac"
-    ;include "../../../debug.inc"
+    ;include "../../debug.inc"
 
     include "DATA.INC"
     include "NAME.INC"

programs/system/docpack/Tupfile.lua

@@ -1,24 +1,24 @@
 if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("BUILD_TYPE") == "" 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())
 
 deps = tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
-DOCDIR = "../../../../data/" .. tup.getconfig("BUILD_TYPE") .. "/docs/"
+DOCDIR = "../../../data/" .. tup.getconfig("BUILD_TYPE") .. "/docs/"
 if tup.getconfig("TUP_PLATFORM") == "win32"
 then env_prefix = "set DOCDIR=$(DOCDIR)&&"; cp_cmd = "copy %f %o"
 else env_prefix = "DOCDIR=$(DOCDIR) "; cp_cmd = "cp %f %o"
 end
 if tup.getconfig("LANG") == "ru_RU"
 then tup.append_table(deps,
-  tup.rule("../../../../kernel/trunk/docs/sysfuncr.txt", "iconv -f utf-8 -t cp866 %f > %o", "SysFuncr.txt"))
+  tup.rule("../../../kernel/trunk/docs/sysfuncr.txt", "iconv -f utf-8 -t cp866 %f > %o", "SysFuncr.txt"))
 else tup.append_table(deps,
-  tup.rule("../../../../kernel/trunk/docs/sysfuncs.txt", cp_cmd, "SysFuncs.txt"))
+  tup.rule("../../../kernel/trunk/docs/sysfuncs.txt", cp_cmd, "SysFuncs.txt"))
 end
 tup.append_table(deps,
-  tup.rule("../../../develop/fasm/1.73/fasm.txt", cp_cmd, "Fasm.txt")
+  tup.rule("../../develop/fasm/1.73/fasm.txt", cp_cmd, "Fasm.txt")
 )
 tup.append_table(deps,
-  tup.rule("../../../../kernel/trunk/docs/stack.txt", cp_cmd, "Stack.txt")
+  tup.rule("../../../kernel/trunk/docs/stack.txt", cp_cmd, "Stack.txt")
 )
 tup.rule({"docpack.asm", extra_inputs = deps}, env_prefix .. FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "docpack")

programs/system/docpack/docpack.asm

@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;---------------------------------------------------------------------
 ;
 ;   DOCPAK FOR KOLIBRI v1.2
@@ -44,7 +47,7 @@ macro embed_local_file fn
    dd     I_END+0x400             ; memory for app
    dd     I_END+0x400             ; esp
    dd     my_param , 0x0          ; I_Param , I_Icon
-include '../../../macros.inc'
+include '../../macros.inc'
 include 'lang.inc'      ; Language support for locales: ru_RU, en_US.
 
 start:

programs/system/end/end.asm

@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;
 ; END
 ;
@@ -7,7 +10,7 @@
 ;
 ; 15.02.2007 merge old END with new one (fron Veliant & Leency) by Heavyiron
 
-include "..\..\..\macros.inc"
+include "..\..\macros.inc"
 
 meos_app_start
 code

programs/system/eskin/eskin.asm

@@ -0,0 +1 @@
+ use32          

programs/system/eskin/trunk/eskin.asm

@@ -1 +0,0 @@
- use32          

programs/system/hdd_info/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/system/hdd_info/hdd_info.asm

@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ; v. 0.2
 ; last update:  19/09/2010
 ; written by:   Marat Zakiyanov aka Mario79, aka Mario
@@ -38,11 +44,11 @@ SECONDARY_CHANNEL equ 0x177
 include 'lang.inc'	; language support
 
 ; <20>¥¦¨¬ë Legacy, Native ¨ ¯à. ¬¥­ïîâáï ç¥à¥§ BIOS.
-include '../../../config.inc'		;for nightbuild
+include '../../config.inc'		;for nightbuild
-include '../../../macros.inc'
+include '../../macros.inc'
-include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../develop/libraries/box_lib/trunk/box_lib.mac'
-include '../../../KOSfuncs.inc'
+include '../../KOSfuncs.inc'
-include '../../../load_lib.mac'
+include '../../load_lib.mac'
 	@use_library
 ;---------------------------------------------------------------------
 macro ab {

programs/system/icon/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/system/icon/icon.asm

@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;********************************
 ;*                              *
 ;*     DESKTOP ICON MANAGER     *
@@ -80,10 +83,10 @@ ICON_STRIP equ '/sys/iconstrp.png'
 	dd path		; path
 ;------------------------------------------------------------------------------
 include 'lang.inc'
-include '../../../macros.inc'
+include '../../macros.inc'
-include '../../../KOSfuncs.inc'
+include '../../KOSfuncs.inc'
-include '../../../load_lib.mac'
+include '../../load_lib.mac'
-;include '../../../debug.inc'
+;include '../../debug.inc'
 ;------------------------------------------------------------------------------
         @use_library    ;use load lib macros
 ;------------------------------------------------------------------------------

programs/system/kobra/Makefile

@@ -1,12 +1,12 @@
-ROOT=../../../develop/libraries/framework/trunk
+ROOT=../../develop/libraries/framework/trunk
 
-include ../../../develop/libraries/framework/trunk/config.mk
+include ../../develop/libraries/framework/trunk/config.mk
 
 # Note that kobra_st.o MUST be first and kobra.o last.
 OBJECTS=kobra_st.o $(ROOT)/stdlib/heap.o $(ROOT)/stdlib/malloc.o $(ROOT)/stdlib/stdlib.o $(ROOT)/kolibri/kolibri.o $(ROOT)/libIPC/ipc.o kobra.o
 
 # Set real path to kolibri.img if you want to use install option
-KOLIBRI_IMG=../../../../../../0.7.x-night/kolibri.img
+KOLIBRI_IMG=../../../../../0.7.x-night/kolibri.img
 
 # Path to kobra.kex on floppy (directory should be created before installing)
 DESTDIR=kobra/

programs/system/launch/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(HELPERDIR .. "/develop/libraries/libs-dev/libio")

programs/system/launcher/launcher.asm

@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;-----------------------------------------------------------------------------
 ;
 ;   LAUNCHER - startup of programs
@@ -28,11 +31,11 @@
 	dd 0x0		; I_Param
 	dd 0x0		; I_Icon
 ;-----------------------------------------------------------------------------
-include "../../../macros.inc"
+include "../../macros.inc"
 
 define __DEBUG__ 1
 define __DEBUG_LEVEL__ 1
-include "../../../debug-fdo.inc"
+include "../../debug-fdo.inc"
 ;-----------------------------------------------------------------------------
 START:                           ; start of execution
 	mcall	68,11

programs/system/menu/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())