installer optimisation - single installer

diff --git a/app_v3/chrome.manifest_basic b/app_v3/chrome.manifest_staff
similarity index 100%
rename from app_v3/chrome.manifest_basic
rename to app_v3/chrome.manifest_staff

diff --git a/app_v3/chrome/content/js/system.js b/app_v3/chrome/content/js/system.js
index be0f839..149f273 100644 (file)
--- a/app_v3/chrome/content/js/system.js
+++ b/app_v3/chrome/content/js/system.js
@@ -213,7 +213,7 @@ var system = {
     var appdata = this.appinfo();
     //var lic = apppref.getpreference("support.license");
     //var expiration = apppref.getpreference("support.expiration");
-    //document.getElementById("stbversion").setAttribute('label', " License: "+ lic + " Expiration: "+ expiration + " Version " + appdata.version);
+    document.getElementById("stbversion").setAttribute('label', "Version " + appdata.version);
     //dump(JSON.stringify(appdata) + "\n");
     if (curcfg.name) {
        document.getElementById("curcreche").value=curcfg.name;

diff --git a/app_v3/chrome/content/web/js/childs.js b/app_v3/chrome/content/web/js/childs.js
index 9b8056f..d27cb53 100644 (file)
--- a/app_v3/chrome/content/web/js/childs.js
+++ b/app_v3/chrome/content/web/js/childs.js
@@ -11,7 +11,7 @@ var childtbl = null;
 var wh= window.innerHeight -125;
 //var a = {};
 //var btnprintchild = "";
-var candelete = 1;
+var candelete = 0;
 function initdata(){
   var configdata = apppref.getpreference("pageconfig.childs");
   if (configdata !== '') {
@@ -21,7 +21,7 @@ function initdata(){
     pconfig.printlayout = 'list';
     apppref.setpreference("pageconfig.childs",pconfig);
   }
-  if (system.appinfo().ID.indexOf("director")){
+  if (system.appinfo().ID.indexOf("director") > 0){
     candelete = 1;
   }
     var filters = getallfilters();

diff --git a/dev/debug_creorga_director_v3.bat b/dev/debug_creorga_director_v3.bat
index fb89b95..4f2c2f7 100644 (file)
--- a/dev/debug_creorga_director_v3.bat
+++ b/dev/debug_creorga_director_v3.bat
@@ -3,5 +3,5 @@ echo "Copy files Creorga Director v3!"
 
 "C:\Windows\system32\xcopy.exe" "C:\Users\ksaff\Workspace\Creorga\app_v3\chrome\*" "C:\Users\ksaff\Debug\Creorga\chrome\" /E /Y /Q
 "C:\Windows\system32\xcopy.exe" "C:\Users\ksaff\Workspace\Creorga\app_v3\defaults\*" "C:\Users\ksaff\Debug\Creorga\defaults\" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Users\ksaff\Workspace\Creorga\app_v3\chrome.manifest" "C:\Users\ksaff\Debug\Creorga\chrome.manifest" /E /Y /Q
+"C:\Windows\system32\xcopy.exe" "C:\Users\ksaff\Workspace\Creorga\app_v3\chrome.manifest_staff" "C:\Users\ksaff\Debug\Creorga\chrome.manifest" /E /Y /Q
 "C:\Users\ksaff\Debug\Creorga\Creorga.exe" -jsconsole
\ No newline at end of file

diff --git a/install/create_setup_windows.pl b/install/create_setup_windows.pl
index c34987e..7989060 100644 (file)
--- a/install/create_setup_windows.pl
+++ b/install/create_setup_windows.pl
@@ -15,19 +15,21 @@ my $reppath = dirname($Bin);
 my $releasepath = $ENV{"USERPROFILE"}."\\Release";
 my $setuppath = $ENV{"USERPROFILE"}."\\Setups";
 print "Repository Path:".$reppath."\n";
+print "Release Path:".$releasepath."\n";
+print "Setup Path:".$setuppath."\n";
 chdir $reppath;
 my $strtags = `"git.exe" for-each-ref --sort=-creatordate --format="%(refname)" refs/tags`;
 
-my @modes = ("director","staff","localmanager");
-print "Select Mode:\n";
-for (my $m=0;$m<scalar(@modes);$m++){
-       print $m.": ".$modes[$m]."\n";
-}
-print "Mode:";
-my $ms = <STDIN>;
-chomp($ms);
-$setup = $modes[$ms];
-
+# my @modes = ("director","staff","localmanager");
+# print "Select Mode:\n";
+# for (my $m=0;$m<scalar(@modes);$m++){
+#      print $m.": ".$modes[$m]."\n";
+# }
+# print "Mode:";
+# my $ms = <STDIN>;
+# chomp($ms);
+# $setup = $modes[$ms];
+$setup = "director";
 #print "Mode selected:".$modes[$ms]."!\n";
 
 my @tags = split("\n",$strtags);
@@ -51,79 +53,94 @@ if (! -d $releasepath){
 else {
   remove_tree($releasepath,{keep_root => 1});
 }
-
+chdir $reppath;
 if (scalar(@tex) > 0) {
   print "Tag $tag exists!\n";
 }else {
   print "Tag $tag does not exist!\n";
-  chdir $reppath;
+  chdir $reppath."\\Creorga";
   system('"git.exe" tag '.$tag.' -m "Version '.$tag.'";');
 }
-system('"git.exe" archive -o "$releasepath\\Creorga_'.$tag.'.zip" '.$tag.'');
+system('"git.exe" archive -o "'.$releasepath.'\\Creorga_'.$tag.'.zip" '.$tag.'');
 make_path("$releasepath\\tag");
 chdir "$releasepath\\tag";
 
 
-system('"C:\\Tools\\7za.exe" x "$releasepath\\Creorga_'.$tag.'.zip"');
+system('"C:\\Tools\\7za.exe" x "'.$releasepath.'\\Creorga_'.$tag.'.zip"');
 chdir "$releasepath\\tag\\app_v3";
+make_path("$releasepath\\dist");
+
+make_path("$releasepath\\dist");
+make_path("$releasepath\\dist\\director");
+rcopy("$releasepath\\tag\\app_v3","$releasepath\\dist\\director");
 
-if ($setup eq "director"){
   my @unused_files = File::Find::Rule->file()
                                   ->name( qr/.+_basic.*/  )
-                                  ->in("$releasepath\\tag\\app_v3");
+                                  ->in("$releasepath\\dist\\director");
   foreach my $a (@unused_files){
     print "unlink $a\n";
     unlink($a);
   }
 
-  remove_tree("$releasepath\\tag\\app_v3\\chrome\\content\\modules\\staff_basic");
+  remove_tree("$releasepath\\dist\\director\\chrome\\content\\modules\\staff_basic");
+  copy("$releasepath\\tag\\app_v3\\chrome.manifest","$releasepath\\dist\\director\\chrome.manifest");
+  chdir("$releasepath\\dist\\director");
+  system('"C:\\Tools\\7za.exe" a -r creorga.jar chrome');
+
+make_path("$releasepath\\dist\\staff");
+rcopy("$releasepath\\tag\\app_v3","$releasepath\\dist\\staff");
 
-} elsif ($setup eq "staff"){
 
   my @unused_files = File::Find::Rule->file()
                                   ->name( qr/.+_standard.*/  )
-                                  ->in("$releasepath\\tag\\app_v3");
+                                  ->in("$releasepath\\dist\\staff");
   foreach my $a (@unused_files){
     print "unlink $a\n";
     unlink($a);
   }
 
-  unlink("$releasepath\\tag\\app_v3\\chrome\\content\\modules\\logbook\\logbook.xul");
-  unlink("$releasepath\\tag\\app_v3\\chrome\\content\\modules\\logbook\\logactivity.html");
-  unlink("$releasepath\\tag\\app_v3\\chrome\\content\\modules\\logbook\\js\\logactivity.js");
-  remove_tree("$releasepath\\tag\\app_v3\\chrome\\content\\modules\\default_standard");
-  remove_tree("$releasepath\\tag\\app_v3\\chrome\\content\\modules\\accounting");
-} elsif ($setup eq "localmanager"){
+  unlink("$releasepath\\dist\\staff\\chrome\\content\\modules\\logbook\\logbook.xul");
+  unlink("$releasepath\\dist\\staff\\chrome\\content\\modules\\logbook\\logactivity.html");
+  unlink("$releasepath\\dist\\staff\\chrome\\content\\modules\\logbook\\js\\logactivity.js");
+  remove_tree("$releasepath\\dist\\staff\\chrome\\content\\modules\\default_standard");
+  remove_tree("$releasepath\\dist\\staff\\chrome\\content\\modules\\accounting");
+  chdir("$releasepath\\dist\\staff");
+  copy("$releasepath\\tag\\app_v3\\chrome.manifest_staff","$releasepath\\dist\\staff\\chrome.manifest");
+  system('"C:\\Tools\\7za.exe" a -r creorga.jar chrome');
+
+make_path("$releasepath\\dist\\localmanager");
+rcopy("$releasepath\\tag\\app_v3","$releasepath\\dist\\localmanager");
+
 
   my @unused_files = File::Find::Rule->file()
                                   ->name( qr/.+_standard.*/  )
-                                  ->in("$releasepath\\tag\\app_v3");
+                                  ->in("$releasepath\\dist\\localmanager");
   foreach my $a (@unused_files){
     print "unlink $a\n";
     unlink($a);
   }
-  unlink("$releasepath\\tag\\app_v3\\chrome\\content\\modules\\logbook\\logbook.xul");
-  unlink("$releasepath\\tag\\app_v3\\chrome\\content\\modules\\logbook\\logactivity.html");
-  unlink("$releasepath\\tag\\app_v3\\chrome\\content\\modules\\logbook\\js\\logactivity.js");
-  remove_tree("$releasepath\\tag\\app_v3\\chrome\\content\\modules\\default_standard");
-  remove_tree("$releasepath\\tag\\app_v3\\chrome\\content\\modules\\accounting");
-} 
-
-system('"C:\\Tools\\7za.exe" a -r creorga_'.$setup.'.jar chrome');
-make_path("$releasepath\\dist");
+  unlink("$releasepath\\dist\\localmanager\\chrome\\content\\modules\\logbook\\logbook.xul");
+  unlink("$releasepath\\dist\\localmanager\\chrome\\content\\modules\\logbook\\logactivity.html");
+  unlink("$releasepath\\dist\\localmanager\\chrome\\content\\modules\\logbook\\js\\logactivity.js");
+  remove_tree("$releasepath\\dist\\localmanager\\chrome\\content\\modules\\default_standard");
+  remove_tree("$releasepath\\dist\\localmanager\\chrome\\content\\modules\\accounting");
+  copy("$releasepath\\tag\\app_v3\\chrome.manifest_localmanager","$releasepath\\dist\\localmanager\\chrome.manifest");
+  chdir("$releasepath\\dist\\localmanager");
+  system('"C:\\Tools\\7za.exe" a -r creorga.jar chrome');
+
 rcopy("C:\\Users\\ksaff\\Workspace\\xulrunner\\xulrunner","$releasepath\\dist\\xulrunner");
 
 copy("C:\\Users\\ksaff\\Workspace\\xulrunner\\Creorga.exe","$releasepath\\dist\\Creorga.exe");
 copy("C:\\Users\\ksaff\\Workspace\\xulrunner\\vc_redist.x86.exe","$releasepath\\dist\\vcredist_x86.exe");
 copy("$releasepath\\tag\\app_v3\\creorga_".$setup.".jar","$releasepath\\dist\\creorga.jar");
-if ($setup eq "staff"){
-  copy("$releasepath\\tag\\app_v3\\chrome.manifest_basic","$releasepath\\dist\\chrome.manifest");
-} elsif ($setup eq "localmanager") {
-  copy("$releasepath\\tag\\app_v3\\chrome.manifest_localmanager","$releasepath\\dist\\chrome.manifest");
-}  
-else {
-  copy("$releasepath\\tag\\app_v3\\chrome.manifest","$releasepath\\dist\\chrome.manifest");
-}
+# if ($setup eq "staff"){
+  
+# } elsif ($setup eq "localmanager") {
+  
+# }  
+# else {
+  
+# }
 
 rcopy("$releasepath\\tag\\app_v3\\defaults","$releasepath\\dist\\defaults");
 if ($tag !~ /beta/) {
@@ -131,40 +148,44 @@ if ($tag !~ /beta/) {
 }
 unlink("$releasepath\\dist\\xulrunner\\redit.exe");
 unlink("$releasepath\\dist\\xulrunner\\xulrunner-stub.exe");
-open(CHR,"$releasepath\\dist\\chrome.manifest");
-my $nf = "";
-while (my $l = <CHR>) {
-  $l =~ s|chrome\/|jar:creorga.jar!\/chrome\/|g;
-  $nf .= $l;
+#changing version director localmanager staff
+my @x = ("director","localmanager","staff");
+for my $vv (@x){
+  open(CHR,"$releasepath\\dist\\$vv\\chrome.manifest");
+  my $nf = "";
+  while (my $l = <CHR>) {
+    $l =~ s|chrome\/|jar:creorga.jar!\/chrome\/|g;
+    $nf .= $l;
+  }
+  open(NCHR,">$releasepath\\dist\\$vv\\chrome.manifest");
+    print NCHR $nf;
+  close(NCHR);
+
+  my @ct = localtime();
+  $ct[5] =  $ct[5] + 1900;
+  $ct[4] = $ct[4] + 1;
+  if ($ct[4] < 10) { $ct[4] = "0".$ct[4]}
+  if ($ct[3] < 10) { $ct[3] = "0".$ct[3]}
+
+
+  open(APP,">$releasepath\\dist\\$vv\\application.ini");
+    print APP "[App]\n";
+    print APP "Vendor=DKS\n";
+    print APP "Name=Creorga\n";
+    print APP "Version=".$tag."\n";
+    print APP "BuildID=".$ct[5].$ct[4].$ct[3]."\n";
+    print APP "Copyright=Copyright (c) ".$ct[5]." DKS sarl\n";
+    print APP "ID=creorga.".$vv."\@dks.lu\n";
+    print APP "Profile=Creorga\n\n";
+    print APP "[Gecko]\n";
+    print APP "MinVersion=38.0.6\n";
+    print APP "MaxVersion=38.0.6\n";
+  close(APP);
 }
-open(NCHR,">$releasepath\\dist\\chrome.manifest");
-print NCHR $nf;
-close(NCHR);
-
-my @ct = localtime();
-$ct[5] =  $ct[5] + 1900;
-$ct[4] = $ct[4] + 1;
-if ($ct[4] < 10) { $ct[4] = "0".$ct[4]}
-if ($ct[3] < 10) { $ct[3] = "0".$ct[3]}
-
-open(APP,">$releasepath\\dist\\application.ini");
-print APP "[App]\n";
-print APP "Vendor=DKS\n";
-print APP "Name=Creorga\n";
-print APP "Version=".$tag."\n";
-print APP "BuildID=".$ct[5].$ct[4].$ct[3]."\n";
-print APP "Copyright=Copyright (c) ".$ct[5]." DKS sarl\n";
-print APP "ID=creorga.".$setup."\@dks.lu\n";
-print APP "Profile=Creorga\n\n";
-print APP "[Gecko]\n";
-print APP "MinVersion=38.0.6\n";
-print APP "MaxVersion=38.0.6\n";
-close(APP);
-
-make_path("$releasepath\\dist\\Tools");
-chdir("$releasepath\\tag\\Tools");
-system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "$releasepath\\dist\\Tools\\ovpn.exe" ovpn.pl');
-if (($setup eq "director")){
+  make_path("$releasepath\\dist\\Tools");
+  chdir("$releasepath\\tag\\Tools");
+  system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "'.$releasepath.'\\dist\\Tools\\ovpn.exe" ovpn.pl');
+#if (($setup eq "director")){
 
   copy("C:\\Debug\\Creorga\\Tools\\pdftotext.exe","$releasepath\\dist\\Tools\\pdftotext.exe");
   #chdir("$releasepath\\tag\\tools\\perl");
@@ -174,29 +195,31 @@ if (($setup eq "director")){
 #  unlink("$releasepath\\tag\\app_v3\\Tools\\vpncfg.txt");
   #compile executeables
   chdir("$releasepath\\tag\\Tools");
-  system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "$releasepath\\dist\\Tools\\creorgadb.exe" creorgadb.pl');
-  system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "$releasepath\\dist\\Tools\\pdfextract.exe"  --module="XML::Simple" --compress 6 pdfextract.pl');
+  system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "'.$releasepath.'\\dist\\Tools\\creorgadb.exe" creorgadb.pl');
+  system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "'.$releasepath.'\\dist\\Tools\\pdfextract.exe"  --module="XML::Simple" --compress 6 pdfextract.pl');
   
-}
+#}
 
 
 print "Release compiled!\n";
 chdir("$releasepath");
 
-system('"C:\\Program Files (x86)\\Inno Setup 5\\ISCC.exe" /dMyAppVersion='.$tag.' "$reppath\\install\\windows\\creorga_setup_'.$setup.'.iss"');
-if (-e "$releasepath\\Setup_Creorga_".$tag."_".$setup.".exe"){
+system('"C:\\Program Files (x86)\\Inno Setup 5\\ISCC.exe" /dMyAppVersion='.$tag.' "'.$reppath.'\\install\\windows\\creorga_setup.iss"');
+if (-e "$releasepath\\Setup_Creorga_".$tag.".exe"){
        print "Setup created\n";        
-       copy("$releasepath\\Setup_Creorga_".$tag."_".$setup.".exe","$setuppath\\Setup_Creorga_".$tag."_".$setup.".exe");
+       copy("$releasepath\\Setup_Creorga_".$tag.".exe","$setuppath\\Setup_Creorga_".$tag.".exe");
        print "copied to $setuppath\n";
 } else {
        print "FAILED to create Setup!!\n";
 }
-system('"C:\\Program Files (x86)\\Inno Setup 5\\ISCC.exe" /dMyAppVersion='.$tag.' "$reppath\\install\\windows\\creorga_update_'.$setup.'.iss"');
-if (-e "$releasepath\\Update_Creorga_".$tag."_".$setup.".exe"){
+for my $vv (@x){
+system('"C:\\Program Files (x86)\\Inno Setup 5\\ISCC.exe" /dMyAppVersion='.$tag.' "'.$reppath.'\\install\\windows\\creorga_update_'.$vv.'.iss"');
+if (-e "$releasepath\\Update_Creorga_".$tag."_".$vv.".exe"){
        print "Setup created\n";        
-       copy("$releasepath\\Update_Creorga_".$tag."_".$setup.".exe","$setuppath\\Update_Creorga_".$tag."_".$setup.".exe");
+       copy("$releasepath\\Update_Creorga_".$tag."_".$vv.".exe","$setuppath\\Update_Creorga_".$tag."_".$vv.".exe");
        print "copied to $setuppath\n";
 } else {
        print "FAILED to create Setup!!\n";
 }
+}
 print "normal END!\n";

diff --git a/install/windows/creorga_setup_director.iss b/install/windows/creorga_setup_director.iss
deleted file mode 100644 (file)
index a8d4657..0000000
--- a/install/windows/creorga_setup_director.iss
+++ /dev/null
@@ -1,105 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "Creorga"
-#define MyAppPublisher "DKS s.� r.l."
-#define MyAppURL "http://www.dks.lu/products/creorga.html"
-#define MyAppExeName "Creorga.exe"
-
-;#define VCmsg "Installation de Microsoft Visual C++ Redistributable...."
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{31A01E9B-0999-4A24-8C69-B10F526961C7}
-AppName={#MyAppName} Director
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DisableDirPage=yes
-DefaultGroupName={#MyAppName}
-LicenseFile=C:\Users\ksaff\Release\tag\License.txt
-OutputDir=C:\Users\ksaff\Release
-OutputBaseFilename=Setup_{#MyAppName}_{#MyAppVersion}_director
-SetupIconFile=C:\Users\ksaff\Release\tag\app_v3\chrome\icons\default\winmain.ico
-Compression=lzma
-SolidCompression=yes
-WizardImageFile=wizcreorga.bmp
-WizardSmallImageFile=wizcreorgasmall.bmp
-
-;CloseApplications=force
-
-[Languages]
-Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Dirs]
-Name: "{app}"; Permissions: users-modify
-Name: "{app}\Tools"; Permissions: users-modify
-Name: "{app}\defaults"; Permissions: users-modify
-[Files]
-Source: "C:\Users\ksaff\Release\dist\Creorga.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\Tools\*"; DestDir: "{app}\Tools"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\xulrunner\*"; DestDir: "{app}\xulrunner"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\application.ini"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\chrome.manifest"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\creorga.jar"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\defaults\*"; DestDir: "{app}\defaults"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-;Source: "C:\Users\ksaff\Release\dist\checkschema.txt"; DestDir: "{userappdata}\Creorga\Profiles"; Flags: overwritereadonly ignoreversion 
-;Source: "C:\Users\ksaff\Release\dist\vcredist_x86.exe"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-
-[Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-;Filename: "{app}\Tools\vcredist_x86.exe"; Parameters:"/q /passive /verysilent /norestart /q:a /c:""msiexec /i vcredist.msi /qn""" ;Check: VCRedistNeedsInstall; WorkingDir: {app}\Tools; StatusMsg: Installation Microsoft Visual C++ Redistributable ...;
-;Filename: {tmp}\vcredist_x86.exe; Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"" "; 
-;Filename: "{app}\bin\vcredist_x86.exe"; Parameters: "/q /norestart /q:a /c:""VCREDI~3.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Check: VCRedistNeedsInstall; WorkingDir: {app}\bin;
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
-;[Code]
-;#IFDEF UNICODE
-;  #DEFINE AW "W"
-;#ELSE
-;  #DEFINE AW "A"
-;#ENDIF
-;type
-;    INSTALLSTATE = Longint;
-;const
-;    INSTALLSTATE_INVALIDARG = -2;  // An invalid parameter was passed to the function.
-;    INSTALLSTATE_UNKNOWN = -1;     // The product is neither advertised or installed.
-;    INSTALLSTATE_ADVERTISED = 1;   // The product is advertised but not installed.
-;    INSTALLSTATE_ABSENT = 2;       // The product is installed for a different user.
-;    INSTALLSTATE_DEFAULT = 5;      // The product is installed for the current user.
-
-;// Visual C++ 2015 Redistributable 14.0.23026
-;  VC_2015_REDIST_X86_MIN = '{A2563E55-3BEC-3828-8D67-E5E8B9E8B675}';
-;  VC_2015_REDIST_X64_MIN = '{0D3E9E15-DE7A-300B-96F1-B4AF12B96488}';
-
-;  VC_2015_REDIST_X86_ADD = '{BE960C1C-7BAD-3DE6-8B1A-2616FE532845}';
-;  VC_2015_REDIST_X64_ADD = '{BC958BD2-5DAC-3862-BB1A-C1BE0790438D}';
-
-;function MsiQueryProductState(szProduct: string): INSTALLSTATE;
-;    external 'MsiQueryProductState{#AW}@msi.dll stdcall';
-
-;function VCVersionInstalled(const ProductID: string): Boolean;
-;begin
-;    Result := MsiQueryProductState(ProductID) = INSTALLSTATE_DEFAULT;
-;end;
-
-;function VCRedistNeedsInstall: Boolean;
-;begin
-;    Result := not (VCVersionInstalled(VC_2015_REDIST_X86_MIN) or VCVersionInstalled(VC_2015_REDIST_X86_ADD));
-;end;

diff --git a/install/windows/creorga_setup_localmanager.iss b/install/windows/creorga_setup_localmanager.iss
deleted file mode 100644 (file)
index b8b991b..0000000
--- a/install/windows/creorga_setup_localmanager.iss
+++ /dev/null
@@ -1,97 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "Creorga"
-#define MyAppPublisher "DKS s.� r.l."
-#define MyAppURL "http://www.dks.lu/products/creorga.html"
-#define MyAppExeName "Creorga.exe"
-;#define VCmsg "Installation de Microsoft Visual C++ Redistributable...."
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{31A01E9B-0999-4A24-8C69-B10F526961C7}
-AppName={#MyAppName} LocalManager
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DisableDirPage=yes
-DefaultGroupName={#MyAppName}
-LicenseFile=C:\Users\ksaff\Release\tag\License.txt
-OutputDir=C:\Users\ksaff\Release
-OutputBaseFilename=Setup_{#MyAppName}_{#MyAppVersion}_localmanager
-SetupIconFile=C:\Users\ksaff\Release\tag\app_v3\chrome\icons\default\winmain.ico
-Compression=lzma
-SolidCompression=yes
-WizardImageFile=wizcreorga.bmp
-WizardSmallImageFile=wizcreorgasmall.bmp
-;CloseApplications=force
-
-[Languages]
-Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "C:\Users\ksaff\Release\dist\Creorga.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\Tools\*"; DestDir: "{app}\Tools"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\xulrunner\*"; DestDir: "{app}\xulrunner"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\application.ini"; DestDir: "{app}"; Permissions: users-modify; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\chrome.manifest"; DestDir: "{app}"; Permissions: users-modify; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\creorga.jar"; DestDir: "{app}"; Permissions: users-modify; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\defaults\*"; DestDir: "{app}\defaults"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-;Source: "C:\Users\ksaff\Release\dist\vcredist_x86.exe"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-;Filename: "{app}\Tools\vcredist_x86.exe"; Parameters:"/q /passive /verysilent /norestart /q:a /c:""msiexec /i vcredist.msi /qn""" ;Check: VCRedistNeedsInstall; WorkingDir: {app}\Tools; StatusMsg: Installation Microsoft Visual C++ Redistributable ...;
-;Filename: {tmp}\vcredist_x86.exe; Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"" "; 
-;Filename: "{app}\bin\vcredist_x86.exe"; Parameters: "/q /norestart /q:a /c:""VCREDI~3.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Check: VCRedistNeedsInstall; WorkingDir: {app}\bin;
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
-;[Code]
-;#IFDEF UNICODE
-;  #DEFINE AW "W"
-;#ELSE
-;  #DEFINE AW "A"
-;#ENDIF
-;type
-;    INSTALLSTATE = Longint;
-;const
-;    INSTALLSTATE_INVALIDARG = -2;  // An invalid parameter was passed to the function.
-;    INSTALLSTATE_UNKNOWN = -1;     // The product is neither advertised or installed.
-;    INSTALLSTATE_ADVERTISED = 1;   // The product is advertised but not installed.
-;    INSTALLSTATE_ABSENT = 2;       // The product is installed for a different user.
-;    INSTALLSTATE_DEFAULT = 5;      // The product is installed for the current user.
-
-;// Visual C++ 2015 Redistributable 14.0.23026
-;  VC_2015_REDIST_X86_MIN = '{A2563E55-3BEC-3828-8D67-E5E8B9E8B675}';
-;  VC_2015_REDIST_X64_MIN = '{0D3E9E15-DE7A-300B-96F1-B4AF12B96488}';
-
-;  VC_2015_REDIST_X86_ADD = '{BE960C1C-7BAD-3DE6-8B1A-2616FE532845}';
-;  VC_2015_REDIST_X64_ADD = '{BC958BD2-5DAC-3862-BB1A-C1BE0790438D}';
-
-;function MsiQueryProductState(szProduct: string): INSTALLSTATE;
-;    external 'MsiQueryProductState{#AW}@msi.dll stdcall';
-
-;function VCVersionInstalled(const ProductID: string): Boolean;
-;begin
-;    Result := MsiQueryProductState(ProductID) = INSTALLSTATE_DEFAULT;
-;end;
-
-;function VCRedistNeedsInstall: Boolean;
-;begin
-;    Result := not (VCVersionInstalled(VC_2015_REDIST_X86_MIN) or VCVersionInstalled(VC_2015_REDIST_X86_ADD));
-;end;

diff --git a/install/windows/creorga_setup_staff.iss b/install/windows/creorga_setup_staff.iss
deleted file mode 100644 (file)
index a2055bb..0000000
--- a/install/windows/creorga_setup_staff.iss
+++ /dev/null
@@ -1,97 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "Creorga"
-#define MyAppPublisher "DKS s.� r.l."
-#define MyAppURL "http://www.dks.lu/products/creorga.html"
-#define MyAppExeName "Creorga.exe"
-;#define VCmsg "Installation de Microsoft Visual C++ Redistributable...."
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{31A01E9B-0999-4A24-8C69-B10F526961C7}
-AppName={#MyAppName} Staff
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DisableDirPage=yes
-DefaultGroupName={#MyAppName}
-LicenseFile=C:\Users\ksaff\Release\tag\License.txt
-OutputDir=C:\Users\ksaff\Release
-OutputBaseFilename=Setup_{#MyAppName}_{#MyAppVersion}_staff
-SetupIconFile=C:\Users\ksaff\Release\tag\app_v3\chrome\icons\default\winmain.ico
-Compression=lzma
-SolidCompression=yes
-WizardImageFile=wizcreorga.bmp
-WizardSmallImageFile=wizcreorgasmall.bmp
-;CloseApplications=force
-
-[Languages]
-Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "C:\Users\ksaff\Release\dist\Creorga.exe"; DestDir: "{app}"; Permissions: users-modify; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\Tools\*"; DestDir: "{app}\Tools"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\xulrunner\*"; DestDir: "{app}\xulrunner"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\application.ini"; DestDir: "{app}"; Permissions: users-modify; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\chrome.manifest"; DestDir: "{app}"; Permissions: users-modify; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\creorga.jar"; DestDir: "{app}"; Permissions: users-modify; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\defaults\*"; DestDir: "{app}\defaults"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-;Source: "C:\Users\ksaff\Release\dist\vcredist_x86.exe"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-;Filename: "{app}\Tools\vcredist_x86.exe"; Parameters:"/q /passive /verysilent /norestart /q:a /c:""msiexec /i vcredist.msi /qn""" ;Check: VCRedistNeedsInstall; WorkingDir: {app}\Tools; StatusMsg: Installation Microsoft Visual C++ Redistributable ...;
-;Filename: {tmp}\vcredist_x86.exe; Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"" "; 
-;Filename: "{app}\bin\vcredist_x86.exe"; Parameters: "/q /norestart /q:a /c:""VCREDI~3.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Check: VCRedistNeedsInstall; WorkingDir: {app}\bin;
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
-;[Code]
-;#IFDEF UNICODE
-;  #DEFINE AW "W"
-;#ELSE
-;  #DEFINE AW "A"
-;#ENDIF
-;type
-;    INSTALLSTATE = Longint;
-;const
-;    INSTALLSTATE_INVALIDARG = -2;  // An invalid parameter was passed to the function.
-;    INSTALLSTATE_UNKNOWN = -1;     // The product is neither advertised or installed.
-;    INSTALLSTATE_ADVERTISED = 1;   // The product is advertised but not installed.
-;    INSTALLSTATE_ABSENT = 2;       // The product is installed for a different user.
-;    INSTALLSTATE_DEFAULT = 5;      // The product is installed for the current user.
-
-;// Visual C++ 2015 Redistributable 14.0.23026
-;  VC_2015_REDIST_X86_MIN = '{A2563E55-3BEC-3828-8D67-E5E8B9E8B675}';
-;  VC_2015_REDIST_X64_MIN = '{0D3E9E15-DE7A-300B-96F1-B4AF12B96488}';
-
-;  VC_2015_REDIST_X86_ADD = '{BE960C1C-7BAD-3DE6-8B1A-2616FE532845}';
-;  VC_2015_REDIST_X64_ADD = '{BC958BD2-5DAC-3862-BB1A-C1BE0790438D}';
-
-;function MsiQueryProductState(szProduct: string): INSTALLSTATE;
-;    external 'MsiQueryProductState{#AW}@msi.dll stdcall';
-
-;function VCVersionInstalled(const ProductID: string): Boolean;
-;begin
-;    Result := MsiQueryProductState(ProductID) = INSTALLSTATE_DEFAULT;
-;end;
-
-;function VCRedistNeedsInstall: Boolean;
-;begin
-;    Result := not (VCVersionInstalled(VC_2015_REDIST_X86_MIN) or VCVersionInstalled(VC_2015_REDIST_X86_ADD));
-;end;

diff --git a/install/windows/creorga_update_director.iss b/install/windows/creorga_update_director.iss
index 9ffe914..532a37e 100644 (file)
--- a/install/windows/creorga_update_director.iss
+++ b/install/windows/creorga_update_director.iss
@@ -3,7 +3,7 @@
 
 #define MyAppName "Creorga"
 #define MyAppPublisher "DKS s.à r.l."
-#define MyAppURL "http://www.dks.lu/products/creorga.html"
+#define MyAppURL "http://www.dks.lu/creorga/"
 #define MyAppExeName "Creorga.exe"
 
 ;#define VCmsg "Installation de Microsoft Visual C++ Redistributable...."
@@ -60,9 +60,9 @@ Name: "{app}\defaults"; Permissions: users-modify
 ;Source: "C:\Users\ksaff\Release\dist\Creorga.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
 Source: "C:\Users\ksaff\Release\dist\Tools\*"; DestDir: "{app}\Tools"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
 ;Source: "C:\Users\ksaff\Release\dist\xulrunner\*"; DestDir: "{app}\xulrunner"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\application.ini"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\chrome.manifest"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\creorga.jar"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
+Source: "C:\Users\ksaff\Release\dist\director\application.ini"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
+Source: "C:\Users\ksaff\Release\dist\director\chrome.manifest"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
+Source: "C:\Users\ksaff\Release\dist\director\creorga.jar"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
 Source: "C:\Users\ksaff\Release\dist\defaults\*"; DestDir: "{app}\defaults"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
 ;Source: "C:\Users\ksaff\Release\dist\checkschema.txt"; DestDir: "{userappdata}\Creorga\Profiles"; Flags: overwritereadonly ignoreversion 
 ;Source: "C:\Users\ksaff\Release\dist\vcredist_x86.exe"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion

diff --git a/install/windows/creorga_update_localmanager.iss b/install/windows/creorga_update_localmanager.iss
index e5dc2d9..a37b5dd 100644 (file)
--- a/install/windows/creorga_update_localmanager.iss
+++ b/install/windows/creorga_update_localmanager.iss
@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Creorga"
-#define MyAppPublisher "DKS s.� r.l."
-#define MyAppURL "http://www.dks.lu/products/creorga.html"
+#define MyAppPublisher "DKS s.à r.l."
+#define MyAppURL "http://www.dks.lu/creorga/"
 #define MyAppExeName "Creorga.exe"
 
 ;#define VCmsg "Installation de Microsoft Visual C++ Redistributable...."
@@ -41,11 +41,11 @@ CloseApplications=force
 Uninstallable = no
 
 [Messages]
-SetupAppTitle=mise-�-jour {#MyAppName}
-SetupWindowTitle=mise-�-jour {#MyAppName} {#MyAppVersion}
-WizardReady=Installation de la mise-�-jour vers la version {#MyAppVersion}
-ReadyLabel1=L''assistant dispose � pr�sent de toutes les informations pour installer la mise-�-jour de [name] sur votre ordinateur.
-ReadyLabel2b=Cliquez sur Installer pour proc�der la mise-�-jour.
+SetupAppTitle=mise-à-jour {#MyAppName}
+SetupWindowTitle=mise-à-jour {#MyAppName} {#MyAppVersion}
+WizardReady=Installation de la mise-à-jour vers la version {#MyAppVersion}
+ReadyLabel1=L''assistant dispose à présent de toutes les informations pour installer la mise-à-jour de [name] sur votre ordinateur.
+ReadyLabel2b=Cliquez sur Installer pour procéder la mise-à-jour.
 
 [Languages]
 Name: "french"; MessagesFile: "compiler:Languages\French.isl"
@@ -60,9 +60,9 @@ Name: "{app}\defaults"; Permissions: users-modify
 ;Source: "C:\Users\ksaff\Release\dist\Creorga.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
 Source: "C:\Users\ksaff\Release\dist\Tools\*"; DestDir: "{app}\Tools"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
 ;Source: "C:\Users\ksaff\Release\dist\xulrunner\*"; DestDir: "{app}\xulrunner"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\application.ini"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\chrome.manifest"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\creorga.jar"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
+Source: "C:\Users\ksaff\Release\dist\localmanager\application.ini"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
+Source: "C:\Users\ksaff\Release\dist\localmanager\chrome.manifest"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
+Source: "C:\Users\ksaff\Release\dist\localmanager\creorga.jar"; DestDir: "{app}"; Permissions: users-full; Flags: overwritereadonly ignoreversion
 Source: "C:\Users\ksaff\Release\dist\defaults\*"; DestDir: "{app}\defaults"; Permissions: users-modify; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
 ;Source: "C:\Users\ksaff\Release\dist\checkschema.txt"; DestDir: "{userappdata}\Creorga\Profiles"; Flags: overwritereadonly ignoreversion 
 ;Source: "C:\Users\ksaff\Release\dist\vcredist_x86.exe"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion

diff --git a/install/windows/creorga_update_staff.iss b/install/windows/creorga_update_staff.iss
index 51afd7d..fc48c38 100644 (file)
--- a/install/windows/creorga_update_staff.iss
+++ b/install/windows/creorga_update_staff.iss
@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Creorga"
-#define MyAppPublisher "DKS s.� r.l."
-#define MyAppURL "http://www.dks.lu/products/creorga.html"
+#define MyAppPublisher "DKS s.à r.l."
+#define MyAppURL "http://www.dks.lu/creorga/"
 #define MyAppExeName "Creorga.exe"
 
 ;#define VCmsg "Installation de Microsoft Visual C++ Redistributable...."
@@ -41,11 +41,11 @@ CloseApplications=force
 Uninstallable = no
 
 [Messages]
-SetupAppTitle=mise-�-jour {#MyAppName}
-SetupWindowTitle=mise-�-jour {#MyAppName} {#MyAppVersion}
-WizardReady=Installation de la mise-�-jour vers la version {#MyAppVersion}
-ReadyLabel1=L''assistant dispose � pr�sent de toutes les informations pour installer la mise-�-jour de [name] sur votre ordinateur.
-ReadyLabel2b=Cliquez sur Installer pour proc�der la mise-�-jour.
+SetupAppTitle=mise-à-jour {#MyAppName}
+SetupWindowTitle=mise-à-jour {#MyAppName} {#MyAppVersion}
+WizardReady=Installation de la mise-à-jour vers la version {#MyAppVersion}
+ReadyLabel1=L''assistant dispose à présent de toutes les informations pour installer la mise-à-jour de [name] sur votre ordinateur.
+ReadyLabel2b=Cliquez sur Installer pour procéder la mise-à-jour.
 
 [Languages]
 Name: "french"; MessagesFile: "compiler:Languages\French.isl"