From fb5ae0417f9099c768d05c0c7a739e44f7112a3b Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Fri, 28 Jun 2013 03:17:39 +0000 Subject: [PATCH] Adding a picture viewer zSea to the nightly builds ISO (for all language nightly builds, the final!) git-svn-id: svn://kolibrios.org@3723 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/Makefile | 17 +++++++++++++++++ data/eng/menu.dat | 3 ++- data/it/Makefile | 17 +++++++++++++++++ data/it/menu.dat | 3 ++- data/rus/Makefile | 2 +- data/sp/Makefile | 17 +++++++++++++++++ data/sp/menu.dat | 3 ++- 7 files changed, 58 insertions(+), 4 deletions(-) diff --git a/data/eng/Makefile b/data/eng/Makefile index 5c146cb126..25ae237a9c 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -205,6 +205,13 @@ FASM_PROGRAMS:=\ # Format of an item is exactly the same as in the previous list. FASM_PROGRAMS_CD:=\ drivers/atikms:DRIVERS/ATIKMS:$(REPOSITORY)/drivers/video/drm/radeon/atikms.asm \ + distr_data/zsea:DISTR_DATA/ZSEA:$(PROGS)/media/zsea/zSea.asm \ + distr_data/cnv_bmp.obj:DISTR_DATA/CNV_BMP.OBJ:$(PROGS)/media/zsea/plugins/bmp/cnv_bmp.asm \ + distr_data/cnv_gif.obj:DISTR_DATA/CNV_GIF.OBJ:$(PROGS)/media/zsea/plugins/gif/cnv_gif.asm \ + distr_data/cnv_jpeg.obj:DISTR_DATA/CNV_JPEG.OBJ:$(PROGS)/media/zsea/plugins/jpeg/cnv_jpeg.asm \ + distr_data/convert.obj:DISTR_DATA/CONVERT.OBJ:$(PROGS)/media/zsea/plugins/convert/convert.asm \ + distr_data/rotate.obj:DISTR_DATA/ROTATE.OBJ:$(PROGS)/media/zsea/plugins/rotate/rotate.asm \ + distr_data/scaling.obj:DISTR_DATA/SCALING.OBJ:$(PROGS)/media/zsea/plugins/scaling/scaling.asm \ # end of list # The list of all FASM programs which needs to be compiled without KPACKing. @@ -361,6 +368,16 @@ EXTRA:=\ games/fara=games/fara \ games/soko/soko=games/soko \ kolibrios/media/fplay-full=media/fplay-full \ + kolibrios/media/zsea/zsea=distr_data/zsea \ + kolibrios/media/zsea/plugins/cnv_bmp.obj=distr_data/cnv_bmp.obj \ + kolibrios/media/zsea/plugins/cnv_gif.obj=distr_data/cnv_gif.obj \ + kolibrios/media/zsea/plugins/cnv_jpeg.obj=distr_data/cnv_jpeg.obj \ + kolibrios/media/zsea/plugins/convert.obj=distr_data/convert.obj \ + kolibrios/media/zsea/plugins/rotate.obj=distr_data/rotate.obj \ + kolibrios/media/zsea/plugins/scaling.obj=distr_data/scaling.obj \ + kolibrios/media/zsea/zsea.ini=$(REPOSITORY)/programs/media/zsea/zSea.ini \ + kolibrios/media/zsea/zsea_keys.txt=$(REPOSITORY)/programs/media/zsea/Docs/zSea_keys.txt \ + kolibrios/media/zsea/buttons/buttons.png=$(REPOSITORY)/programs/media/zsea/buttons.png \ #end of list DISTRIBUTION_EXTRA:=\ $(EXTRA) \ diff --git a/data/eng/menu.dat b/data/eng/menu.dat index a0aaeba576..b6f8988523 100644 --- a/data/eng/menu.dat +++ b/data/eng/menu.dat @@ -66,7 +66,8 @@ CubeLine /rd/1/3d/cubeline Gears /rd/1/3d/gears 3D-waved area /rd/1/3d/3dwav #6 **** GRAPHICS **** -Image viewer /rd/1/media/kiv +Image viewer KIV /rd/1/media/kiv +Image viewer zSea /addappl/media/zsea/zsea Animage /rd/1/media/animage Image Filtering /rd/1/media/imgf/imgf Palitra /rd/1/media/palitra diff --git a/data/it/Makefile b/data/it/Makefile index 44b9852efc..b09173d9b8 100644 --- a/data/it/Makefile +++ b/data/it/Makefile @@ -205,6 +205,13 @@ FASM_PROGRAMS:=\ # Format of an item is exactly the same as in the previous list. FASM_PROGRAMS_CD:=\ drivers/atikms:DRIVERS/ATIKMS:$(REPOSITORY)/drivers/video/drm/radeon/atikms.asm \ + distr_data/zsea:DISTR_DATA/ZSEA:$(PROGS)/media/zsea/zSea.asm \ + distr_data/cnv_bmp.obj:DISTR_DATA/CNV_BMP.OBJ:$(PROGS)/media/zsea/plugins/bmp/cnv_bmp.asm \ + distr_data/cnv_gif.obj:DISTR_DATA/CNV_GIF.OBJ:$(PROGS)/media/zsea/plugins/gif/cnv_gif.asm \ + distr_data/cnv_jpeg.obj:DISTR_DATA/CNV_JPEG.OBJ:$(PROGS)/media/zsea/plugins/jpeg/cnv_jpeg.asm \ + distr_data/convert.obj:DISTR_DATA/CONVERT.OBJ:$(PROGS)/media/zsea/plugins/convert/convert.asm \ + distr_data/rotate.obj:DISTR_DATA/ROTATE.OBJ:$(PROGS)/media/zsea/plugins/rotate/rotate.asm \ + distr_data/scaling.obj:DISTR_DATA/SCALING.OBJ:$(PROGS)/media/zsea/plugins/scaling/scaling.asm \ # end of list # The list of all FASM programs which needs to be compiled without KPACKing. @@ -362,6 +369,16 @@ MKISOFS_EXTRA:=\ games/fara=games/fara \ games/soko/soko=games/soko \ kolibrios/media/fplay-full=media/fplay-full \ + kolibrios/media/zsea/zsea=distr_data/zsea \ + kolibrios/media/zsea/plugins/cnv_bmp.obj=distr_data/cnv_bmp.obj \ + kolibrios/media/zsea/plugins/cnv_gif.obj=distr_data/cnv_gif.obj \ + kolibrios/media/zsea/plugins/cnv_jpeg.obj=distr_data/cnv_jpeg.obj \ + kolibrios/media/zsea/plugins/convert.obj=distr_data/convert.obj \ + kolibrios/media/zsea/plugins/rotate.obj=distr_data/rotate.obj \ + kolibrios/media/zsea/plugins/scaling.obj=distr_data/scaling.obj \ + kolibrios/media/zsea/zsea.ini=$(REPOSITORY)/programs/media/zsea/zSea.ini \ + kolibrios/media/zsea/zsea_keys.txt=$(REPOSITORY)/programs/media/zsea/Docs/zSea_keys.txt \ + kolibrios/media/zsea/buttons/buttons.png=$(REPOSITORY)/programs/media/zsea/buttons.png \ #end of list # Some macro for convenient work. diff --git a/data/it/menu.dat b/data/it/menu.dat index 45a2feb687..b4db2b42ca 100644 --- a/data/it/menu.dat +++ b/data/it/menu.dat @@ -66,7 +66,8 @@ CubeLine /rd/1/3d/cubeline Gears /rd/1/3d/gears 3D-waved area /rd/1/3d/3dwav #6 **** GRAPHICS **** -Visualizzatore Immagini /rd/1/media/kiv +Image viewer KIV /rd/1/media/kiv +Image viewer zSea /addappl/media/zsea/zsea Animage /rd/1/media/animage Palitra /rd/1/media/palitra #7 **** MULTIMEDIA **** diff --git a/data/rus/Makefile b/data/rus/Makefile index be0c17d914..e537a3708b 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -204,7 +204,7 @@ FASM_PROGRAMS:=\ # The list of all FASM programs with one main FASM file for CD image. # Format of an item is exactly the same as in the previous list. FASM_PROGRAMS_CD:=\ - kolibrios/drivers/atikms:KOLIBRIOS/DRIVERS/ATIKMS:$(REPOSITORY)/drivers/video/drm/radeon/atikms.asm \ + drivers/atikms:DRIVERS/ATIKMS:$(REPOSITORY)/drivers/video/drm/radeon/atikms.asm \ distr_data/zsea:DISTR_DATA/ZSEA:$(PROGS)/media/zsea/zSea.asm \ distr_data/cnv_bmp.obj:DISTR_DATA/CNV_BMP.OBJ:$(PROGS)/media/zsea/plugins/bmp/cnv_bmp.asm \ distr_data/cnv_gif.obj:DISTR_DATA/CNV_GIF.OBJ:$(PROGS)/media/zsea/plugins/gif/cnv_gif.asm \ diff --git a/data/sp/Makefile b/data/sp/Makefile index e074303b61..d963596769 100644 --- a/data/sp/Makefile +++ b/data/sp/Makefile @@ -205,6 +205,13 @@ FASM_PROGRAMS:=\ # Format of an item is exactly the same as in the previous list. FASM_PROGRAMS_CD:=\ drivers/atikms:DRIVERS/ATIKMS:$(REPOSITORY)/drivers/video/drm/radeon/atikms.asm \ + distr_data/zsea:DISTR_DATA/ZSEA:$(PROGS)/media/zsea/zSea.asm \ + distr_data/cnv_bmp.obj:DISTR_DATA/CNV_BMP.OBJ:$(PROGS)/media/zsea/plugins/bmp/cnv_bmp.asm \ + distr_data/cnv_gif.obj:DISTR_DATA/CNV_GIF.OBJ:$(PROGS)/media/zsea/plugins/gif/cnv_gif.asm \ + distr_data/cnv_jpeg.obj:DISTR_DATA/CNV_JPEG.OBJ:$(PROGS)/media/zsea/plugins/jpeg/cnv_jpeg.asm \ + distr_data/convert.obj:DISTR_DATA/CONVERT.OBJ:$(PROGS)/media/zsea/plugins/convert/convert.asm \ + distr_data/rotate.obj:DISTR_DATA/ROTATE.OBJ:$(PROGS)/media/zsea/plugins/rotate/rotate.asm \ + distr_data/scaling.obj:DISTR_DATA/SCALING.OBJ:$(PROGS)/media/zsea/plugins/scaling/scaling.asm \ # end of list # The list of all FASM programs which needs to be compiled without KPACKing. @@ -360,6 +367,16 @@ EXTRA:=\ games/fara=games/fara \ games/soko/soko=games/soko \ kolibrios/media/fplay-full=media/fplay-full \ + kolibrios/media/zsea/zsea=distr_data/zsea \ + kolibrios/media/zsea/plugins/cnv_bmp.obj=distr_data/cnv_bmp.obj \ + kolibrios/media/zsea/plugins/cnv_gif.obj=distr_data/cnv_gif.obj \ + kolibrios/media/zsea/plugins/cnv_jpeg.obj=distr_data/cnv_jpeg.obj \ + kolibrios/media/zsea/plugins/convert.obj=distr_data/convert.obj \ + kolibrios/media/zsea/plugins/rotate.obj=distr_data/rotate.obj \ + kolibrios/media/zsea/plugins/scaling.obj=distr_data/scaling.obj \ + kolibrios/media/zsea/zsea.ini=$(REPOSITORY)/programs/media/zsea/zSea.ini \ + kolibrios/media/zsea/zsea_keys.txt=$(REPOSITORY)/programs/media/zsea/Docs/zSea_keys.txt \ + kolibrios/media/zsea/buttons/buttons.png=$(REPOSITORY)/programs/media/zsea/buttons.png \ #end of list DISTRIBUTION_EXTRA:=\ $(EXTRA) \ diff --git a/data/sp/menu.dat b/data/sp/menu.dat index e1baa83ea4..f3376a391f 100644 --- a/data/sp/menu.dat +++ b/data/sp/menu.dat @@ -66,7 +66,8 @@ CubeLine /rd/1/3d/cubeline Gears /rd/1/3d/gears 3D-waved area /rd/1/3d/3dwav #6 **** GRµFICOS **** -Visor de im genes /rd/1/media/kiv +Image viewer KIV /rd/1/media/kiv +Image viewer zSea /addappl/media/zsea/zsea Animage /rd/1/media/animage Efectos de im genes /rd/1/media/imgf/imgf Palitra /rd/1/media/palitra