Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7654 → Rev 7647

/programs/cmm/lib/patterns/restart_process.h
38,7 → 38,7
}
 
:void RestartProcessByName(dword proc_name, byte multiple) {
KillProcessByName(proc_name + strrchr(proc_name, '/'), multiple);
KillProcessByName(proc_name, multiple);
RunProgram(proc_name, "");
}
 
/programs/cmm/software_widget/software_widget.c
53,7 → 53,7
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", 2);
ini_get_int stdcall (#settings_ini_path, "Config", "default_icon", 0);
default_icon = EAX;
}
 
/programs/cmm/barscfg/barscfg.c
251,12 → 251,12
dword proc_name1;
if (panel_type == TASKBAR)
{
RestartProcessByName("/sys/@taskbar", SINGLE);
RestartProcessByName("@taskbar", SINGLE);
pause(50);
}
else
{
RestartProcessByName("/sys/@docky", SINGLE);
RestartProcessByName("@docky", SINGLE);
pause(120);
}
GetProcessInfo(#Form, SelfInfo);
/programs/cmm/installer/install.c
File deleted
\ No newline at end of file
/programs/cmm/installer/installer.c
0,0 → 1,37
#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:
/programs/cmm/installer/_compile_en.bat
1,9 → 1,10
@del lang.h--
@echo #define LANG_ENG 1 >lang.h--
 
C-- install.c
@del install.kex
@rename install.com install.kex
C-- installer.c
@del installer.kex
@rename installer.com installer.kex
@pause
@del lang.h--
@del warning.txt
@del warning.txt
kpack installer.kex
/programs/cmm/installer/_compile_ru.bat
1,9 → 1,10
@del lang.h--
@echo #define LANG_RUS 1 >lang.h--
 
C-- install.c
@del install.kex
@rename install.com install.kex
C-- installer.c
@del installer.kex
@rename installer.com installer.kex
@pause
@del lang.h--
@del warning.txt
@del warning.txt
kpack installer.kex
/programs/cmm/installer/Tupfile.lua
3,4 → 3,4
then C_LANG = "LANG_RUS"
else C_LANG = "LANG_ENG" -- this includes default case without config
end
tup.rule("install.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "install.com")
tup.rule("installer.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "installer.com")