KolibriOS/kolibrios
13
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

Fix language paths for git autobuild

Browse Source 
git-svn-id: svn://kolibrios.org@10056 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Ivan Baravy 2024-05-27 18:22:11 +00:00
parent 3997519acd
commit 85276ce3ee
11 changed files with 68 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/Tupfile.lua
View File

@ -81,9 +81,9 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
{"File Managers/KFAR.INI", build_type .. "/File Managers/kfar.ini"}, {"File Managers/KFAR.INI", build_type .. "/File Managers/kfar.ini"},
{"GAMES/DESCENT", build_type .. "/games/descent"}, {"GAMES/DESCENT", build_type .. "/games/descent"},
{"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/rus/.shell"}, {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/rus/.shell"},
{"SETTINGS/GAMES.INI", "rus/settings/games.ini"}, {"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/trunk/mykey.ini"},
{"SETTINGS/SYSPANEL.INI", "rus/settings/syspanel.ini"}, {"SETTINGS/SYSPANEL.INI", "ru_RU/settings/syspanel.ini"},
}) elseif build_type == "en_US" then tup.append_table(img_files, { }) elseif build_type == "en_US" then tup.append_table(img_files, {
{"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"}, {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"},
{"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy"}, {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy"},

2
kernel/branches/kolibri-ahci/Tupfile.lua
View File

@ -3,7 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.ge
tup.include(HELPERDIR .. "/use_fasm.lua") tup.include(HELPERDIR .. "/use_fasm.lua")
add_include(tup.getvariantdir()) add_include(tup.getvariantdir())
tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o ", "bootbios.bin") tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o ", "bootbios.bin")
tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o -dextended_primary_loader=1", "bootbios.bin.ext_loader") tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o -dextended_primary_loader=1", "bootbios.bin.ext_loader")
tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin", "lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt") tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin", "lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt")

27
kernel/branches/kolibri-ahci/data32.inc
View File

@ -217,31 +217,34 @@ dll_cur_addr dd MIN_DEFAULT_DLL_ADDR
; } mike.dld ; } mike.dld
align 4 if lang eq en_US
keyboard dd 1
if lang eq en
SYSLANG = 1 SYSLANG = 1
else if lang eq fi else if lang eq fi_FI
SYSLANG = 2 SYSLANG = 2
else if lang eq de else if lang eq de_DE
SYSLANG = 3 SYSLANG = 3
else if lang eq ru else if lang eq ru_RU
SYSLANG = 4 SYSLANG = 4
else if lang eq fr else if lang eq fr_FR
SYSLANG = 5 SYSLANG = 5
else if lang eq et else if lang eq et_EE
SYSLANG = 6 SYSLANG = 6
else if lang eq sp else if lang eq uk_UA
SYSLANG = 7 SYSLANG = 7
else if lang eq it else if lang eq it_IT
SYSLANG = 8 SYSLANG = 8
else if lang eq ca else if lang eq nl_BE
SYSLANG = 9 SYSLANG = 9
else if lang eq es_ES
SYSLANG = 10
else if lang eq ca_ES
SYSLANG = 11
else else
display 'unsupported language specified',13,10 display 'unsupported language specified',13,10
end if end if
align 4
syslang dd SYSLANG syslang dd SYSLANG
keyboard dd SYSLANG
boot_y dd 10 boot_y dd 10

2
kernel/branches/kolibri-lldw/Tupfile.lua
View File

@ -3,7 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.ge
tup.include(HELPERDIR .. "/use_fasm.lua") tup.include(HELPERDIR .. "/use_fasm.lua")
add_include(tup.getvariantdir()) add_include(tup.getvariantdir())
tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o ", "bootbios.bin") tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o ", "bootbios.bin")
tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o -dextended_primary_loader=1", "bootbios.bin.ext_loader") tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o -dextended_primary_loader=1", "bootbios.bin.ext_loader")
tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin", "lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt") tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin", "lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt")

27
kernel/branches/kolibri-lldw/data32.inc
View File

