nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

changed error management + cmake checking (bin dir)

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@998 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
legrand 2008-02-22 10:18:52 +00:00
commit ea8e0c686a
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
utilities/trunk/windows/paradiseo_installer_script.iss
View file

@ -25,7 +25,7 @@
// installer description info // installer description info
#define Version="1.1" #define Version="1.1"
#define VersionMain="ParadisEO-ix86-1.1" #define VersionMain="ParadisEO-ix86-1.1"
#define InstallerName="paradiseo-1.1-win32-preinstaller" #define InstallerName="paradiseo-1.1-win32-installer"
#define ApplicationName="ParadisEO" #define ApplicationName="ParadisEO"
#define SetupIconPath="E:\software\paradisEO\repository\utilities\trunk\windows\img\paradiseo.ico" #define SetupIconPath="E:\software\paradisEO\repository\utilities\trunk\windows\img\paradiseo.ico"
#define WizardMainImage="E:\software\paradisEO\repository\utilities\trunk\windows\img\paradiseo.bmp" #define WizardMainImage="E:\software\paradisEO\repository\utilities\trunk\windows\img\paradiseo.bmp"
@ -66,7 +66,6 @@ VersionInfoVersion={#Version}
VersionInfoCompany={#Company} VersionInfoCompany={#Company}
VersionInfoDescription={#ApplicationName} VersionInfoDescription={#ApplicationName}
VersionInfoTextVersion={#ApplicationName} VersionInfoTextVersion={#ApplicationName}
InfoAfterFile={#FinalInstructions}
[Languages] [Languages]
Name: "english"; MessagesFile: "compiler:Default.isl" Name: "english"; MessagesFile: "compiler:Default.isl"
@ -184,8 +183,6 @@ var
ProgressBarLabel: TLabel; ProgressBarLabel: TLabel;
ProgressBar: TNewProgressBar; ProgressBar: TNewProgressBar;
FolderTreeView: TFolderTreeView; FolderTreeView: TFolderTreeView;
ConfigBitmapImage: TBitmapImage;
BitmapFileName: String;
CMakeAdditionalTags: String; CMakeAdditionalTags: String;
procedure SetCmakeGenerator(); procedure SetCmakeGenerator();
@ -282,7 +279,7 @@ begin
end; end;
if(PrintMsgBox) then begin if(PrintMsgBox) then begin
MsgBox(CustomMessage('ErrorOccured') + ': [code='+ IntToStr(ErrorCode) + ']' , mbCriticalError, mb_Ok); MsgBox(CustomMessage('ErrorOccured') + ': [code='+ IntToStr(ErrorCode) + ']' + ' [' + SysErrorMessage(ErrorCode) + ']' , mbCriticalError, mb_Ok);
end; end;
Result:= true; Result:= true;
@ -297,11 +294,13 @@ var
ErrorCode: Integer; ErrorCode: Integer;
begin begin
// launch CMake for MOEO // launch CMake for MOEO
ShellExec('open', Path + 'cmake.exe','','', SW_SHOWNORMAL, ewWaitUntilTerminated, ErrorCode); ShellExec('open', Path + 'cmake.exe','','', SW_SHOWMINIMIZED, ewWaitUntilTerminated, ErrorCode);
Result:= ErrorCode; Result:= ErrorCode;
end; end;
function LaunchEOBuildProcess():Integer; function LaunchEOBuildProcess():Integer;
var var
ErrorCode: Integer; ErrorCode: Integer;
@ -507,6 +506,14 @@ begin
{ Get the Cmake directory provided by the user } { Get the Cmake directory provided by the user }
CMakeBinDir:= FolderTreeView.Directory + '\'; CMakeBinDir:= FolderTreeView.Directory + '\';
if isError(checkCMakeAvailable(CMakeBinDir),false) then begin if isError(checkCMakeAvailable(CMakeBinDir),false) then begin
CMakeBinDir:= FolderTreeView.Directory + '\' + 'bin\';
if isError(checkCMakeAvailable(CMakeBinDir),false) then begin
MsgBox(CustomMessage('CMakeNotFound'), mbCriticalError, mb_Ok);
Result := False;
exit;
end else
Result := True; exit;
MsgBox(CustomMessage('CMakeNotFound'), mbCriticalError, mb_Ok); MsgBox(CustomMessage('CMakeNotFound'), mbCriticalError, mb_Ok);
Result := False; Result := False;
end else end else
@ -519,7 +526,7 @@ var
Lbl1,Lbl2,Lbl3: TLabel; Lbl1,Lbl2,Lbl3: TLabel;
begin begin
if (isError(checkCMakeAvailable(' '),False)) then begin if (isError(checkCMakeAvailable(''),False)) then begin
CMakeLookupPage := CreateCustomPage({#cmakeLookupWizardPageIndex},CustomMessage('PathToCMakeTitle'),CustomMessage('PathToCMakeSubtitle')); CMakeLookupPage := CreateCustomPage({#cmakeLookupWizardPageIndex},CustomMessage('PathToCMakeTitle'),CustomMessage('PathToCMakeSubtitle'));
FolderTreeView := TFolderTreeView.Create(CMakeLookupPage); FolderTreeView := TFolderTreeView.Create(CMakeLookupPage);
FolderTreeView.Width := CMakeLookupPage.SurfaceWidth; FolderTreeView.Width := CMakeLookupPage.SurfaceWidth;