system/taskbar: Post-SVN clean up

- Move source code from `trunk` into program root directory.
- Update build files and ASM include paths.

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"},
@@ -403,7 +403,7 @@ tup.append_table(img_files, {
  {"@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"},

programs/build_all.bat

@@ -71,7 +71,7 @@ fasm system\launcher\launcher.asm %BIN%\launcher
 fasm system\menu\menu.asm %BIN%\@menu
 fasm system\mgb\trunk\mgb.asm %BIN%\mgb
 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
 fasm system\RB\trunk\@RB.ASM %BIN%\@RB
 fasm system\rdsave\rdsave.asm %BIN%\rdsave

programs/system/taskbar/TASKBAR.ASM

@@ -1,3 +1,8 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;                                                   ;
 ;   TASK PANEL for KolibriOS  - Compile with fasm   ;
@@ -74,11 +79,11 @@ format binary as ""
         dd path         ; application pach
 ;------------------------------------------------------------------------------
 include 'lang.inc'
-include '../../../macros.inc'
-include '../../../proc32.inc'
-;include '../../../debug.inc'
-include 'MOI.INC'       ;à áª« ¤ª¨ ª« ¢¨ âãàë
-include '../../../develop/libraries/box_lib/load_lib.mac'
+include '../../macros.inc'
+include '../../proc32.inc'
+;include '../../debug.inc'
+include 'MOI.INC'       ; keyboard layouts
+include '../../develop/libraries/box_lib/load_lib.mac'
         @use_library    ;use load lib macros
 ;------------------------------------------------------------------------------
 caps_lock_check fix 1
@@ -1156,7 +1161,7 @@ no_full:
 ;------------------------------------------------------------------------------
 include 'libini.inc'
 ;------------------------------------------------------------------------------
-include '../../../dll.inc'
+include '../../dll.inc'
 ;------------------------------------------------------------------------------
 include 'drawappl.inc'
 ;------------------------------------------------------------------------------

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