@ -217,31 +217,34 @@ dll_cur_addr dd MIN_DEFAULT_DLL_ADDR
; } mike.dld ; } mike.dld
align 4 if lang eq en_US
keyboard dd 1
if lang eq en
SYSLANG = 1 SYSLANG = 1
else if lang eq fi else if lang eq fi_FI
SYSLANG = 2 SYSLANG = 2
else if lang eq de else if lang eq de_DE
SYSLANG = 3 SYSLANG = 3
else if lang eq ru else if lang eq ru_RU
SYSLANG = 4 SYSLANG = 4
else if lang eq fr else if lang eq fr_FR
SYSLANG = 5 SYSLANG = 5
else if lang eq et else if lang eq et_EE
SYSLANG = 6 SYSLANG = 6
else if lang eq sp else if lang eq uk_UA
SYSLANG = 7 SYSLANG = 7
else if lang eq it else if lang eq it_IT
SYSLANG = 8 SYSLANG = 8
else if lang eq ca else if lang eq nl_BE
SYSLANG = 9 SYSLANG = 9
else if lang eq es_ES
SYSLANG = 10
else if lang eq ca_ES
SYSLANG = 11
else else
display 'unsupported language specified',13,10 display 'unsupported language specified',13,10
end if end if
align 4
syslang dd SYSLANG syslang dd SYSLANG
keyboard dd SYSLANG
boot_y dd 10 boot_y dd 10

2
kernel/branches/kolibrios-pe-clevermouse/Tupfile.lua
View File

@ -3,7 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.ge
tup.include(HELPERDIR .. "/use_fasm.lua") tup.include(HELPERDIR .. "/use_fasm.lua")
add_include(tup.getvariantdir()) add_include(tup.getvariantdir())
tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o ", "bootbios.bin") tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o ", "bootbios.bin")
tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o -dextended_primary_loader=1", "bootbios.bin.ext_loader") tup.rule({"bootbios.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o -dextended_primary_loader=1", "bootbios.bin.ext_loader")
tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin", "lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt") tup.rule({"kernel.asm", extra_inputs = {"bootbios.bin", "lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt")

27
kernel/branches/kolibrios-pe-clevermouse/data32.inc
View File

@ -219,31 +219,34 @@ shared_locked_list:
; } mike.dld ; } mike.dld
align 4 if lang eq en_US
keyboard dd 1
if lang eq en
SYSLANG = 1 SYSLANG = 1
else if lang eq fi else if lang eq fi_FI
SYSLANG = 2 SYSLANG = 2
else if lang eq de else if lang eq de_DE
SYSLANG = 3 SYSLANG = 3
else if lang eq ru else if lang eq ru_RU
SYSLANG = 4 SYSLANG = 4
else if lang eq fr else if lang eq fr_FR
SYSLANG = 5 SYSLANG = 5
else if lang eq et else if lang eq et_EE
SYSLANG = 6 SYSLANG = 6
else if lang eq sp else if lang eq uk_UA
SYSLANG = 7 SYSLANG = 7
else if lang eq it else if lang eq it_IT
SYSLANG = 8 SYSLANG = 8
else if lang eq ca else if lang eq nl_BE
SYSLANG = 9 SYSLANG = 9
else if lang eq es_ES
SYSLANG = 10
else if lang eq ca_ES
SYSLANG = 11
else else
display 'unsupported language specified',13,10 display 'unsupported language specified',13,10
end if end if
align 4
syslang dd SYSLANG syslang dd SYSLANG
keyboard dd SYSLANG
boot_y dd 10 boot_y dd 10

2
kernel/trunk/Tupfile.lua
View File

@ -3,7 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../programs" or tup.getco
tup.include(HELPERDIR .. "/use_fasm.lua") tup.include(HELPERDIR .. "/use_fasm.lua")
add_include(tup.getvariantdir()) add_include(tup.getvariantdir())
tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 262144 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt") tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 262144 %f %o " .. tup.getconfig("KERPACK_CMD"), "kernel.mnt")
--tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 262144 %f %o -s %o.fas" .. tup.getconfig("KERPACK_CMD"), {"kernel.mnt", extra_outputs = {"kernel.mnt.fas"}}) --tup.rule({"kernel.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 262144 %f %o -s %o.fas" .. tup.getconfig("KERPACK_CMD"), {"kernel.mnt", extra_outputs = {"kernel.mnt.fas"}})
--tup.rule({"kernel.mnt.fas", extra_inputs = {"kernel.mnt"}}, "symbols %f %o", "kernel.mnt.sym") --tup.rule({"kernel.mnt.fas", extra_inputs = {"kernel.mnt"}}, "symbols %f %o", "kernel.mnt.sym")

