From a08534850727bc215ff78162d2e2ca148fccd3d4 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Wed, 30 Nov 2016 22:17:01 +0000
Subject: [PATCH] add dicty to autobuild, make C-- apps build for ISO into
 right way

git-svn-id: svn://kolibrios.org@6776 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/Tupfile.lua                  | 19 +++++++++++--------
 data/common/settings/app_plus.ini |  1 +
 data/common/settings/syspanel.ini |  4 ++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 5a19645209..da3bd4b8dd 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -206,7 +206,6 @@ extra_files = {
  {"kolibrios/grafx2/skins/", "common/media/grafx2/skins/*"},
  {"kolibrios/grafx2/", "common/media/grafx2/*"},
  {"kolibrios/drivers/drvinf.ini", "common/drivers/drvinf.ini"},
- {"kolibrios/drivers/drvinst.kex", PROGS .. "/cmm/drvinst/drvinst.com"},
  {"kolibrios/drivers/ahci/", "common/drivers/ahci/*"},
  {"kolibrios/drivers/atikms/", "common/drivers/atikms/*"},
  {"kolibrios/drivers/i915/", "common/drivers/i915/*"},
@@ -235,7 +234,6 @@ extra_files = {
  {"kolibrios/media/zsea/buttons/buttons.png", PROGS .. "/media/zsea/buttons.png"},
  {"kolibrios/res/skins/", "../skins/authors.txt"},
  {"kolibrios/settings/app_plus.ini", "common/settings/app_plus.ini"},
- {"kolibrios/utils/appearance", PROGS .. "/cmm/appearance/appearance.com"},
  {"kolibrios/utils/calcplus", PROGS .. "/other/calcplus/calcplus"},
  {"kolibrios/utils/fNav/", "common/File Managers/fNav/*"},
 }
@@ -535,23 +533,28 @@ end -- tup.getconfig('NO_NASM') ~= 'full'
 -- Programs that require C-- to compile.
 if tup.getconfig('NO_CMM') ~= 'full' then
 tup.append_table(img_files, {
+ {"APP_PLUS", PROGS .. "/cmm/app_plus/app_plus.com"},
+ {"TXTREAD", PROGS .. "/cmm/txtread/txtread.com"},
+ {"TMPDISK", PROGS .. "/cmm/tmpdisk/tmpdisk.com"},
+ {"GAME_CENTER", PROGS .. "/cmm/software_widget/software_widget.com"},
+ {"SYSPANEL", PROGS .. "/cmm/software_widget/software_widget.com"},
  {"DEVELOP/CLIPVIEW", PROGS .. "/cmm/clipview/clipview.com"},
  {"File Managers/EOLITE", PROGS .. "/cmm/eolite/Eolite.com"},
  {"FONT_VIEWER", PROGS .. "/cmm/kf_font_viewer/font_viewer.com"},
  {"GAMES/CLICKS", PROGS .. "/games/clicks/trunk/clicks.com"},
  {"DEVELOP/DIFF", PROGS .. "/cmm/diff/diff.com"},
  {"GAMES/FindNumbers", PROGS .. "/games/FindNumbers/trunk/FindNumbers"},
- {"GAMES/flood-it", PROGS .. "/games/flood-it/trunk/flood-it.com"},
+ {"GAMES/FLOOD-IT", PROGS .. "/games/flood-it/trunk/flood-it.com"},
  {"GAMES/MINE", PROGS .. "/games/mine/trunk/mine"},
  {"MEDIA/PIXIE/PIXIE", PROGS .. "/cmm/pixie/pixie.com"},
  {"MOUSECFG", PROGS .. "/cmm/mousecfg/mousecfg.com"},
  {"NETWORK/WEBVIEW", PROGS .. "/cmm/browser/WebView.com"},
  {"PANELS_CFG", PROGS .. "/cmm/panels_cfg/panels_cfg.com"},
- {"txtread", PROGS .. "/cmm/txtread/txtread.com"},
- {"TMPDISK", PROGS .. "/cmm/tmpdisk/tmpdisk.com"},
- {"GAME_CENTER", PROGS .. "/cmm/software_widget/software_widget.com"},
- {"SYSPANEL", PROGS .. "/cmm/software_widget/software_widget.com"},
- {"APP_PLUS", PROGS .. "/cmm/app_plus/app_plus.com"},
+})
+tup.append_table(extra_files, {
+ {"kolibrios/drivers/DRVINST.KEX", PROGS .. "/cmm/drvinst/drvinst.com"},
+ {"kolibrios/utils/DICTY.KEX", PROGS .. "/cmm/dicty/dicty.com"},
+ {"kolibrios/utils/appearance.kex", PROGS .. "/cmm/appearance/appearance.com"},
 })
 end -- tup.getconfig('NO_CMM') ~= 'full'
 
diff --git a/data/common/settings/app_plus.ini b/data/common/settings/app_plus.ini
index 66b8133218..1aa46e9116 100644
--- a/data/common/settings/app_plus.ini
+++ b/data/common/settings/app_plus.ini
@@ -25,3 +25,4 @@ Calc+=/kolibrios/utils/calcplus,4
 Life=/kolibrios/demos/life2,13
 fNav=/kolibrios/utils/fNav/fNav.kex,45
 DosBox=/kolibrios/emul/dosbox/dosbox,11
+Dicty=/kolibrios/utils/DICTY.KEX,79
diff --git a/data/common/settings/syspanel.ini b/data/common/settings/syspanel.ini
index a5abb7da68..213209bab1 100644
--- a/data/common/settings/syspanel.ini
+++ b/data/common/settings/syspanel.ini
@@ -10,13 +10,13 @@ VideoMode=vmode,7
 NetConfig=/sys/network/netcfg,33
 SysSetup=setup,5
 Date&Time=calendar,52
-Appearance=/kolibrios/utils/appearance,62
+Appearance=/kolibrios/utils/appearance.kex,62
 Background=/sys/media/palitra,61
 SkinConfig=skincfg,80
 Volume=@VOLUME,64
 Panels=panels_cfg,63
 Mouse=mousecfg,54
-DriverInstall=/kolibrios/drivers/drvinst.kex,71
+DriverInstall=/kolibrios/drivers/DRVINST.KEX,71
 
 [Monitoring]
 Debug Board=/sys/develop/board,19