aabc2/KOS_qrcodes
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

add KolibriNext installer to ISO

Browse Source 
git-svn-id: svn://kolibrios.org@7654 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kiril Lipatov
2019-05-14 13:07:29 +00:00
parent f4b9da871d
commit aa456d953d
15 changed files with 95 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/Tupfile.lua
View File

@@ -214,6 +214,7 @@ extra_files = {
{"kolibrios/drivers/i915/", "common/drivers/i915/*"},
{"kolibrios/drivers/test/", "common/drivers/test/*"},
{"kolibrios/drivers/vmware/", "common/drivers/vmware/*"},
{"kolibrios/KolibriNext/settings/*", "common/KolibriNext/settings/*"},
{"kolibrios/lib/avcodec-56.dll", "common/lib/avcodec-56.dll"},
{"kolibrios/lib/avdevice-56.dll", "common/lib/avdevice-56.dll"},
{"kolibrios/lib/avformat-56.dll", "common/lib/avformat-56.dll"},
@@ -613,6 +614,7 @@ tup.append_table(extra_files, {
{"kolibrios/drivers/drvinst.kex", PROGS .. "/cmm/drvinst/drvinst.com"},
{"kolibrios/games/pig/pigex", PROGS .. "/cmm/examples/pigex.com"},
{"kolibrios/games/the_bus/the_bus", PROGS .. "/cmm/the_bus/the_bus.com"},
{"kolibrios/KolibriNext/install.kex", PROGS .. "/cmm/installer/install.com"},
{"kolibrios/utils/appearance", PROGS .. "/cmm/appearance/appearance.com"},
{"kolibrios/utils/codeview", PROGS .. "/cmm/codeview/codeview.com"},
{"kolibrios/utils/dicty.kex", PROGS .. "/cmm/dicty/dicty.com"},

42
data/common/KolibriNext/settings/app_plus.ini Normal file
View File

@@ -0,0 +1,42 @@
[Config]
win_width=600
cell_w=73
cell_h=71
title=KolibriOS Additional Software
[Media]
uPDF=/k/media/updf,73
EasyShot=easyshot,62
MidAmp=media/midamp,74
GrafX2=/k/grafx2/grafx2,48
Templates=file managers/Eolite|/kolibrios/res/templates,45
[3D Tools and Demos]
Info3DsPro=/k/3d/info3ds/info3ds,75
Info3DsUser=/k/3d/info3ds/info3ds_u,75
VoxelEditor=/k/3d/voxel_editor/voxel_editor,30
3dsHeart=/k/3D/3dsheart,78
Cubeline=/k/3D/cubeline,78
M2View=/k/3D/md2view/md2view,78
Globe=/k/3D/TEXTURES1,78
[Misc]
DosBox=/k/emul/dosbox/dosbox,11
KFM=File managers/KFM,3
fNav=File managers/fNav/fNav,93
TextReader=txtread,85
CncEditor=/k/utils/cnc_editor/cnc_editor,15
Life=/k/demos/life2,13
Calc+=/k/utils/calcplus,4
TinyBasic=/k/develop/TinyBasic/TinyBasic,91
Table=table,28
FtpClient=network/ftpc,90
VncViewer=network/vncc,77
Timer=demos/timer,119
IRC=network/ircc,29
UNZ=unz,89
ASCII View=asciivju,118

1
data/common/KolibriNext/settings/docky.ini Normal file
View File

@@ -0,0 +1 @@
[@]

1
data/common/KolibriNext/settings/icon.ini Normal file
View File

@@ -0,0 +1 @@
[rbmenu]

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

@@ -1,8 +1,8 @@
[Config]
window_width=600
title=KolibriOS Additional Software
win_width=600
cell_w=73
cell_h=71
window_title=KolibriOS Additional Software
[Media]
zSea=/k/media/zsea/zsea,46

4
data/common/settings/games.ini
View File

@@ -1,6 +1,6 @@
[Config]
window_width=750
window_title=KolibriOS Game Center
title=KolibriOS Game Center
win_width=750
default_icon=35
[Casual]

4
data/rus/settings/games.ini
View File

@@ -1,6 +1,6 @@
[Config]
window_width=750
window_title=<EFBFBD><EFBFBD>஢<EFBFBD><EFBFBD> 業<><E6A5AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
title=<EFBFBD><EFBFBD>஢<EFBFBD><EFBFBD> 業<><E6A5AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
win_width=750
default_icon=35
[Casual]

4
programs/cmm/barscfg/barscfg.c
View File

@@ -251,12 +251,12 @@ void RestartProcess(byte panel_type)
dword proc_name1;
if (panel_type == TASKBAR)
{
RestartProcessByName("@taskbar", SINGLE);
RestartProcessByName("/sys/@taskbar", SINGLE);
pause(50);
}
else
{
RestartProcessByName("@docky", SINGLE);
RestartProcessByName("/sys/@docky", SINGLE);
pause(120);
}
GetProcessInfo(#Form, SelfInfo);

2
programs/cmm/installer/Tupfile.lua
View File

@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
then C_LANG = "LANG_RUS"
else C_LANG = "LANG_ENG" -- this includes default case without config
end
tup.rule("installer.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "installer.com")
tup.rule("install.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "install.com")

9
programs/cmm/installer/_compile_en.bat
View File

@@ -1,10 +1,9 @@
@del lang.h--
@echo #define LANG_ENG 1 >lang.h--
C-- installer.c
@del installer.kex
@rename installer.com installer.kex
C-- install.c
@del install.kex
@rename install.com install.kex
@pause
@del lang.h--
@del warning.txt
kpack installer.kex
@del warning.txt

9
programs/cmm/installer/_compile_ru.bat
View File

@@ -1,10 +1,9 @@
@del lang.h--
@echo #define LANG_RUS 1 >lang.h--
C-- installer.c
@del installer.kex
@rename installer.com installer.kex
C-- install.c
@del install.kex
@rename install.com install.kex
@pause
@del lang.h--
@del warning.txt
kpack installer.kex
@del warning.txt

30
programs/cmm/installer/install.c Normal file
View File

@@ -0,0 +1,30 @@
#define MEMSIZE 4096*15
#include "..\lib\strings.h"
#include "..\lib\mem.h"
#include "..\lib\copyf.h"
#include "..\lib\obj\libini.h"
#include "..\lib\patterns\restart_process.h"
void main()
{
//#include "..\lib\added_sysdir.c";
//SetAdditionalSystemDirectory("kolibrios", abspath("install/kolibrios")+1);
load_dll(libini, #lib_init,1);
ini_set_int stdcall ("/sys/settings/taskbar.ini", "Flags", "Attachment", 0);
copyf(abspath("settings"), "/sys/settings");
RestartProcessByName("/sys/@icon", MULTIPLE);
RestartProcessByName("/sys/@taskbar", SINGLE);
RestartProcessByName("/sys/@docky", SINGLE);
RunProgram("/sys/media/kiv", "\\S__/kolibrios/res/Wallpapers/Free yourself.jpg");
ExitProcess();
}
void Operation_Draw_Progress(dword filename) { debug("copying: "); debugln(filename); }
stop:

37
programs/cmm/installer/installer.c
View File

@@ -1,37 +0,0 @@
#define MEMSIZE 4096*15
#include "..\lib\strings.h"
#include "..\lib\mem.h"
#include "..\lib\io.h"
#include "..\lib\copyf.h"
#include "..\lib\patterns\restart_process.h"
//#include "..\lib\added_sysdir.c";
void main()
{
//SetAdditionalSystemDirectory("kolibrios", abspath("install/kolibrios")+1);
io.run("/sys/tmpdisk", "a0");
pause(50);
io.del("/sys/docpack");
copyf(abspath("rd"), "/sys");
copyf(abspath("kos"), "/kolibrios");
copyf(abspath("tmp"), "/tmp0/1");
KillProcessByName("@icon", MULTIPLE);
KillProcessByName("@taskbar", SINGLE);
KillProcessByName("@docky", SINGLE);
RunProgram("/sys/@icon", NULL);
RunProgram("/sys/@taskbar", NULL);
RunProgram("/sys/@docky", NULL);
io.run("/sys/media/kiv", "\\S__/kolibrios/res/Wallpapers/deink.png");
//notify("'KolibriNext\nInstall complete'-tO");
ExitProcess();
}
void Operation_Draw_Progress(dword filename) { debug("copying: "); debugln(filename); }
stop:

2
programs/cmm/lib/patterns/restart_process.h
View File

@@ -38,7 +38,7 @@ enum {
}
:void RestartProcessByName(dword proc_name, byte multiple) {
KillProcessByName(proc_name, multiple);
KillProcessByName(proc_name + strrchr(proc_name, '/'), multiple);
RunProgram(proc_name, "");
}

2
programs/cmm/software_widget/software_widget.c
View File

@@ -53,7 +53,7 @@ void load_config()
list.item_w = EAX;
ini_get_int stdcall (#settings_ini_path, "Config", "cell_h", 71);
list.item_h = EAX;
ini_get_int stdcall (#settings_ini_path, "Config", "default_icon", 0);
ini_get_int stdcall (#settings_ini_path, "Config", "default_icon", 2);
default_icon = EAX;
}