27
kernel/trunk/data32.inc
View File

@ -198,35 +198,34 @@ MIN_DEFAULT_DLL_ADDR = 0x70000000
dll_cur_addr dd MIN_DEFAULT_DLL_ADDR dll_cur_addr dd MIN_DEFAULT_DLL_ADDR
align 4 if lang eq en_US
keyboard dd SYSLANG
if lang eq en
SYSLANG = 1 SYSLANG = 1
else if lang eq fi else if lang eq fi_FI
SYSLANG = 2 SYSLANG = 2
else if lang eq ge else if lang eq de_DE
SYSLANG = 3 SYSLANG = 3
else if lang eq ru else if lang eq ru_RU
SYSLANG = 4 SYSLANG = 4
else if lang eq fr else if lang eq fr_FR
SYSLANG = 5 SYSLANG = 5
else if lang eq et else if lang eq et_EE
SYSLANG = 6 SYSLANG = 6
else if lang eq ua else if lang eq uk_UA
SYSLANG = 7 SYSLANG = 7
else if lang eq it else if lang eq it_IT
SYSLANG = 8 SYSLANG = 8
else if lang eq be else if lang eq nl_BE
SYSLANG = 9 SYSLANG = 9
else if lang eq sp else if lang eq es_ES
SYSLANG = 10 SYSLANG = 10
else if lang eq ca else if lang eq ca_ES
SYSLANG = 11 SYSLANG = 11
else else
display 'unsupported language specified',13,10 display 'unsupported language specified',13,10
end if end if
align 4
syslang dd SYSLANG syslang dd SYSLANG
keyboard dd SYSLANG
boot_y dd 10 boot_y dd 10

4
programs/system/docpack/trunk/Tupfile.lua
View File

@ -3,13 +3,13 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
tup.include(HELPERDIR .. "/use_fasm.lua") tup.include(HELPERDIR .. "/use_fasm.lua")
add_include(tup.getvariantdir()) add_include(tup.getvariantdir())
deps = tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) 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" if tup.getconfig("TUP_PLATFORM") == "win32"
then env_prefix = "set DOCDIR=$(DOCDIR)&&"; cp_cmd = "copy %f %o" then env_prefix = "set DOCDIR=$(DOCDIR)&&"; cp_cmd = "copy %f %o"
else env_prefix = "DOCDIR=$(DOCDIR) "; cp_cmd = "cp %f %o" else env_prefix = "DOCDIR=$(DOCDIR) "; cp_cmd = "cp %f %o"
end end
if tup.getconfig("LANG") == "ru" if tup.getconfig("LANG") == "ru_RU"
then tup.append_table(deps, 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, else tup.append_table(deps,

4
programs/system/docpack/trunk/docpack.asm
View File

@ -192,7 +192,7 @@ embedded:
; -- Start of embedding area ------ ; -- Start of embedding area ------
embed_docdir_file 'CREDITS.TXT' ;a embed_docdir_file 'CREDITS.TXT' ;a
if lang eq ru if lang eq ru_RU
embed_docdir_file 'GNU.TXT' ;b embed_docdir_file 'GNU.TXT' ;b
else else
embed_docdir_file 'COPYING.TXT' ;b embed_docdir_file 'COPYING.TXT' ;b
@ -200,7 +200,7 @@ end if
embed_docdir_file 'HOT_KEYS.TXT' ;c embed_docdir_file 'HOT_KEYS.TXT' ;c
embed_local_file 'FASM.TXT' ;d embed_local_file 'FASM.TXT' ;d
embed_docdir_file 'MTDBG.TXT' ;e embed_docdir_file 'MTDBG.TXT' ;e
if lang eq ru if lang eq ru_RU
embed_local_file 'SYSFUNCR.TXT' ;f embed_local_file 'SYSFUNCR.TXT' ;f
else else
embed_local_file 'SYSFUNCS.TXT' ;f embed_local_file 'SYSFUNCS.TXT' ;f