From 85276ce3ee33e80bece4db0d76cd854b0b6fd75e Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Mon, 27 May 2024 18:22:11 +0000 Subject: [PATCH] Fix language paths for git autobuild git-svn-id: svn://kolibrios.org@10056 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 4 +-- kernel/branches/kolibri-ahci/Tupfile.lua | 2 +- kernel/branches/kolibri-ahci/data32.inc | 27 ++++++++++--------- kernel/branches/kolibri-lldw/Tupfile.lua | 2 +- kernel/branches/kolibri-lldw/data32.inc | 27 ++++++++++--------- .../kolibrios-pe-clevermouse/Tupfile.lua | 2 +- .../kolibrios-pe-clevermouse/data32.inc | 27 ++++++++++--------- kernel/trunk/Tupfile.lua | 2 +- kernel/trunk/data32.inc | 27 +++++++++---------- programs/system/docpack/trunk/Tupfile.lua | 4 +-- programs/system/docpack/trunk/docpack.asm | 4 +-- 11 files changed, 68 insertions(+), 60 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 0f98e776dd..230a1a6ca9 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -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"}, {"GAMES/DESCENT", build_type .. "/games/descent"}, {"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/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, { {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"}, {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy"}, diff --git a/kernel/branches/kolibri-ahci/Tupfile.lua b/kernel/branches/kolibri-ahci/Tupfile.lua index 0b3331b11e..88e4b3f3f6 100644 --- a/kernel/branches/kolibri-ahci/Tupfile.lua +++ b/kernel/branches/kolibri-ahci/Tupfile.lua @@ -3,7 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.ge tup.include(HELPERDIR .. "/use_fasm.lua") 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 -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") diff --git a/kernel/branches/kolibri-ahci/data32.inc b/kernel/branches/kolibri-ahci/data32.inc index fa3c514e1e..abcefa453c 100644 --- a/kernel/branches/kolibri-ahci/data32.inc +++ b/kernel/branches/kolibri-ahci/data32.inc @@ -217,31 +217,34 @@ dll_cur_addr dd MIN_DEFAULT_DLL_ADDR ; } mike.dld -align 4 -keyboard dd 1 - -if lang eq en +if lang eq en_US SYSLANG = 1 -else if lang eq fi +else if lang eq fi_FI SYSLANG = 2 -else if lang eq de +else if lang eq de_DE SYSLANG = 3 -else if lang eq ru +else if lang eq ru_RU SYSLANG = 4 -else if lang eq fr +else if lang eq fr_FR SYSLANG = 5 -else if lang eq et +else if lang eq et_EE SYSLANG = 6 -else if lang eq sp +else if lang eq uk_UA SYSLANG = 7 -else if lang eq it +else if lang eq it_IT SYSLANG = 8 -else if lang eq ca +else if lang eq nl_BE SYSLANG = 9 +else if lang eq es_ES + SYSLANG = 10 +else if lang eq ca_ES + SYSLANG = 11 else display 'unsupported language specified',13,10 end if +align 4 syslang dd SYSLANG +keyboard dd SYSLANG boot_y dd 10 diff --git a/kernel/branches/kolibri-lldw/Tupfile.lua b/kernel/branches/kolibri-lldw/Tupfile.lua index 0b3331b11e..88e4b3f3f6 100644 --- a/kernel/branches/kolibri-lldw/Tupfile.lua +++ b/kernel/branches/kolibri-lldw/Tupfile.lua @@ -3,7 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.ge tup.include(HELPERDIR .. "/use_fasm.lua") 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 -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") diff --git a/kernel/branches/kolibri-lldw/data32.inc b/kernel/branches/kolibri-lldw/data32.inc index fa3c514e1e..abcefa453c 100644 --- a/kernel/branches/kolibri-lldw/data32.inc +++ b/kernel/branches/kolibri-lldw/data32.inc @@ -217,31 +217,34 @@ dll_cur_addr dd MIN_DEFAULT_DLL_ADDR ; } mike.dld -align 4 -keyboard dd 1 - -if lang eq en +if lang eq en_US SYSLANG = 1 -else if lang eq fi +else if lang eq fi_FI SYSLANG = 2 -else if lang eq de +else if lang eq de_DE SYSLANG = 3 -else if lang eq ru +else if lang eq ru_RU SYSLANG = 4 -else if lang eq fr +else if lang eq fr_FR SYSLANG = 5 -else if lang eq et +else if lang eq et_EE SYSLANG = 6 -else if lang eq sp +else if lang eq uk_UA SYSLANG = 7 -else if lang eq it +else if lang eq it_IT SYSLANG = 8 -else if lang eq ca +else if lang eq nl_BE SYSLANG = 9 +else if lang eq es_ES + SYSLANG = 10 +else if lang eq ca_ES + SYSLANG = 11 else display 'unsupported language specified',13,10 end if +align 4 syslang dd SYSLANG +keyboard dd SYSLANG boot_y dd 10 diff --git a/kernel/branches/kolibrios-pe-clevermouse/Tupfile.lua b/kernel/branches/kolibrios-pe-clevermouse/Tupfile.lua index 0b3331b11e..88e4b3f3f6 100644 --- a/kernel/branches/kolibrios-pe-clevermouse/Tupfile.lua +++ b/kernel/branches/kolibrios-pe-clevermouse/Tupfile.lua @@ -3,7 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.ge tup.include(HELPERDIR .. "/use_fasm.lua") 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 -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") diff --git a/kernel/branches/kolibrios-pe-clevermouse/data32.inc b/kernel/branches/kolibrios-pe-clevermouse/data32.inc index 84605f5cdb..5b9234ecc6 100644 --- a/kernel/branches/kolibrios-pe-clevermouse/data32.inc +++ b/kernel/branches/kolibrios-pe-clevermouse/data32.inc @@ -219,31 +219,34 @@ shared_locked_list: ; } mike.dld -align 4 -keyboard dd 1 - -if lang eq en +if lang eq en_US SYSLANG = 1 -else if lang eq fi +else if lang eq fi_FI SYSLANG = 2 -else if lang eq de +else if lang eq de_DE SYSLANG = 3 -else if lang eq ru +else if lang eq ru_RU SYSLANG = 4 -else if lang eq fr +else if lang eq fr_FR SYSLANG = 5 -else if lang eq et +else if lang eq et_EE SYSLANG = 6 -else if lang eq sp +else if lang eq uk_UA SYSLANG = 7 -else if lang eq it +else if lang eq it_IT SYSLANG = 8 -else if lang eq ca +else if lang eq nl_BE SYSLANG = 9 +else if lang eq es_ES + SYSLANG = 10 +else if lang eq ca_ES + SYSLANG = 11 else display 'unsupported language specified',13,10 end if +align 4 syslang dd SYSLANG +keyboard dd SYSLANG boot_y dd 10 diff --git a/kernel/trunk/Tupfile.lua b/kernel/trunk/Tupfile.lua index 52dfdec03f..582a394b30 100644 --- a/kernel/trunk/Tupfile.lua +++ b/kernel/trunk/Tupfile.lua @@ -3,7 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../programs" or tup.getco tup.include(HELPERDIR .. "/use_fasm.lua") 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 -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") diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc index b044db73c6..f4c7c2e2f4 100644 --- a/kernel/trunk/data32.inc +++ b/kernel/trunk/data32.inc @@ -198,35 +198,34 @@ MIN_DEFAULT_DLL_ADDR = 0x70000000 dll_cur_addr dd MIN_DEFAULT_DLL_ADDR -align 4 -keyboard dd SYSLANG - -if lang eq en +if lang eq en_US SYSLANG = 1 -else if lang eq fi +else if lang eq fi_FI SYSLANG = 2 -else if lang eq ge +else if lang eq de_DE SYSLANG = 3 -else if lang eq ru +else if lang eq ru_RU SYSLANG = 4 -else if lang eq fr +else if lang eq fr_FR SYSLANG = 5 -else if lang eq et +else if lang eq et_EE SYSLANG = 6 -else if lang eq ua +else if lang eq uk_UA SYSLANG = 7 -else if lang eq it +else if lang eq it_IT SYSLANG = 8 -else if lang eq be +else if lang eq nl_BE SYSLANG = 9 -else if lang eq sp +else if lang eq es_ES SYSLANG = 10 -else if lang eq ca +else if lang eq ca_ES SYSLANG = 11 else display 'unsupported language specified',13,10 end if +align 4 syslang dd SYSLANG +keyboard dd SYSLANG boot_y dd 10 diff --git a/programs/system/docpack/trunk/Tupfile.lua b/programs/system/docpack/trunk/Tupfile.lua index 39c83dad33..5e52583a9a 100644 --- a/programs/system/docpack/trunk/Tupfile.lua +++ b/programs/system/docpack/trunk/Tupfile.lua @@ -3,13 +3,13 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig(" tup.include(HELPERDIR .. "/use_fasm.lua") 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/" 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" +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")) else tup.append_table(deps, diff --git a/programs/system/docpack/trunk/docpack.asm b/programs/system/docpack/trunk/docpack.asm index 5a9ecd3a89..ae1d91377c 100755 --- a/programs/system/docpack/trunk/docpack.asm +++ b/programs/system/docpack/trunk/docpack.asm @@ -192,7 +192,7 @@ embedded: ; -- Start of embedding area ------ embed_docdir_file 'CREDITS.TXT' ;a -if lang eq ru +if lang eq ru_RU embed_docdir_file 'GNU.TXT' ;b else embed_docdir_file 'COPYING.TXT' ;b @@ -200,7 +200,7 @@ end if embed_docdir_file 'HOT_KEYS.TXT' ;c embed_local_file 'FASM.TXT' ;d embed_docdir_file 'MTDBG.TXT' ;e -if lang eq ru +if lang eq ru_RU embed_local_file 'SYSFUNCR.TXT' ;f else embed_local_file 'SYSFUNCS.TXT' ;f