KolibriOS/kolibrios
13
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

add AUTORUN to syspanel.ini, fix build dependencies in Tupfile.lua, add TheBus to ISO, small update icons32.png, app_plus.ini, assoc.ini, game_center.ini

Browse Source 
git-svn-id: svn://kolibrios.org@6991 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2017-09-18 18:16:30 +00:00
parent cddd55baa5
commit d3e7e7f2e4
7 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/Tupfile.lua
View File

@ -163,7 +163,6 @@ extra_files = {
{"kolibrios/develop/oberon07/Docs/", PROGS .. "/develop/oberon07/Docs/*"},
{"kolibrios/develop/oberon07/Lib/KolibriOS/", PROGS .. "/develop/oberon07/Lib/KolibriOS/*"},
{"kolibrios/develop/oberon07/Samples/", PROGS .. "/develop/oberon07/Samples/*"},
{"kolibrios/develop/utils/GenFiles", PROGS .. "/testing/genfiles/GenFiles"},
{"kolibrios/emul/dosbox/", "common/emul/DosBox/*"},
{"kolibrios/emul/e80/readme.txt", PROGS .. "/emulator/e80/trunk/readme.txt"},
{"kolibrios/emul/fceu/fceu", PROGS .. "/emulator/fceu/fceu"},
@ -176,28 +175,25 @@ extra_files = {
{"kolibrios/demos/life2", "common/demos/life2"},
{"kolibrios/demos/relay.lif", "common/demos/relay.lif"},
{"kolibrios/demos/rpento.lif", "common/demos/rpento.lif"},
{"kolibrios/demos/buddhabrot", PROGS .. "/demos/buddhabrot/trunk/buddhabrot"},
{"kolibrios/demos/qjulia", PROGS .. "/demos/qjulia/trunk/qjulia"},
{"kolibrios/games/Almaz", PROGS .. "/games/almaz/almaz"},
{"kolibrios/games/BabyPainter", "common/games/BabyPainter"},
{"kolibrios/games/bomber/ackack.bmp", PROGS .. "/games/bomber/ackack.bmp"},
{"kolibrios/games/bomber/bomb.bmp", PROGS .. "/games/bomber/bomb.bmp"},
{"kolibrios/games/bomber/plane.bmp", PROGS .. "/games/bomber/plane.bmp"},
{"kolibrios/games/bomber/tile.bmp", PROGS .. "/games/bomber/tile.bmp"},
{"kolibrios/games/doom1/", "common/games/doom/*"},
{"kolibrios/games/pig/", "common/games/pig/*"},
{"kolibrios/games/fara/fara.gfx", "common/games/fara.gfx"},
{"kolibrios/games/jumpbump/", "common/games/jumpbump/*"},
{"kolibrios/games/knight", "common/games/knight"},
{"kolibrios/games/LaserTank/", "common/games/LaserTank/*"},
{"kolibrios/games/lrl/", "common/games/lrl/*"},
{"kolibrios/games/megamaze", PROGS .. "/games/megamaze/trunk/megamaze"},
{"kolibrios/games/mun/data/", "common/games/mun/data/*"},
{"kolibrios/games/mun/libc.dll", "common/games/mun/libc.dll"},
{"kolibrios/games/mun/mun", "common/games/mun/mun"},
{"kolibrios/games/phenix", PROGS .. "/games/phenix/trunk/phenix"},
{"kolibrios/games/soko/soko", PROGS .. "/games/soko/trunk/SOKO"},
{"kolibrios/games/pig/", "common/games/pig/*"},
{"kolibrios/games/soko/", "common/games/soko/*"},
{"kolibrios/games/the_bus/", PROGS .. "/cmm/the_bus/the_bus/menu.png"},
{"kolibrios/games/the_bus/", PROGS .. "/cmm/the_bus/the_bus/objects.png"},
{"kolibrios/games/the_bus/", PROGS .. "/cmm/the_bus/the_bus/road.png"},
{"kolibrios/grafx2/fonts/", "common/media/grafx2/fonts/*"},
{"kolibrios/grafx2/scripts/", "common/media/grafx2/scripts/libs/*"},
{"kolibrios/grafx2/scripts/libs/", "common/media/grafx2/scripts/*"},
@ -234,7 +230,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/calcplus", PROGS .. "/other/calcplus/calcplus"},
{"kolibrios/utils/fNav/", "common/File Managers/fNav/*"},
{"kolibrios/res/wallpapers/in_the_wind.png", "common/wallpapers/in_the_wind.png"},
{"kolibrios/res/wallpapers/deink.png", "common/wallpapers/deink.png"},
@ -489,13 +484,20 @@ tup.append_table(extra_files, {
{"HD_Load/USB_Boot/", PROGS .. "/hd_load/usb_boot/setmbr.exe"},
{"HD_Load/USB_boot_old/", PROGS .. "/hd_load/usb_boot_old/MeOSload.com"},
{"HD_Load/USB_boot_old/", PROGS .. "/hd_load/usb_boot_old/enable.exe"},
{"kolibrios/demos/buddhabrot", PROGS .. "/demos/buddhabrot/trunk/buddhabrot"},
{"kolibrios/demos/qjulia", PROGS .. "/demos/qjulia/trunk/qjulia"},
{"kolibrios/develop/utils/GenFiles", PROGS .. "/testing/genfiles/GenFiles"},
{"kolibrios/games/Almaz", PROGS .. "/games/almaz/almaz"},
{"kolibrios/games/arcanii", PROGS .. "/games/arcanii/trunk/arcanii"},
{"kolibrios/games/bomber/bomber", PROGS .. "/games/bomber/bomber"},
{"kolibrios/games/bomber/bomberdata.bin", PROGS .. "/games/bomber/sounds/bomberdata.bin"},
{"kolibrios/games/codemaster/binary_master", PROGS .. "/games/codemaster/binary_master"},
{"kolibrios/games/codemaster/hang_programmer", PROGS .. "/games/codemaster/hang_programmer"},
{"kolibrios/games/codemaster/kolibri_puzzle", PROGS .. "/games/codemaster/kolibri_puzzle"},
{"kolibrios/games/megamaze", PROGS .. "/games/megamaze/trunk/megamaze"},
{"kolibrios/games/invaders", PROGS .. "/games/invaders/invaders"},
{"kolibrios/games/phenix", PROGS .. "/games/phenix/trunk/phenix"},
{"kolibrios/games/soko/soko", PROGS .. "/games/soko/trunk/SOKO"},
{"kolibrios/media/zsea/zsea", PROGS .. "/media/zsea/zSea"},
{"kolibrios/media/zsea/plugins/cnv_bmp.obj", PROGS .. "/media/zsea/plugins/bmp/cnv_bmp.obj"},
{"kolibrios/media/zsea/plugins/cnv_gif.obj", PROGS .. "/media/zsea/plugins/gif/cnv_gif.obj"},
@ -503,6 +505,7 @@ tup.append_table(extra_files, {
{"kolibrios/media/zsea/plugins/convert.obj", PROGS .. "/media/zsea/plugins/convert/convert.obj"},
{"kolibrios/media/zsea/plugins/rotate.obj", PROGS .. "/media/zsea/plugins/rotate/rotate.obj"},
{"kolibrios/media/zsea/plugins/scaling.obj", PROGS .. "/media/zsea/plugins/scaling/scaling.obj"},
{"kolibrios/utils/calcplus", PROGS .. "/other/calcplus/calcplus"},
})
-- For russian build, add russian-only programs.
if build_type == "rus" then tup.append_table(img_files, {
@ -555,6 +558,7 @@ tup.append_table(img_files, {
})
tup.append_table(extra_files, {
{"kolibrios/drivers/DRVINST.KEX", PROGS .. "/cmm/drvinst/drvinst.com"},
{"kolibrios/games/the_bus/the_bus", PROGS .. "/cmm/the_bus/the_bus.com"},
{"kolibrios/utils/DICTY.KEX", PROGS .. "/cmm/dicty/dicty.com"},
{"kolibrios/utils/appearance", PROGS .. "/cmm/appearance/appearance.com"},
})

BIN
data/common/icons32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 34 KiB

13
data/common/settings/app_plus.ini
View File

@ -10,6 +10,13 @@ FPlay=/kolibrios/media/fplay,40
GrafX2=/kolibrios/grafx2/grafx2,48
uPDF=/sys/lod|*pdf* /kolibrios/media/updf,73
[Misc]
DosBox=/kolibrios/emul/dosbox/dosbox,11
Dicty=/kolibrios/utils/DICTY.KEX,79
fNav=/kolibrios/utils/fNav/fNav.kex,45
Life=/kolibrios/demos/life2,13
Calc+=/kolibrios/utils/calcplus,4
[3D Tools]
Info3DsPro=/kolibrios/3d/info3ds/info3ds,75
Info3DsUser=/kolibrios/3d/info3ds/info3ds_u,75
@ -21,9 +28,3 @@ Cubeline=/kolibrios/3D/cubeline,78
M2View=/kolibrios/3D/md2view/md2view,78
Globe=/kolibrios/3D/TEXTURES1,78
[Other]
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

19
data/common/settings/assoc.ini
View File

@ -82,16 +82,8 @@ icon=75
exec=/sys/fb2read
icon=44
[cObj]
exec=/sys/develop/cObj
next=$HexEditor
[Eolite]
exec=/sys/file managers/eolite
icon=1
[Assoc]
/=$Eolite
/=/sys/file managers/eolite
kf=/sys/FONT_VIEWER
@ -126,17 +118,20 @@ mov=$FPlay
webm=$FPlay
gif=$KIV
tga=$KIV
ico=$KIV
cur=$KIV
pcx=$KIV
xcf=$KIV
pbm=$KIV
pgm=$KIV
pnm=$KIV
tga=$KIV
tif=$KIV
tiff=$KIV
wbmp=$KIV
xbm=$KIV
xcf=$KIV
z80=$KIV
mp3=$Pixie
wav=$AC97snd
@ -153,7 +148,7 @@ rtf=$RTFRead
grf=$Graph
obj=$cObj
obj=/sys/develop/cObj
raw=$HeEd

5
data/common/settings/game_center.ini
View File

@ -14,6 +14,7 @@ Heliothryx=/kolibrios/games/heliothryx/heliothryx
Dungeons=/kolibrios/games/dungeons/dungeons
JumpBump=/kolibrios/games/jumpbump/jumpbump.kex
Loderunner=/kolibrios/games/LRL/LRL,41
TheBus=/kolibrios/games/the_bus/the_bus,86
Mun=/kolibrios/games/mun/mun
Kosilka=/sys/games/kosilka,23
Bomber=/kolibrios/games/bomber/bomber,14
@ -26,8 +27,8 @@ Sea War=/sys/games/SW,66
Donkey=/kolibrios/games/donkey
Almaz=/kolibrios/games/almaz,81
Nsider=/kolibrios/games/Nsider/Nsider
; 21days=/kolibrios/games/21days/21days ;rus only
BabyPainter=/kolibrios/games/BabyPainter
; 21days=/kolibrios/games/21days/21days,2 ;rus only
BabyPainter=/kolibrios/games/BabyPainter,87
Klavisha=/sys/games/klavisha,69
Millioneer=/sys/games/whowtbam

1
data/common/settings/syspanel.ini
View File

@ -17,6 +17,7 @@ Volume=@VOLUME,64
Panels=panels_cfg,63
Mouse=mousecfg,54
DriverInstall=/kolibrios/drivers/DRVINST.KEX,71
Autorun=/sys/tinypad|/sys/settings/autorun.dat,55
[Monitoring]
Debug Board=/sys/develop/board,19

5
data/rus/settings/game_center.ini
View File

@ -14,6 +14,7 @@ Heliothryx=/kolibrios/games/heliothryx/heliothryx
Dungeons=/kolibrios/games/dungeons/dungeons
JumpBump=/kolibrios/games/jumpbump/jumpbump.kex
Loderunner=/kolibrios/games/LRL/LRL,41
TheBus=/kolibrios/games/the_bus/the_bus,86
Mun=/kolibrios/games/mun/mun
Kosilka=/sys/games/kosilka,23
Bomber=/kolibrios/games/bomber/bomber,14
@ -26,8 +27,8 @@ Sea War=/sys/games/SW,66
Donkey=/kolibrios/games/donkey
Almaz=/kolibrios/games/almaz,81
Nsider=/kolibrios/games/Nsider/Nsider
21days=/kolibrios/games/21days/21days
BabyPainter=/kolibrios/games/BabyPainter
21days=/kolibrios/games/21days/21days,2
BabyPainter=/kolibrios/games/BabyPainter,87
Klavisha=/sys/games/klavisha,69
Millioneer=/sys/games/whowtbam