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

last changes for tag paradiseo-1.1-patch1

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

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

@ -17,8 +17,8 @@
#define OutputPath="E:\software\paradisEO\windows installer\compiler output" #define OutputPath="E:\software\paradisEO\windows installer\compiler output"
// installer source info // installer source info
#define ParadiseoSourceTag="E:\software\paradisEO\repository\tags\paradiseo-1.1\*" #define ParadiseoSourceTag="E:\software\paradisEO\repository\tags\paradiseo-1.1-patch1\*"
#define EoTag="E:\software\eo\repository\*" #define EoTag="E:\software\eo\repository\tag-1.1-patch1\*"
// installer description info // installer description info
#define Version="1.1" #define Version="1.1"
@ -168,11 +168,11 @@ Source: {#ParadiseoSourceTag}; DestDir: "{app}"; Excludes: {#SkipParadiseoFiles}
Source: {#EoTag}; DestDir: "{app}"; Excludes: "*.~*" ; Flags: ignoreversion recursesubdirs createallsubdirs Source: {#EoTag}; DestDir: "{app}"; Excludes: "*.~*" ; Flags: ignoreversion recursesubdirs createallsubdirs
; SPECIFIC CORRECTION - EO TAG NOT MODIFIED, USED TRUNK SOURCES ; SPECIFIC CORRECTION - EO TAG NOT MODIFIED, USED TRUNK SOURCES
Source: E:\software\eo\repository\paradiseo-eo\CMakeLists.txt ; DestDir: "{app}\paradiseo-eo"; Excludes: "*.~*" ; Flags: ignoreversion recursesubdirs createallsubdirs Source: E:\software\eo\repository\tag-1.1-patch1\paradiseo-eo\CMakeLists.txt ; DestDir: "{app}\paradiseo-eo"; Excludes: "*.~*" ; Flags: ignoreversion recursesubdirs createallsubdirs
Source: E:\software\eo\repository\paradiseo-eo\src\utils\pipecom.h; DestDir: "{app}\paradiseo-eo\src\utils"; Excludes: "*.~*" ; Flags: ignoreversion recursesubdirs createallsubdirs Source: E:\software\eo\repository\tag-1.1-patch1\paradiseo-eo\src\utils\pipecom.h; DestDir: "{app}\paradiseo-eo\src\utils"; Excludes: "*.~*" ; Flags: ignoreversion recursesubdirs createallsubdirs
Source: E:\software\eo\repository\paradiseo-eo\src\utils\pipecom.cpp; DestDir: "{app}\paradiseo-eo\src\utils"; Excludes: "*.~*" ; Flags: ignoreversion recursesubdirs createallsubdirs Source: E:\software\eo\repository\tag-1.1-patch1\paradiseo-eo\src\utils\pipecom.cpp; DestDir: "{app}\paradiseo-eo\src\utils"; Excludes: "*.~*" ; Flags: ignoreversion recursesubdirs createallsubdirs
Source: E:\software\eo\repository\paradiseo-eo\src\eoCtrlCContinue.h; DestDir: "{app}\paradiseo-eo\src"; Excludes: "*.~*" ; Flags: ignoreversion recursesubdirs createallsubdirs Source: E:\software\eo\repository\tag-1.1-patch1\paradiseo-eo\src\eoCtrlCContinue.h; DestDir: "{app}\paradiseo-eo\src"; Excludes: "*.~*" ; Flags: ignoreversion recursesubdirs createallsubdirs
Source: E:\software\eo\repository\paradiseo-eo\src\eoCtrlCContinue.cpp; DestDir: "{app}\paradiseo-eo\src"; Excludes: "*.~*" ; Flags: ignoreversion recursesubdirs createallsubdirs Source: E:\software\eo\repository\tag-1.1-patch1\paradiseo-eo\src\eoCtrlCContinue.cpp; DestDir: "{app}\paradiseo-eo\src"; Excludes: "*.~*" ; Flags: ignoreversion recursesubdirs createallsubdirs
[Dirs] [Dirs]
Name: {app}\logs Name: {app}\logs
@ -281,7 +281,7 @@ procedure SetCTestConfig();
var var
MinConfig: String; MinConfig: String;
begin begin
MinConfig:=' -D ExperimentalStart -D ExperimentalBuild' ; MinConfig:=' -D ExperimentalStart -D ExperimentalBuild -D ExperimentalTest' ;
if SendReportBox.Checked then if SendReportBox.Checked then
begin begin
@ -290,13 +290,12 @@ begin
if BuildModeBox.Checked[1] then if BuildModeBox.Checked[1] then
begin begin
CMakeAdditionalTags:= ' -DENABLE_CMAKE_TESTING=FALSE'; CMakeAdditionalTags:= ' -DENABLE_MINIMAL_CMAKE_TESTING=TRUE -DENABLE_CMAKE_TESTING=FALSE';
exit; exit;
end; end;
if BuildModeBox.Checked[2] then if BuildModeBox.Checked[2] then
begin begin
CTestConfig:=CTestConfig + ' -D ExperimentalTest' ; CMakeAdditionalTags:= ' -DENABLE_CMAKE_TESTING=TRUE -DENABLE_MINIMAL_CMAKE_TESTING=FALSE';
CMakeAdditionalTags:= ' -DENABLE_CMAKE_TESTING=TRUE';
exit; exit;
end; end;
end; end;