Changeset 7517

Timestamp:

11/27/06 12:19:23 (5 years ago)

Author:

sam

Message:

Mise à jour installeur SCapp => 3.3

Location:

trunk/Bui_scKit/resources/win/packaging

Files:

• setup.exe (modified) (previous)
• src/locales/lang_en.nsh (modified) (1 diff)
• src/locales/lang_fr.nsh (modified) (1 diff)
• src/scAppInstaller.nsi (modified) (5 diffs)

trunk/Bui_scKit/resources/win/packaging/src/locales/lang_en.nsh

@@ -41 +41 @@
 ; Language strings
 LangString strWelcomeText         ${LANG_ENGLISH} "Welcome to the $(^NameDA) Setup Wizard"
-LangString strAppExists           ${LANG_ENGLISH} "$vProductName is already installed on your computer.$\nThe existing verstion will now be uninstalled before proceeding."
+LangString strAppInstReplacePrev  ${LANG_ENGLISH} "$vProductName is already installed on your computer.$\n$\nDo you want to upgrade the existing version?"
+LangString strAppInstUninstPrev   ${LANG_ENGLISH} "$vProductName is already installed on your computer.$\n$\nThe existing version nust now be uninstalled, do you want to proceed?"
 LangString strNoOo                ${LANG_ENGLISH} "The installer cannot find OpenOffice on this system.$\nCertain features of $(^Name) may be affected.$\n$\nIt is therefore advisable to install OpenOffice (www.openoffice.org)."
 LangString strUninstallReboot     ${LANG_ENGLISH} "In order to finish the uninstall process it is necessary to reboot the computer.$\n$\nDo you want to reboot now?"

trunk/Bui_scKit/resources/win/packaging/src/locales/lang_fr.nsh

@@ -41 +41 @@
 ; Language strings
 LangString strWelcomeText         ${LANG_FRENCH} "Bienvenue dans l'installeur de $(^NameDA)"
-LangString strAppExists           ${LANG_FRENCH} "$vProductName est déjà installé sur votre ordinateur.$\nLa version existante sera maintenant désinstallée avant de poursuivre."
+LangString strAppInstReplacePrev  ${LANG_FRENCH} "$vProductName est déjà installé sur votre ordinateur.$\n$\nVoulez vous mettre à jour la version existante ?"
+LangString strAppInstUninstPrev   ${LANG_FRENCH} "$vProductName est déjà installé sur votre ordinateur.$\n$\nLa version existante doit maintenant être désinstallée, voulez-vous poursuivre ?"
 LangString strNoOo                ${LANG_FRENCH} "L'installeur n'a pas pu détecter OpenOffice sur cet ordinateur.$\nCertaines fonctionnalités de $(^Name) peuvent être affectées.$\n$\nIl est fortement conseillé d'installer OpenOffice (téléchargeable à partir de www.openoffice.org)."
 LangString strUninstallReboot     ${LANG_FRENCH} "Pour terminer la désinstallation du logiciel, il est nécessaire de redémarrer l'ordinateur.$\n$\nVoulez-vous redémarrer maintenant ?"

trunk/Bui_scKit/resources/win/packaging/src/scAppInstaller.nsi

@@ -58 +58 @@
 
 !define LAUNCHER_LIBS "..\..\..\..\..\Bui_Core\resources\launcher\win\libs"
-!define INSTALLER_VERSION_NUM "3.0.0.0"
-!define INSTALLER_COPYRIGHT "© ${YEAR} scenari-platform"
-!define INSTALLER_COMPANY "scenari-platform"
-!define INSTALLER_BRANDING "SCENARI install system v3"
 !define PRODUCT_NAME "SCENARIapp"
 !define PRODUCT_VERSION "3"
@@ -68 +64 @@
 !define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"
 !define PRODUCT_ICON_PATH "bin\scApp\chrome\icons\default\scenaricms.ico"
+!define INSTALLER_VERSION_NUM "3.0.1.0"
+!define INSTALLER_COMPANY "scenari-platform.org"
+!define INSTALLER_COPYRIGHT "© ${YEAR} ${INSTALLER_COMPANY}"
+!define INSTALLER_BRANDING "SCENARI install system v${PRODUCT_VERSION}"
 !define LIC_NAME "License.txt"
 
@@ -150 +150 @@
 VIProductVersion "${INSTALLER_VERSION_NUM}"
 
-Name "$vProductName v$vProductVersion"
+Name "$vProductName $vProductVersion"
 BrandingText "$(^Name) - ${INSTALLER_BRANDING}"
 OutFile "../${PRODUCT_INSTALLER_FILENAME}"
@@ -342 +342 @@
   StrCmp $0 "" xNoAlreadyInstalled xAlreadyInstalled ;Old install detected?
   xAlreadyInstalled:
-    StrCmp $0 $INSTDIR xSameDir xNewDir ;Old install in same folder as new install wants to use?
+    StrCmp $0 $INSTDIR 0 xNewDir ;Old install in same folder as new install wants to use?
+    MessageBox MB_ICONEXCLAMATION|MB_YESNO "$(strAppInstReplacePrev)" IDYES xSameDir 
+    Quit
     xSameDir: ;Just delete the old install folder
       DetailPrint "$(strUninstallPrevLog)"
@@ -356 +358 @@
       
     xNewDir: ;Call a full uninstall of the old install
-      MessageBox MB_ICONEXCLAMATION|MB_OKCANCEL "$(strAppExists)" IDOK xDesinstall 
+      MessageBox MB_ICONEXCLAMATION|MB_YESNO "$(strAppInstUninstPrev)" IDYES xDesinstall 
       Quit
       xDesinstall: