From 436d50beb575a118ad57e356a786608367c04265 Mon Sep 17 00:00:00 2001
From: 0CodErr <0CodErr@kolibrios.org>
Date: Tue, 10 Oct 2017 18:54:46 +0000
Subject: [PATCH] edit Tupfile.lua

git-svn-id: svn://kolibrios.org@7081 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/Tupfile.lua                    | 12 +++++++-----
 programs/system/RunOD/1/Tupfile.lua |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 1f97302e9a..13895b97e5 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -83,7 +83,6 @@ if build_type == "rus" then tup.append_table(img_files, {
  {"SETTINGS/GAME_CENTER.INI", "rus/settings/game_center.ini"},
  {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"},
  {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/rus/example.asm"},
- {"RUN", "rus/RUN"},
  {"PIPETKA", build_type .. "/pipetka"},
  {"File Managers/KFAR.INI", build_type .. "/File Managers/kfar.ini"},
  {"GAMES/APPDATA.DAT", build_type .. "/games/appdata.dat"},
@@ -96,7 +95,6 @@ if build_type == "rus" then tup.append_table(img_files, {
  {"SETTINGS/GAME_CENTER.INI", "common/settings/game_center.ini"},
  {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"},
  {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"},
- {"RUN", "eng/RUN"}, 
  {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"},
  {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"}, 
 }) elseif build_type == "sp" then tup.append_table(img_files, {
@@ -104,7 +102,6 @@ if build_type == "rus" then tup.append_table(img_files, {
  {"SETTINGS/GAME_CENTER.INI", "common/settings/game_center.ini"},
  {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"},
  {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"},
- {"RUN", "sp/RUN"},
  {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"},
  {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"}, 
 }) elseif build_type == "it" then tup.append_table(img_files, {
@@ -112,7 +109,6 @@ if build_type == "rus" then tup.append_table(img_files, {
  {"SETTINGS/GAME_CENTER.INI", "common/settings/game_center.ini"},
  {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"},
  {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"},
- {"RUN", "it/RUN"},
  {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey_it.ini"},
  {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
 }) else tup.append_table(img_files, {
@@ -120,7 +116,6 @@ if build_type == "rus" then tup.append_table(img_files, {
  {"SETTINGS/GAME_CENTER.INI", "common/settings/game_center.ini"},
  {"SETTINGS/.shell", PROGS .. "/system/shell/bin/eng/.shell"},
  {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/example.asm"},
- {"RUN", "common/RUN"},
  {"SETTINGS/MYKEY.INI", PROGS .. "/system/MyKey/trunk/mykey.ini"},
  {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
 }) end
@@ -562,6 +557,13 @@ tup.append_table(img_files, {
 })
 end -- tup.getconfig('NO_NASM') ~= 'full'
 
+-- Programs that require JWASM to compile.
+if tup.getconfig('NO_JWASM') ~= 'full' then
+tup.append_table(img_files, {
+ {"RUN", PROGS .. "/system/RunOD/1/RUN"},
+})
+end -- tup.getconfig('NO_JWASM') ~= 'full'
+
 -- Programs that require C-- to compile.
 if tup.getconfig('NO_CMM') ~= 'full' then
 tup.append_table(img_files, {
diff --git a/programs/system/RunOD/1/Tupfile.lua b/programs/system/RunOD/1/Tupfile.lua
index 7ccc7c6b50..05419f8692 100644
--- a/programs/system/RunOD/1/Tupfile.lua
+++ b/programs/system/RunOD/1/Tupfile.lua
@@ -1,3 +1,5 @@
+if tup.getconfig('NO_JWASM') ~= 'full' then return end
+
 if     tup.getconfig("LANG") == "it" then
   tup.definerule{command = "echo LANG_IT = 1 > lang.inc", outputs = {"lang.inc"}}
 elseif tup.getconfig("LANG") == "sp" then