From 27cb400814c9ca9ac81c6a56c175e213406cd30f Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 11 May 2020 07:58:18 +0000 Subject: [PATCH] cmm move small aps into cmm/misc folder git-svn-id: svn://kolibrios.org@7911 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 8 ++--- programs/cmm/Calypte/Tupfile.lua | 6 ---- programs/cmm/Calypte/compile_en.bat | 9 ----- programs/cmm/easyshot/Tupfile.lua | 6 ---- programs/cmm/easyshot/compile_en.bat | 9 ----- programs/cmm/easyshot/compile_ru.bat | 9 ----- .../python/examples/dectohex.py | 0 .../python/examples/example.py | 0 .../{ => experimental}/python/static/array.h | 0 .../python/static/function.h | 0 .../{ => experimental}/python/static/gui.h | 0 .../{ => experimental}/python/static/head.h | 0 .../{ => experimental}/python/static/init.h | 0 .../{ => experimental}/python/static/lib.h | 0 .../{ => experimental}/python/static/opcode.h | 0 programs/cmm/kolibrin/Tupfile.lua | 6 ---- programs/cmm/kolibrin/compile.bat | 5 --- programs/cmm/kolibrin/kolibrin.c | 36 ------------------- programs/cmm/mblocks/Tupfile.lua | 6 ---- programs/cmm/mblocks/compile_en.bat | 9 ----- programs/cmm/misc/Tupfile.lua | 13 +++++++ programs/cmm/misc/build.bat | 13 +++++++ .../cmm/{Calypte/Calypte.c => misc/calypte.c} | 0 programs/cmm/{easyshot => misc}/easyshot.c | 0 programs/cmm/{mblocks => misc}/mblocks.c | 0 programs/cmm/{notify => misc}/notify.c | 4 --- programs/cmm/{pipet => misc}/pipet.c | 0 .../software_widget.c | 0 programs/cmm/notify/Tupfile.lua | 6 ---- programs/cmm/notify/compile_en.bat | 9 ----- programs/cmm/notify/compile_ru.bat | 9 ----- programs/cmm/pipet/Tupfile.lua | 6 ---- programs/cmm/pipet/compile_en.bat | 5 --- programs/cmm/software_widget/Tupfile.lua | 6 ---- programs/cmm/software_widget/compile.bat | 5 --- 35 files changed, 30 insertions(+), 155 deletions(-) delete mode 100644 programs/cmm/Calypte/Tupfile.lua delete mode 100644 programs/cmm/Calypte/compile_en.bat delete mode 100644 programs/cmm/easyshot/Tupfile.lua delete mode 100644 programs/cmm/easyshot/compile_en.bat delete mode 100644 programs/cmm/easyshot/compile_ru.bat rename programs/cmm/{ => experimental}/python/examples/dectohex.py (100%) rename programs/cmm/{ => experimental}/python/examples/example.py (100%) rename programs/cmm/{ => experimental}/python/static/array.h (100%) rename programs/cmm/{ => experimental}/python/static/function.h (100%) rename programs/cmm/{ => experimental}/python/static/gui.h (100%) rename programs/cmm/{ => experimental}/python/static/head.h (100%) rename programs/cmm/{ => experimental}/python/static/init.h (100%) rename programs/cmm/{ => experimental}/python/static/lib.h (100%) rename programs/cmm/{ => experimental}/python/static/opcode.h (100%) delete mode 100644 programs/cmm/kolibrin/Tupfile.lua delete mode 100644 programs/cmm/kolibrin/compile.bat delete mode 100644 programs/cmm/kolibrin/kolibrin.c delete mode 100644 programs/cmm/mblocks/Tupfile.lua delete mode 100644 programs/cmm/mblocks/compile_en.bat create mode 100644 programs/cmm/misc/Tupfile.lua create mode 100644 programs/cmm/misc/build.bat rename programs/cmm/{Calypte/Calypte.c => misc/calypte.c} (100%) rename programs/cmm/{easyshot => misc}/easyshot.c (100%) rename programs/cmm/{mblocks => misc}/mblocks.c (100%) rename programs/cmm/{notify => misc}/notify.c (93%) rename programs/cmm/{pipet => misc}/pipet.c (100%) rename programs/cmm/{software_widget => misc}/software_widget.c (100%) delete mode 100644 programs/cmm/notify/Tupfile.lua delete mode 100644 programs/cmm/notify/compile_en.bat delete mode 100644 programs/cmm/notify/compile_ru.bat delete mode 100644 programs/cmm/pipet/Tupfile.lua delete mode 100644 programs/cmm/pipet/compile_en.bat delete mode 100644 programs/cmm/software_widget/Tupfile.lua delete mode 100644 programs/cmm/software_widget/compile.bat diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 2799790c90..a8f6a8adde 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -603,20 +603,20 @@ end -- tup.getconfig('NO_JWASM') ~= 'full' if tup.getconfig('NO_CMM') ~= 'full' then tup.append_table(img_files, { {"APP_PLUS", PROGS .. "/cmm/app_plus/app_plus.com"}, - {"EASYSHOT", PROGS .. "/cmm/easyshot/easyshot.com"}, + {"EASYSHOT", PROGS .. "/cmm/misc/easyshot.com"}, {"MOUSECFG", PROGS .. "/cmm/mousecfg/mousecfg.com"}, {"BARSCFG", PROGS .. "/cmm/barscfg/barscfg.com"}, - {"SYSPANEL", PROGS .. "/cmm/software_widget/software_widget.com"}, + {"SYSPANEL", PROGS .. "/cmm/misc/software_widget.com"}, {"SYSMON", PROGS .. "/cmm/sysmon/sysmon.com"}, {"TXTREAD", PROGS .. "/cmm/txtread/txtread.com"}, {"TMPDISK", PROGS .. "/cmm/tmpdisk/tmpdisk.com"}, {"DEVELOP/CLIPVIEW", PROGS .. "/cmm/clipview/clipview.com"}, {"DEVELOP/MENU", PROGS .. "/cmm/menu/menu.com"}, - {"DEVELOP/PIPET", PROGS .. "/cmm/pipet/pipet.com"}, + {"DEVELOP/PIPET", PROGS .. "/cmm/misc/pipet.com"}, {"File Managers/EOLITE", PROGS .. "/cmm/eolite/Eolite.com"}, {"KF_VIEW", PROGS .. "/cmm/kf_font_viewer/font_viewer.com"}, {"GAMES/CLICKS", PROGS .. "/games/clicks/trunk/clicks.com"}, - {"GAMES/MBLOCKS", PROGS .. "/cmm/mblocks/mblocks.com"}, + {"GAMES/MBLOCKS", PROGS .. "/cmm/misc/mblocks.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"}, diff --git a/programs/cmm/Calypte/Tupfile.lua b/programs/cmm/Calypte/Tupfile.lua deleted file mode 100644 index b2e33e3876..0000000000 --- a/programs/cmm/Calypte/Tupfile.lua +++ /dev/null @@ -1,6 +0,0 @@ -if tup.getconfig("NO_CMM") ~= "" then return end -if tup.getconfig("LANG") == "ru" -then C_LANG = "LANG_RUS" -else C_LANG = "LANG_ENG" -- this includes default case without config -end -tup.rule("Calypte.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "Calypte.com") diff --git a/programs/cmm/Calypte/compile_en.bat b/programs/cmm/Calypte/compile_en.bat deleted file mode 100644 index c50428d577..0000000000 --- a/programs/cmm/Calypte/compile_en.bat +++ /dev/null @@ -1,9 +0,0 @@ -@echo #define LANG_ENG 1 >lang.h-- - -@del Calypte -cls -c-- Calypte.c -@rename Calypte.com Calypte -@del warning.txt -@del lang.h-- -@pause diff --git a/programs/cmm/easyshot/Tupfile.lua b/programs/cmm/easyshot/Tupfile.lua deleted file mode 100644 index 3198450c8c..0000000000 --- a/programs/cmm/easyshot/Tupfile.lua +++ /dev/null @@ -1,6 +0,0 @@ -if tup.getconfig("NO_CMM") ~= "" then return end -if tup.getconfig("LANG") == "ru" -then C_LANG = "LANG_RUS" -else C_LANG = "LANG_ENG" -- this includes default case without config -end -tup.rule("easyshot.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "easyshot.com") diff --git a/programs/cmm/easyshot/compile_en.bat b/programs/cmm/easyshot/compile_en.bat deleted file mode 100644 index 6a312bdf08..0000000000 --- a/programs/cmm/easyshot/compile_en.bat +++ /dev/null @@ -1,9 +0,0 @@ -@del lang.h-- -@echo #define LANG_ENG 1 >lang.h-- - -C-- easyshot.c -@del easyshot -@rename easyshot.com easyshot -@del warning.txt -@del lang.h-- -@pause diff --git a/programs/cmm/easyshot/compile_ru.bat b/programs/cmm/easyshot/compile_ru.bat deleted file mode 100644 index 90e7a3d586..0000000000 --- a/programs/cmm/easyshot/compile_ru.bat +++ /dev/null @@ -1,9 +0,0 @@ -@del lang.h-- -@echo #define LANG_RUS 1 >lang.h-- - -C-- easyshot.c -@del easyshot -@rename easyshot.com easyshot -@del warning.txt -@del lang.h-- -@pause diff --git a/programs/cmm/python/examples/dectohex.py b/programs/cmm/experimental/python/examples/dectohex.py similarity index 100% rename from programs/cmm/python/examples/dectohex.py rename to programs/cmm/experimental/python/examples/dectohex.py diff --git a/programs/cmm/python/examples/example.py b/programs/cmm/experimental/python/examples/example.py similarity index 100% rename from programs/cmm/python/examples/example.py rename to programs/cmm/experimental/python/examples/example.py diff --git a/programs/cmm/python/static/array.h b/programs/cmm/experimental/python/static/array.h similarity index 100% rename from programs/cmm/python/static/array.h rename to programs/cmm/experimental/python/static/array.h diff --git a/programs/cmm/python/static/function.h b/programs/cmm/experimental/python/static/function.h similarity index 100% rename from programs/cmm/python/static/function.h rename to programs/cmm/experimental/python/static/function.h diff --git a/programs/cmm/python/static/gui.h b/programs/cmm/experimental/python/static/gui.h similarity index 100% rename from programs/cmm/python/static/gui.h rename to programs/cmm/experimental/python/static/gui.h diff --git a/programs/cmm/python/static/head.h b/programs/cmm/experimental/python/static/head.h similarity index 100% rename from programs/cmm/python/static/head.h rename to programs/cmm/experimental/python/static/head.h diff --git a/programs/cmm/python/static/init.h b/programs/cmm/experimental/python/static/init.h similarity index 100% rename from programs/cmm/python/static/init.h rename to programs/cmm/experimental/python/static/init.h diff --git a/programs/cmm/python/static/lib.h b/programs/cmm/experimental/python/static/lib.h similarity index 100% rename from programs/cmm/python/static/lib.h rename to programs/cmm/experimental/python/static/lib.h diff --git a/programs/cmm/python/static/opcode.h b/programs/cmm/experimental/python/static/opcode.h similarity index 100% rename from programs/cmm/python/static/opcode.h rename to programs/cmm/experimental/python/static/opcode.h diff --git a/programs/cmm/kolibrin/Tupfile.lua b/programs/cmm/kolibrin/Tupfile.lua deleted file mode 100644 index 181ce9be76..0000000000 --- a/programs/cmm/kolibrin/Tupfile.lua +++ /dev/null @@ -1,6 +0,0 @@ -if tup.getconfig("NO_CMM") ~= "" then return end -if tup.getconfig("LANG") == "ru" -then C_LANG = "LANG_RUS" -else C_LANG = "LANG_ENG" -- this includes default case without config -end -tup.rule("kolibrin.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "kolibrin.com") diff --git a/programs/cmm/kolibrin/compile.bat b/programs/cmm/kolibrin/compile.bat deleted file mode 100644 index 81b1133fba..0000000000 --- a/programs/cmm/kolibrin/compile.bat +++ /dev/null @@ -1,5 +0,0 @@ -C-- kolibrin.c -@del kolibrin -@rename kolibrin.com kolibrin -@pause -@del warning.txt diff --git a/programs/cmm/kolibrin/kolibrin.c b/programs/cmm/kolibrin/kolibrin.c deleted file mode 100644 index 6de7ad174f..0000000000 --- a/programs/cmm/kolibrin/kolibrin.c +++ /dev/null @@ -1,36 +0,0 @@ -#define MEMSIZE 0x9000 -#include "..\lib\strings.h" -#include "..\lib\mem.h" -#include "..\lib\fs.h" - - -void main() -{ - dword dirbuf, fcount, filename, i; - dword dirbuf2, fcount2, filename2, j; - char drive_name[4096]; - char install_path[4096]; - - pause(200); - GetDir(#dirbuf, #fcount, "/", DIRS_ONLYREAL); - - for (i=0; i 0) ExitProcess(); - } - } - notify("'KolibriN\nНе могу найти installer.kex ни в одном корне диска!\nПопробуйте найти и запустить его вручную.' -dtE"); - ExitProcess(); -} - - -stop: diff --git a/programs/cmm/mblocks/Tupfile.lua b/programs/cmm/mblocks/Tupfile.lua deleted file mode 100644 index e761ff7c46..0000000000 --- a/programs/cmm/mblocks/Tupfile.lua +++ /dev/null @@ -1,6 +0,0 @@ -if tup.getconfig("NO_CMM") ~= "" then return end -if tup.getconfig("LANG") == "ru" -then C_LANG = "LANG_RUS" -else C_LANG = "LANG_ENG" -- this includes default case without config -end -tup.rule("mblocks.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "mblocks.com") diff --git a/programs/cmm/mblocks/compile_en.bat b/programs/cmm/mblocks/compile_en.bat deleted file mode 100644 index ea4b03bfea..0000000000 --- a/programs/cmm/mblocks/compile_en.bat +++ /dev/null @@ -1,9 +0,0 @@ -@del lang.h-- -@echo #define LANG_ENG 1 >lang.h-- - -@c-- mblocks.c -@del mblocks -@rename mblocks.com mblocks -@del warning.txt -@del lang.h-- -pause \ No newline at end of file diff --git a/programs/cmm/misc/Tupfile.lua b/programs/cmm/misc/Tupfile.lua new file mode 100644 index 0000000000..0ead715ef0 --- /dev/null +++ b/programs/cmm/misc/Tupfile.lua @@ -0,0 +1,13 @@ +if tup.getconfig("NO_CMM") ~= "" then return end +if tup.getconfig("LANG") == "ru" +then C_LANG = "LANG_RUS" +else C_LANG = "LANG_ENG" -- this includes default case without config +end +tup.rule("easyshot.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "easyshot.com") +tup.rule("calypte.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "calypte.com") +tup.rule("kolibrin.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "kolibrin.com") +tup.rule("mblocks.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "mblocks.com") +tup.rule("notify.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "notify.com") +tup.rule("pipet.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pipet.com") +tup.rule("software_widget.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "software_widget.com") + diff --git a/programs/cmm/misc/build.bat b/programs/cmm/misc/build.bat new file mode 100644 index 0000000000..b752f4e93a --- /dev/null +++ b/programs/cmm/misc/build.bat @@ -0,0 +1,13 @@ +@echo off + +del *.kex + +For /R %%i In (*.c) Do c-- "%%i" + +rename *.com *.kex +mkdir bin +move *.kex bin\ + +del warning.txt + +pause \ No newline at end of file diff --git a/programs/cmm/Calypte/Calypte.c b/programs/cmm/misc/calypte.c similarity index 100% rename from programs/cmm/Calypte/Calypte.c rename to programs/cmm/misc/calypte.c diff --git a/programs/cmm/easyshot/easyshot.c b/programs/cmm/misc/easyshot.c similarity index 100% rename from programs/cmm/easyshot/easyshot.c rename to programs/cmm/misc/easyshot.c diff --git a/programs/cmm/mblocks/mblocks.c b/programs/cmm/misc/mblocks.c similarity index 100% rename from programs/cmm/mblocks/mblocks.c rename to programs/cmm/misc/mblocks.c diff --git a/programs/cmm/notify/notify.c b/programs/cmm/misc/notify.c similarity index 93% rename from programs/cmm/notify/notify.c rename to programs/cmm/misc/notify.c index 30f4c72c01..6b383d7317 100644 --- a/programs/cmm/notify/notify.c +++ b/programs/cmm/misc/notify.c @@ -24,10 +24,6 @@ int TEXT_X=PADDING, int delay = 400; -#ifndef AUTOBUILD - #include "lang.h--" -#endif - #ifdef LANG_RUS ?define DEFAULT_TEXT "Эта программа показывает уведомления."; #else diff --git a/programs/cmm/pipet/pipet.c b/programs/cmm/misc/pipet.c similarity index 100% rename from programs/cmm/pipet/pipet.c rename to programs/cmm/misc/pipet.c diff --git a/programs/cmm/software_widget/software_widget.c b/programs/cmm/misc/software_widget.c similarity index 100% rename from programs/cmm/software_widget/software_widget.c rename to programs/cmm/misc/software_widget.c diff --git a/programs/cmm/notify/Tupfile.lua b/programs/cmm/notify/Tupfile.lua deleted file mode 100644 index a270be479f..0000000000 --- a/programs/cmm/notify/Tupfile.lua +++ /dev/null @@ -1,6 +0,0 @@ -if tup.getconfig("NO_CMM") ~= "" then return end -if tup.getconfig("LANG") == "ru" -then C_LANG = "LANG_RUS" -else C_LANG = "LANG_ENG" -- this includes default case without config -end -tup.rule("notify.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "notify.com") diff --git a/programs/cmm/notify/compile_en.bat b/programs/cmm/notify/compile_en.bat deleted file mode 100644 index c968dcb8e5..0000000000 --- a/programs/cmm/notify/compile_en.bat +++ /dev/null @@ -1,9 +0,0 @@ -@del lang.h-- -@echo #define LANG_ENG 1 >lang.h-- - -C-- notify.c -@del @notify -@rename notify.com @notify -@del warning.txt -@del lang.h-- -@pause diff --git a/programs/cmm/notify/compile_ru.bat b/programs/cmm/notify/compile_ru.bat deleted file mode 100644 index f068ecb54b..0000000000 --- a/programs/cmm/notify/compile_ru.bat +++ /dev/null @@ -1,9 +0,0 @@ -@del lang.h-- -@echo #define LANG_RUS 1 >lang.h-- - -C-- notify.c -@del @notify -@rename notify.com @notify -@del warning.txt -@del lang.h-- -@pause diff --git a/programs/cmm/pipet/Tupfile.lua b/programs/cmm/pipet/Tupfile.lua deleted file mode 100644 index 055592ddb1..0000000000 --- a/programs/cmm/pipet/Tupfile.lua +++ /dev/null @@ -1,6 +0,0 @@ -if tup.getconfig("NO_CMM") ~= "" then return end -if tup.getconfig("LANG") == "ru" -then C_LANG = "LANG_RUS" -else C_LANG = "LANG_ENG" -- this includes default case without config -end -tup.rule("pipet.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pipet.com") diff --git a/programs/cmm/pipet/compile_en.bat b/programs/cmm/pipet/compile_en.bat deleted file mode 100644 index 33a4c352aa..0000000000 --- a/programs/cmm/pipet/compile_en.bat +++ /dev/null @@ -1,5 +0,0 @@ -@del pipet -@c-- pipet.c -@rename *.com *. -@del warning.txt -@pause \ No newline at end of file diff --git a/programs/cmm/software_widget/Tupfile.lua b/programs/cmm/software_widget/Tupfile.lua deleted file mode 100644 index 3d13f29c79..0000000000 --- a/programs/cmm/software_widget/Tupfile.lua +++ /dev/null @@ -1,6 +0,0 @@ -if tup.getconfig("NO_CMM") ~= "" then return end -if tup.getconfig("LANG") == "ru" -then C_LANG = "LANG_RUS" -else C_LANG = "LANG_ENG" -- this includes default case without config -end -tup.rule("software_widget.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "software_widget.com") diff --git a/programs/cmm/software_widget/compile.bat b/programs/cmm/software_widget/compile.bat deleted file mode 100644 index d567597217..0000000000 --- a/programs/cmm/software_widget/compile.bat +++ /dev/null @@ -1,5 +0,0 @@ -@C-- software_widget.c -@del syspanel -@ren software_widget.com syspanel -@pause -@del warning.txt