Fix language paths for git autobuild

git-svn-id: svn://kolibrios.org@10056 a494cfbc-eb01-0410-851d-a64ba20cac60
2024-05-27 18:22:11 +00:00
parent 3997519acd
commit 85276ce3ee
11 changed files with 68 additions and 60 deletions
--- 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")
--- 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

--- 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")
--- 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

--- 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")
--- 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

--- 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")
--- 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