From 57129f4171d0e39f298a0b1aa4467cf7b1c6ba45 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Sat, 2 Jun 2012 00:41:03 +0000 Subject: [PATCH] Adding T_Edit application to autobuild - final result git-svn-id: svn://kolibrios.org@2723 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Vortex86MX-eng/Makefile | 15 ++++++++++++++- data/Vortex86MX-eng/menu.dat | 1 + data/eng/Makefile | 15 ++++++++++++++- data/eng/menu.dat | 1 + data/new-stack/Makefile | 15 ++++++++++++++- data/new-stack/menu.dat | 1 + data/rus/menu.dat | 3 ++- 7 files changed, 47 insertions(+), 4 deletions(-) diff --git a/data/Vortex86MX-eng/Makefile b/data/Vortex86MX-eng/Makefile index 542065e7d1..c416dba983 100644 --- a/data/Vortex86MX-eng/Makefile +++ b/data/Vortex86MX-eng/Makefile @@ -77,6 +77,7 @@ FASM_PROGRAMS:=\ setup:SETUP:$(PROGS)/system/setup/trunk/setup.asm \ test:TEST:$(PROGS)/system/test/trunk/test.asm \ tinypad:TINYPAD:$(PROGS)/develop/tinypad/trunk/tinypad.asm \ + t_edit:T_EDIT:$(PROGS)/other/t_edit/t_edit.asm \ zkey:ZKEY:$(PROGS)/system/zkey/trunk/ZKEY.ASM \ 3d/3dcube2:3D/3DCUBE2:$(PROGS)/demos/3dcube2/trunk/3DCUBE2.ASM \ 3d/3dsheart:3D/3DSHEART:$(PROGS)/demos/3dsheart/trunk/3dsheart.asm \ @@ -146,6 +147,14 @@ FASM_PROGRAMS:=\ games/sw:GAMES/SW:$(PROGS)/games/sw/trunk/sw.asm \ games/tanks:GAMES/TANKS:$(PROGS)/games/tanks/trunk/tanks.asm \ games/tetris:GAMES/TETRIS:$(PROGS)/games/tetris/trunk/tetris.asm \ + info/asm.syn:INFO/ASM.SYN:$(PROGS)/other/t_edit/info/asm_syn.asm \ + info/cpp_kol_cla.syn:INFO/CPP_KOL_CLA.SYN:$(PROGS)/other/t_edit/info/cpp_kol_cla_syn.asm \ + info/cpp_kol_dar.syn:INFO/CPP_KOL_DAR.SYN:$(PROGS)/other/t_edit/info/cpp_kol_dar_syn.asm \ + info/cpp_kol_def.syn:INFO/CPP_KOL_DEF.SYN:$(PROGS)/other/t_edit/info/cpp_kol_def_syn.asm \ + info/default.syn:INFO/DEFAULT.SYN:$(PROGS)/other/t_edit/info/default_syn.asm \ + info/html.syn:INFO/HTML.SYN:$(PROGS)/other/t_edit/info/html_syn.asm \ + info/ini_files.syn:INFO/INI_FILES.SYN:$(PROGS)/other/t_edit/info/ini_files_syn.asm \ + info/win_const.syn:INFO/WIN_CONST.SYN:$(PROGS)/other/t_edit/info/win_const_syn.asm \ lib/archiver.obj:LIB/ARCHIVER.OBJ:$(PROGS)/fs/kfar/trunk/kfar_arc/kfar_arc.asm \ lib/box_lib.obj:LIB/BOX_LIB.OBJ:$(PROGS)/develop/libraries/box_lib/trunk/box_lib.asm \ lib/console.obj:LIB/CONSOLE.OBJ:$(PROGS)/develop/libraries/console/console.asm \ @@ -194,6 +203,9 @@ COPY_FILES:=\ macros.inc:MACROS.INC:$(PROGS)/macros.inc \ config.inc:CONFIG.INC:$(PROGS)/config.inc \ struct.inc:STRUCT.INC:$(PROGS)/struct.inc \ + te_icon.png:TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \ + tl_nod_16.png:TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \ + tl_sys_16.png:TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \ File|Managers/z_icons.png:File|Managers/Z_ICONS.PNG:$(PROGS)/fs/opendial/z_icons.png \ File|Managers/kfm_keys.txt:File|Managers/KFM_KEYS.TXT:$(PROGS)/fs/kfm/trunk/docs/english/kfm_keys.txt \ File|Managers/buttons.bmp:File|Managers/BUTTONS.BMP:$(PROGS)/fs/kfm/trunk/buttons.bmp \ @@ -332,6 +344,7 @@ $(BUILD_DIR)/kolibri.img: $(BUILD_DIR)/.dir \ mmd -i $(BUILD_DIR)/kolibri.img ::File\ Managers mmd -i $(BUILD_DIR)/kolibri.img ::FONTS mmd -i $(BUILD_DIR)/kolibri.img ::GAMES + mmd -i $(BUILD_DIR)/kolibri.img ::INFO mmd -i $(BUILD_DIR)/kolibri.img ::LIB mmd -i $(BUILD_DIR)/kolibri.img ::MEDIA mmd -i $(BUILD_DIR)/kolibri.img ::NETWORK @@ -351,7 +364,7 @@ $(BUILD_DIR)/kolibri.iso: $(BUILD_DIR)/kolibri.img $(mkisofs_extra_targets) $(BUILD_DIR)/boot_fat12.bin: $(KERNEL)/bootloader/boot_fat12.asm $(KERNEL)/bootloader/floppy1440.inc fasm $(KERNEL)/bootloader/boot_fat12.asm $(BUILD_DIR)/boot_fat12.bin -$(BUILD_DIR)/.dir 3d/.dir demos/.dir develop/.dir drivers/.dir fonts/.dir \ +$(BUILD_DIR)/.dir 3d/.dir demos/.dir develop/.dir info/.dir drivers/.dir fonts/.dir \ games/.dir lib/.dir media/.dir network/.dir .deps/.dir: mkdir -p $(dir $@) touch $@ diff --git a/data/Vortex86MX-eng/menu.dat b/data/Vortex86MX-eng/menu.dat index 3e682c05d9..f541beff21 100644 --- a/data/Vortex86MX-eng/menu.dat +++ b/data/Vortex86MX-eng/menu.dat @@ -120,6 +120,7 @@ Save RD image /rd/1/rdsave #14 **** DATA PROCESSING **** Calculator /rd/1/calc TinyPad /rd/1/tinypad +T_Edit /rd/1/t_edit Table Processor /rd/1/table Graph builder /rd/1/graph Hex-Editor /rd/1/develop/heed diff --git a/data/eng/Makefile b/data/eng/Makefile index de5452492a..da23cecd35 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -77,6 +77,7 @@ FASM_PROGRAMS:=\ setup:SETUP:$(PROGS)/system/setup/trunk/setup.asm \ test:TEST:$(PROGS)/system/test/trunk/test.asm \ tinypad:TINYPAD:$(PROGS)/develop/tinypad/trunk/tinypad.asm \ + t_edit:T_EDIT:$(PROGS)/other/t_edit/t_edit.asm \ zkey:ZKEY:$(PROGS)/system/zkey/trunk/ZKEY.ASM \ 3d/3dcube2:3D/3DCUBE2:$(PROGS)/demos/3dcube2/trunk/3DCUBE2.ASM \ 3d/3dsheart:3D/3DSHEART:$(PROGS)/demos/3dsheart/trunk/3dsheart.asm \ @@ -146,6 +147,14 @@ FASM_PROGRAMS:=\ games/sw:GAMES/SW:$(PROGS)/games/sw/trunk/sw.asm \ games/tanks:GAMES/TANKS:$(PROGS)/games/tanks/trunk/tanks.asm \ games/tetris:GAMES/TETRIS:$(PROGS)/games/tetris/trunk/tetris.asm \ + info/asm.syn:INFO/ASM.SYN:$(PROGS)/other/t_edit/info/asm_syn.asm \ + info/cpp_kol_cla.syn:INFO/CPP_KOL_CLA.SYN:$(PROGS)/other/t_edit/info/cpp_kol_cla_syn.asm \ + info/cpp_kol_dar.syn:INFO/CPP_KOL_DAR.SYN:$(PROGS)/other/t_edit/info/cpp_kol_dar_syn.asm \ + info/cpp_kol_def.syn:INFO/CPP_KOL_DEF.SYN:$(PROGS)/other/t_edit/info/cpp_kol_def_syn.asm \ + info/default.syn:INFO/DEFAULT.SYN:$(PROGS)/other/t_edit/info/default_syn.asm \ + info/html.syn:INFO/HTML.SYN:$(PROGS)/other/t_edit/info/html_syn.asm \ + info/ini_files.syn:INFO/INI_FILES.SYN:$(PROGS)/other/t_edit/info/ini_files_syn.asm \ + info/win_const.syn:INFO/WIN_CONST.SYN:$(PROGS)/other/t_edit/info/win_const_syn.asm \ lib/archiver.obj:LIB/ARCHIVER.OBJ:$(PROGS)/fs/kfar/trunk/kfar_arc/kfar_arc.asm \ lib/box_lib.obj:LIB/BOX_LIB.OBJ:$(PROGS)/develop/libraries/box_lib/trunk/box_lib.asm \ lib/console.obj:LIB/CONSOLE.OBJ:$(PROGS)/develop/libraries/console/console.asm \ @@ -199,6 +208,9 @@ COPY_FILES:=\ macros.inc:MACROS.INC:$(PROGS)/macros.inc \ config.inc:CONFIG.INC:$(PROGS)/config.inc \ struct.inc:STRUCT.INC:$(PROGS)/struct.inc \ + te_icon.png:TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \ + tl_nod_16.png:TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \ + tl_sys_16.png:TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \ File|Managers/z_icons.png:File|Managers/Z_ICONS.PNG:$(PROGS)/fs/opendial/z_icons.png \ File|Managers/kfm_keys.txt:File|Managers/KFM_KEYS.TXT:$(PROGS)/fs/kfm/trunk/docs/english/kfm_keys.txt \ File|Managers/buttons.bmp:File|Managers/BUTTONS.BMP:$(PROGS)/fs/kfm/trunk/buttons.bmp \ @@ -343,6 +355,7 @@ $(BUILD_DIR)/kolibri.img: $(BUILD_DIR)/.dir \ mmd -i $(BUILD_DIR)/kolibri.img ::File\ Managers mmd -i $(BUILD_DIR)/kolibri.img ::FONTS mmd -i $(BUILD_DIR)/kolibri.img ::GAMES + mmd -i $(BUILD_DIR)/kolibri.img ::INFO mmd -i $(BUILD_DIR)/kolibri.img ::LIB mmd -i $(BUILD_DIR)/kolibri.img ::MEDIA mmd -i $(BUILD_DIR)/kolibri.img ::NETWORK @@ -362,7 +375,7 @@ $(BUILD_DIR)/kolibri.iso: $(BUILD_DIR)/kolibri.img $(mkisofs_extra_targets) $(BUILD_DIR)/boot_fat12.bin: $(KERNEL)/bootloader/boot_fat12.asm $(KERNEL)/bootloader/floppy1440.inc fasm $(KERNEL)/bootloader/boot_fat12.asm $(BUILD_DIR)/boot_fat12.bin -$(BUILD_DIR)/.dir 3d/.dir demos/.dir develop/.dir drivers/.dir fonts/.dir \ +$(BUILD_DIR)/.dir 3d/.dir demos/.dir develop/.dir info/.dir drivers/.dir fonts/.dir \ games/.dir lib/.dir media/.dir network/.dir .deps/.dir: mkdir -p $(dir $@) touch $@ diff --git a/data/eng/menu.dat b/data/eng/menu.dat index 5b995a9c55..e6a08516b7 100644 --- a/data/eng/menu.dat +++ b/data/eng/menu.dat @@ -121,6 +121,7 @@ Save RD image /rd/1/rdsave #14 **** DATA PROCESSING **** Calculator /rd/1/calc TinyPad /rd/1/tinypad +T_Edit /rd/1/t_edit Table Processor /rd/1/table Graph builder /rd/1/graph Hex-Editor /rd/1/develop/heed diff --git a/data/new-stack/Makefile b/data/new-stack/Makefile index 33efaf60b3..e3342f89e3 100644 --- a/data/new-stack/Makefile +++ b/data/new-stack/Makefile @@ -78,6 +78,7 @@ FASM_PROGRAMS:=\ setup:SETUP:$(PROGS)/system/setup/trunk/setup.asm \ test:TEST:$(PROGS)/system/test/trunk/test.asm \ tinypad:TINYPAD:$(PROGS)/develop/tinypad/trunk/tinypad.asm \ + t_edit:T_EDIT:$(PROGS)/other/t_edit/t_edit.asm \ zkey:ZKEY:$(PROGS)/system/zkey/trunk/ZKEY.ASM \ develop/board:DEVELOP/BOARD:$(PROGS)/system/board/trunk/board.asm \ develop/cObj:DEVELOP/cObj:$(PROGS)/develop/cObj/trunk/cObj.asm \ @@ -102,6 +103,14 @@ FASM_PROGRAMS:=\ File|Managers/kfar:File|Managers/KFAR:$(PROGS)/fs/kfar/trunk/kfar.asm \ File|Managers/kfm:File|Managers/KFM:$(PROGS)/fs/kfm/trunk/kfm.asm \ File|Managers/opendial:File|Managers/OPENDIAL:$(PROGS)/fs/opendial/opendial.asm \ + info/asm.syn:INFO/ASM.SYN:$(PROGS)/other/t_edit/info/asm_syn.asm \ + info/cpp_kol_cla.syn:INFO/CPP_KOL_CLA.SYN:$(PROGS)/other/t_edit/info/cpp_kol_cla_syn.asm \ + info/cpp_kol_dar.syn:INFO/CPP_KOL_DAR.SYN:$(PROGS)/other/t_edit/info/cpp_kol_dar_syn.asm \ + info/cpp_kol_def.syn:INFO/CPP_KOL_DEF.SYN:$(PROGS)/other/t_edit/info/cpp_kol_def_syn.asm \ + info/default.syn:INFO/DEFAULT.SYN:$(PROGS)/other/t_edit/info/default_syn.asm \ + info/html.syn:INFO/HTML.SYN:$(PROGS)/other/t_edit/info/html_syn.asm \ + info/ini_files.syn:INFO/INI_FILES.SYN:$(PROGS)/other/t_edit/info/ini_files_syn.asm \ + info/win_const.syn:INFO/WIN_CONST.SYN:$(PROGS)/other/t_edit/info/win_const_syn.asm \ lib/archiver.obj:LIB/ARCHIVER.OBJ:$(PROGS)/fs/kfar/trunk/kfar_arc/kfar_arc.asm \ lib/box_lib.obj:LIB/BOX_LIB.OBJ:$(PROGS)/develop/libraries/box_lib/trunk/box_lib.asm \ lib/console.obj:LIB/CONSOLE.OBJ:$(PROGS)/develop/libraries/console/console.asm \ @@ -145,6 +154,9 @@ COPY_FILES:=\ macros.inc:MACROS.INC:$(PROGS)/macros.inc \ config.inc:CONFIG.INC:$(PROGS)/config.inc \ struct.inc:STRUCT.INC:$(PROGS)/struct.inc \ + te_icon.png:TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \ + tl_nod_16.png:TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \ + tl_sys_16.png:TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \ File|Managers/z_icons.png:File|Managers/Z_ICONS.PNG:$(PROGS)/fs/opendial/z_icons.png \ File|Managers/kfm_keys.txt:File|Managers/KFM_KEYS.TXT:$(PROGS)/fs/kfm/trunk/docs/english/kfm_keys.txt \ File|Managers/buttons.bmp:File|Managers/BUTTONS.BMP:$(PROGS)/fs/kfm/trunk/buttons.bmp \ @@ -254,6 +266,7 @@ $(BUILD_DIR)/kolibri.img: $(BUILD_DIR)/.dir \ mmd -i $(BUILD_DIR)/kolibri.img ::DRIVERS mmd -i $(BUILD_DIR)/kolibri.img ::File\ Managers mmd -i $(BUILD_DIR)/kolibri.img ::FONTS + mmd -i $(BUILD_DIR)/kolibri.img ::INFO mmd -i $(BUILD_DIR)/kolibri.img ::LIB mmd -i $(BUILD_DIR)/kolibri.img ::MEDIA mmd -i $(BUILD_DIR)/kolibri.img ::NETWORK @@ -267,7 +280,7 @@ $(BUILD_DIR)/kolibri.img: $(BUILD_DIR)/.dir \ $(BUILD_DIR)/boot_fat12.bin: $(TRUNKKERNEL)/bootloader/boot_fat12.asm $(TRUNKKERNEL)/bootloader/floppy1440.inc fasm $(TRUNKKERNEL)/bootloader/boot_fat12.asm $(BUILD_DIR)/boot_fat12.bin -$(BUILD_DIR)/.dir develop/.dir drivers/.dir fonts/.dir \ +$(BUILD_DIR)/.dir develop/.dir info/.dir drivers/.dir fonts/.dir \ lib/.dir media/.dir network/.dir .deps/.dir: mkdir -p $(dir $@) touch $@ diff --git a/data/new-stack/menu.dat b/data/new-stack/menu.dat index 5b995a9c55..e6a08516b7 100644 --- a/data/new-stack/menu.dat +++ b/data/new-stack/menu.dat @@ -121,6 +121,7 @@ Save RD image /rd/1/rdsave #14 **** DATA PROCESSING **** Calculator /rd/1/calc TinyPad /rd/1/tinypad +T_Edit /rd/1/t_edit Table Processor /rd/1/table Graph builder /rd/1/graph Hex-Editor /rd/1/develop/heed diff --git a/data/rus/menu.dat b/data/rus/menu.dat index 429c4f0674..87c2c4b72f 100644 --- a/data/rus/menu.dat +++ b/data/rus/menu.dat @@ -121,7 +121,8 @@ Eolite /rd/1/File Managers/Eolite Сохранение образа /rd/1/rdsave #14 **** ОБРАБОТКА ДАННЫХ **** Калькулятор /rd/1/calc -Текстовый редактор /rd/1/tinypad +Текст.ред. Tinypad /rd/1/tinypad +Текст.ред. T_Edit /rd/1/t_edit Табличный процессор /rd/1/table Построение графиков /rd/1/graph HEX-редактор /rd/1/develop/heed