Commit a92b2156 authored by Jay Dubb's avatar Jay Dubb
Browse files

-- Print better system info and application info

-- Send print output from setup.bat when installing Homer3 executable to log file setup.log
parent 7588ecf9
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ if strcmp(cfg.GetValue('Logging'), 'off')
    logger.SetDebugLevel(logger.Null());
end

PrintSystemInfo(logger);
PrintSystemInfo(logger, 'Homer3');
checkForHomerUpdates();

logger.Write(sprintf('Opened application config file %s\n', cfg.filename))
+6 −3
Original line number Diff line number Diff line
@@ -21,13 +21,16 @@ if dirnameInstall(end)~='/' & dirnameInstall(end)~='\'
end

if exist([dirnameInstall, 'homer3_install'],'dir')
    rmdir([dirnameInstall, 'homer3_install'],'s');
    try
        rmdir_safe([dirnameInstall, 'homer3_install'],'s');
    catch
    end
end
for ii=1:length(platform.homer3_exe(1))
    if exist([dirnameInstall, platform.homer3_exe{ii}],'file')==2
        delete([dirnameInstall, platform.homer3_exe{ii}]);
    elseif exist([dirnameInstall, platform.homer3_exe{ii}],'dir')==7
        rmdir([dirnameInstall, platform.homer3_exe{ii}], 's');
        rmdir_safe([dirnameInstall, platform.homer3_exe{ii}]);
    end
end

@@ -35,7 +38,7 @@ for ii=1:length(platform.setup_exe)
    if exist([dirnameInstall, platform.setup_exe{ii}],'file')==2
        delete([dirnameInstall, platform.setup_exe{ii}]);
    elseif exist([dirnameInstall, platform.setup_exe{ii}],'dir')==7
        rmdir([dirnameInstall, platform.setup_exe{ii}], 's');
        rmdir_safe([dirnameInstall, platform.setup_exe{ii}]);
    end
end
if exist([dirnameInstall, 'Buildme.log'],'file')
+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ cleanup(dirnameInstall, dirnameApp);
platform = setplatformparams();

if exist([dirnameInstall, 'homer3_install'],'dir')
    rmdir([dirnameInstall, 'homer3_install'],'s');
    rmdir_safe([dirnameInstall, 'homer3_install']);
end
if exist([dirnameInstall, 'homer3_install.zip'],'file')
    delete([dirnameInstall, 'homer3_install.zip']);
+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@
@echo   PLEASE WAIT ... INSTALLTION WILL START IN A FEW MINUTES ...
@echo.
@move .\installtemp .\setup.exe
@call .\setup.exe
@call .\setup.exe  1> setup.log 2>&1   
@move .\setup.exe .\installtemp 
+3 −8
Original line number Diff line number Diff line
@@ -33,15 +33,10 @@ end
if isempty(hObject)
    hObject = -1;
end
if isempty(option)
    option = 'inclpath';
end
[verstr, vernum] = version2string();
if strcmp(option, 'inclpath')
    title = sprintf('Homer3 (v%s) - %s', verstr);
elseif strcmp(option, 'exclpath')
    title = sprintf('Homer3 (v%s)', verstr);
end
platform = ['R', version('-release')];
title = sprintf('Homer3 (v%s, %s)', verstr, platform);

if ishandle(hObject)
    set(hObject,'name', title);
end
Loading