apps/klavisha: move to iso (#635)
Build system / Build (es_ES) (push) Successful in 2m17s
Build system / Build (en_US) (push) Successful in 2m25s
Build system / Build (ru_RU) (push) Successful in 2m31s
Build system / Publish Images (push) Successful in 1m53s

Klavisha takes 11 sectors in IMG, and is included only in RU build.
I propose move it to ISO to free space on IMG and make it more consisntent.

Reviewed-on: #635
Reviewed-by: Mikhail Frolov <mixa.frolov2003@gmail.com>
Reviewed-by: Alexey <alex@b00bl1k.ru>
This commit was merged in pull request #635.
This commit is contained in:
2026-08-07 07:44:31 +00:00
parent 2515d1fa37
commit 0390ad41e4
9 changed files with 10 additions and 10 deletions
+2 -2
View File
@@ -74,7 +74,6 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
{"WELCOME.HTM", VAR_DATA .. "/" .. build_type .. "/welcome.htm.kpack"},
{"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/rus/example.asm"},
{"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy_ru"},
{"GAMES/BASEKURS.KLA", build_type .. "/games/basekurs.kla"},
{"File Managers/KFAR.INI", build_type .. "/File Managers/kfar.ini"},
{"GAMES/DESCENT", build_type .. "/games/descent"},
{"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/rus/.shell"},
@@ -649,7 +648,6 @@ tup.append_table(extra_files, {
})
-- For russian build, add russian-only programs.
if build_type == "ru_RU" then tup.append_table(img_files, {
{"GAMES/KLAVISHA", VAR_PROGS .. "/games/klavisha/klavisha"},
{"DEVELOP/EXAMPLES/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"},
}) else tup.append_table(img_files, {
{"DEVELOP/EXAMPLES/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_eng"},
@@ -658,6 +656,8 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
if build_type == "ru_RU" then tup.append_table(extra_files, {
{"kolibrios/utils/period", VAR_PROGS .. "/other/period/period"},
{"kolibrios/games/Dungeons/Dungeons", VAR_PROGS .. "/games/Dungeons/Dungeons"},
{"kolibrios/games/klavisha/klavisha", VAR_PROGS .. "/games/klavisha/klavisha"},
{"kolibrios/games/klavisha/basekurs.kla", "ru_RU/games/basekurs.kla"},
}) end
end -- tup.getconfig('NO_FASM') ~= 'full'
+1 -1
View File
@@ -48,7 +48,7 @@ mht=/sys/network/WebView
docx=/sys/network/WebView
url=/sys/network/WebView
fb2=/sys/fb2read
kla=/sys/games/klavisha
kla=/kolibrios/games/klavisha/klavisha
pdf=/kolibrios/media/updf
avi=/kolibrios/media/fplay_run
mpg=/kolibrios/media/fplay_run
+1 -1
View File
@@ -179,7 +179,7 @@ stl=/sys/3d/view3ds
skn=/sys/skincfg
dtp=/sys/skincfg
lif=/kolibrios/demos/life2
kla=/sys/games/klavisha
kla=/kolibrios/games/klavisha/klavisha
pdf=/kolibrios/media/updf
smc=/kolibrios/emul/zsnes/zsnes
+1 -1
View File
@@ -39,7 +39,7 @@ Donkey=/kg/donkey
Loderunner=/kg/LRL/LRL,41
; 21days=/kg/21days,104 ;rus only
BabyPainter=/kg/BabyPainter,87
Klavisha=games/klavisha,69
Klavisha=/kg/klavisha/klavisha,69
Millioneer=/kg/WHOWTBAM/whowtbam,114
StarTrek71=/kg/sstartrek/SStarTrek
Descent=games/descent
+1 -1
View File
@@ -39,7 +39,7 @@ docx=/sys/network/WebView
url=/sys/network/WebView
fb2=/sys/fb2read
mht=/sys/network/WebView
kla=/sys/games/klavisha
kla=/kolibrios/games/klavisha/klavisha
pdf=/kolibrios/media/updf
avi=/kolibrios/media/fplay_run
mpg=/kolibrios/media/fplay_run
+1 -1
View File
@@ -39,7 +39,7 @@ Donkey=/kg/donkey
Loderunner=/kg/LRL/LRL,41
21days=/kg/21days,104 ;rus only
BabyPainter=/kg/BabyPainter,87
Klavisha=games/klavisha,69
Klavisha=/kg/klavisha/klavisha,69
Millioneer=/kg/WHOWTBAM/whowtbam,114
StarTrek71=/kg/sstartrek/SStarTrek
Descent=games/descent
+1 -1
View File
@@ -122,7 +122,7 @@
18 FB2 Читалка |fb2read
16 Аналоговые часы |aclock
21 Таблица Менделеева |/kolibrios/utils/period
59 Тренажёр KJ|ABuIIIA |games/klavisha
59 Тренажёр KJIABuIIIA |/kolibrios/games/klavisha/klavisha
16 Бинарные часы |demos/bcdclk
53 Таймер |timer
09 Разархиватор Unz |unz
+1 -1
View File
@@ -96,7 +96,7 @@ string db 0x07,'
db 'при запуске в качестве параметра', 0x00
db 'командной строки, например:', 0x00
db ' ', 0x00
db 'klavisha /sys/lessons.kla', 0x00
db 'klavisha /kolibrios/games/klavisha/basekurs.kla', 0x00
db ' ', 0x00
db '(щелкните на кнопке СЛЕДУЮЩЕЕ УПРАЖНЕНИЕ)', 0xFE
db 0x07,' Ваша задача - набрать предложенный', 0x00
+1 -1
View File
@@ -14,7 +14,7 @@ ___________________________________________________________
При запуске программе должен быть передан параметр коман-
дной строки с указанием пути к файлу-набору упражнений в
формате KLA, например:
KLAVISHA /SYS/BASEKURS.KLA
KLAVISHA /KOLIBRIOS/GAMES/KLAVISHA/BASEKURS.KLA
Если параметр командной строки не задан, программа будет
запущена в демонстрационном режиме.
В комплект поставки входит начальный курс обучения быс-