system/docpack: Post-SVN clean up

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

data/Tupfile.lua

@@ -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"},
@@ -416,7 +416,7 @@ tup.append_table(img_files, {
  {"CROPFLAT", VAR_PROGS .. "/system/cropflat/cropflat"},
  {"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"},

programs/build_all.bat

@@ -62,7 +62,7 @@ fasm system\commouse\trunk\commouse.asm %BIN%\commouse
 fasm system\cpu\cpu.asm %BIN%\cpu
 fasm system\cpuid\trunk\cpuid.asm %BIN%\cpuid
 fasm system\skincfg\trunk\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\gmon\gmon.asm %BIN%\gmon
 fasm system\icon\trunk\icon.asm %BIN%\icon

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: