diff --git a/build/exe/dolibarr.nsi b/build/exe/dolibarr.nsi index 38fca1c68d0..47b03a336b3 100644 --- a/build/exe/dolibarr.nsi +++ b/build/exe/dolibarr.nsi @@ -1,9 +1,9 @@ ; dolibarr.nsi ; -!include "MUI.nsh" - - +!include "MUI.nsh" + + !define MUI_PROD "Dolibarr" ;Define your own software name here #!define MUI_VERSION_DOT "2.0" ;Define your own software version here !define MUI_PUBLISHER "Rodolphe Quiedeville, Laurent Destailleur" @@ -16,7 +16,7 @@ ;-------------------------------- ;Configuration - ;General + ;General Name "Dolibarr" OutFile "dolibarr-${MUI_VERSION_DOT}.exe" Icon "..\..\doc\images\dolibarr.ico" @@ -36,22 +36,22 @@ CompletedText 'Dolibarr ${MUI_VERSION_DOT} setup completed.' - -;-------------------------------- -;Interface Settings - - !define MUI_ABORTWARNING - -;-------------------------------- -;Language Selection Dialog Settings +;-------------------------------- +;Interface Settings + + !define MUI_ABORTWARNING + + +;-------------------------------- +;Language Selection Dialog Settings + + ;Recupere la langue choisie pour la dernière installation + !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" + !define MUI_LANGDLL_REGISTRY_KEY "Software\${MUI_PROD}" + !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" + - ;Recupere la langue choisie pour la dernière installation - !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" - !define MUI_LANGDLL_REGISTRY_KEY "Software\${MUI_PROD}" - !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" - - ;-------------------------------- ;Pages @@ -60,14 +60,14 @@ !define MUI_SPECIALBITMAP "..\..\build\exe\dolibarr_bitmap1.bmp" !define MUI_HEADERBITMAP "..\..\build\exe\dolibarr_bitmap2.bmp" - !insertmacro MUI_PAGE_WELCOME + !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE "..\..\COPYING" -; !insertmacro MUI_PAGE_COMPONENTS - !insertmacro MUI_PAGE_DIRECTORY - !insertmacro MUI_PAGE_INSTFILES - - !insertmacro MUI_UNPAGE_CONFIRM - !insertmacro MUI_UNPAGE_INSTFILES +; !insertmacro MUI_PAGE_COMPONENTS + !insertmacro MUI_PAGE_DIRECTORY + !insertmacro MUI_PAGE_INSTFILES + + !insertmacro MUI_UNPAGE_CONFIRM + !insertmacro MUI_UNPAGE_INSTFILES ;-------------------------------- @@ -77,14 +77,14 @@ !insertmacro MUI_LANGUAGE "French" -;-------------------------------- -;Reserve Files - - ;These files should be inserted before other files in the data block - ;Keep these lines before any File command - ;Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA) - - !insertmacro MUI_RESERVEFILE_LANGDLL +;-------------------------------- +;Reserve Files + + ;These files should be inserted before other files in the data block + ;Keep these lines before any File command + ;Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA) + + !insertmacro MUI_RESERVEFILE_LANGDLL ;-------------------------------- @@ -99,7 +99,7 @@ ;Description LangString Dolibarr ${LANG_ENGLISH} "Dolibarr" LangString DESC_dolibarr ${LANG_ENGLISH} "dolibarr main files" - + LangString Dolibarr ${LANG_FRENCH} "Dolibarr" LangString DESC_dolibarr ${LANG_FRENCH} "Fichiers Dolibarr" @@ -192,9 +192,11 @@ Section "Clean CVS files" CvsClean RMDir /r "$INSTDIR\htdocs\boutique\livre\CVS" RMDir /r "$INSTDIR\htdocs\boutique\newsletter\CVS" RMDir /r "$INSTDIR\htdocs\boutique\notification\CVS" + RMDir /r "$INSTDIR\htdocs\categories\CVS" RMDir /r "$INSTDIR\htdocs\comm\action\CVS" RMDir /r "$INSTDIR\htdocs\comm\action\rapport\CVS" RMDir /r "$INSTDIR\htdocs\comm\CVS" + RMDir /r "$INSTDIR\htdocs\comm\mailing\CVS" RMDir /r "$INSTDIR\htdocs\comm\propal\CVS" RMDir /r "$INSTDIR\htdocs\comm\propal\stats\CVS" RMDir /r "$INSTDIR\htdocs\comm\prospect\CVS" @@ -204,69 +206,98 @@ Section "Clean CVS files" CvsClean RMDir /r "$INSTDIR\htdocs\compta\caisse\CVS" RMDir /r "$INSTDIR\htdocs\compta\charges\CVS" RMDir /r "$INSTDIR\htdocs\compta\CVS" + RMDir /r "$INSTDIR\htdocs\compta\commande\CVS" RMDir /r "$INSTDIR\htdocs\compta\deplacement\CVS" RMDir /r "$INSTDIR\htdocs\compta\dons\CVS" RMDir /r "$INSTDIR\htdocs\compta\dons\formulaire\CVS" + RMDir /r "$INSTDIR\htdocs\compta\export\CVS" + RMDir /r "$INSTDIR\htdocs\compta\export\modules\CVS" RMDir /r "$INSTDIR\htdocs\compta\facture\CVS" RMDir /r "$INSTDIR\htdocs\compta\facture\stats\CVS" RMDir /r "$INSTDIR\htdocs\compta\paiement\CVS" + RMDir /r "$INSTDIR\htdocs\compta\param\CVS" + RMDir /r "$INSTDIR\htdocs\compta\param\comptes\CVS" RMDir /r "$INSTDIR\htdocs\compta\prelevement\CVS" RMDir /r "$INSTDIR\htdocs\compta\resultat\CVS" RMDir /r "$INSTDIR\htdocs\compta\sociales\CVS" RMDir /r "$INSTDIR\htdocs\compta\stats\CVS" RMDir /r "$INSTDIR\htdocs\compta\tva\CVS" + RMDir /r "$INSTDIR\htdocs\compta\ventilation\CVS" RMDir /r "$INSTDIR\htdocs\compta\voyage\CVS" RMDir /r "$INSTDIR\htdocs\conf\CVS" RMDir /r "$INSTDIR\htdocs\contact\CVS" RMDir /r "$INSTDIR\htdocs\contrat\CVS" RMDir /r "$INSTDIR\htdocs\CVS" RMDir /r "$INSTDIR\htdocs\domain\CVS" + RMDir /r "$INSTDIR\htdocs\dossier\CVS" + RMDir /r "$INSTDIR\htdocs\dossier\client\CVS" RMDir /r "$INSTDIR\htdocs\expedition\CVS" + RMDir /r "$INSTDIR\htdocs\expedition\mods\CVS" + RMDir /r "$INSTDIR\htdocs\expedition\mods\pdf\CVS" RMDir /r "$INSTDIR\htdocs\expedition\stats\CVS" RMDir /r "$INSTDIR\htdocs\fichinter\CVS" RMDir /r "$INSTDIR\htdocs\fourn\CVS" + RMDir /r "$INSTDIR\htdocs\fourn\commande\CVS" RMDir /r "$INSTDIR\htdocs\fourn\facture\CVS" + RMDir /r "$INSTDIR\htdocs\fourn\product\CVS" RMDir /r "$INSTDIR\htdocs\includes\boxes\CVS" RMDir /r "$INSTDIR\htdocs\includes\CVS" RMDir /r "$INSTDIR\htdocs\includes\fpdf\CVS" + RMDir /r "$INSTDIR\htdocs\includes\fpdf\code39ext\CVS" RMDir /r "$INSTDIR\htdocs\includes\fpdf\font\CVS" RMDir /r "$INSTDIR\htdocs\includes\fpdf\fpdf152\CVS" RMDir /r "$INSTDIR\htdocs\includes\fpdf\fpdf152\font\CVS" + RMDir /r "$INSTDIR\htdocs\includes\fpdf\i25\CVS" RMDir /r "$INSTDIR\htdocs\includes\magpierss\CVS" RMDir /r "$INSTDIR\htdocs\includes\magpierss\extlib\CVS" - RMDir /r "$INSTDIR\htdocs\includes\menus\barre_top\CVS" RMDir /r "$INSTDIR\htdocs\includes\menus\CVS" - RMDir /r "$INSTDIR\htdocs\includes\modules\commande\CVS" + RMDir /r "$INSTDIR\htdocs\includes\menus\barre_top\CVS" + RMDir /r "$INSTDIR\htdocs\includes\menus\barre_left\CVS" RMDir /r "$INSTDIR\htdocs\includes\modules\CVS" + RMDir /r "$INSTDIR\htdocs\includes\modules\commande\CVS" + RMDir /r "$INSTDIR\htdocs\includes\modules\expedition\CVS" RMDir /r "$INSTDIR\htdocs\includes\modules\facture\CVS" RMDir /r "$INSTDIR\htdocs\includes\modules\facture\deneb\CVS" + RMDir /r "$INSTDIR\htdocs\includes\modules\facture\janus\CVS" RMDir /r "$INSTDIR\htdocs\includes\modules\facture\jupiter\CVS" + RMDir /r "$INSTDIR\htdocs\includes\modules\facture\lune\CVS" RMDir /r "$INSTDIR\htdocs\includes\modules\facture\mars\CVS" RMDir /r "$INSTDIR\htdocs\includes\modules\facture\mercure\CVS" RMDir /r "$INSTDIR\htdocs\includes\modules\facture\neptune\CVS" RMDir /r "$INSTDIR\htdocs\includes\modules\facture\pluton\CVS" RMDir /r "$INSTDIR\htdocs\includes\modules\facture\saturne\CVS" + RMDir /r "$INSTDIR\htdocs\includes\modules\facture\uranus\CVS" RMDir /r "$INSTDIR\htdocs\includes\modules\facture\venus\CVS" RMDir /r "$INSTDIR\htdocs\includes\modules\fichinter\CVS" + RMDir /r "$INSTDIR\htdocs\includes\modules\mailings\CVS" RMDir /r "$INSTDIR\htdocs\includes\modules\propale\CVS" RMDir /r "$INSTDIR\htdocs\includes\modules\rapport\CVS" + RMDir /r "$INSTDIR\htdocs\includes\modules\societe\CVS" RMDir /r "$INSTDIR\htdocs\includes\pear\Auth\Container\CVS" RMDir /r "$INSTDIR\htdocs\includes\pear\Auth\CVS" RMDir /r "$INSTDIR\htdocs\includes\pear\CVS" RMDir /r "$INSTDIR\htdocs\includes\pear\DB\CVS" RMDir /r "$INSTDIR\htdocs\includes\phplot\CVS" RMDir /r "$INSTDIR\htdocs\includes\php_writeexcel\CVS" + RMDir /r "$INSTDIR\htdocs\includes\triggers\CVS" RMDir /r "$INSTDIR\htdocs\install\CVS" RMDir /r "$INSTDIR\htdocs\install\doc\CVS" RMDir /r "$INSTDIR\htdocs\langs\CVS" RMDir /r "$INSTDIR\htdocs\langs\en_US\CVS" + RMDir /r "$INSTDIR\htdocs\langs\en_US\html\CVS" RMDir /r "$INSTDIR\htdocs\langs\fr_BE\CVS" + RMDir /r "$INSTDIR\htdocs\langs\fr_BE\html\CVS" RMDir /r "$INSTDIR\htdocs\langs\fr_FR\CVS" + RMDir /r "$INSTDIR\htdocs\langs\fr_FR\html\CVS" RMDir /r "$INSTDIR\htdocs\langs\nl_BE\CVS" + RMDir /r "$INSTDIR\htdocs\langs\nl_BE\html\CVS" + RMDir /r "$INSTDIR\htdocs\langs\pt_PT\CVS" + RMDir /r "$INSTDIR\htdocs\langs\pt_PT\html\CVS" RMDir /r "$INSTDIR\htdocs\lib\CVS" RMDir /r "$INSTDIR\htdocs\lib\jabber\CVS" RMDir /r "$INSTDIR\htdocs\lib\vcard\CVS" RMDir /r "$INSTDIR\htdocs\lolix\CVS" + RMDir /r "$INSTDIR\htdocs\lolix\cv\CVS" RMDir /r "$INSTDIR\htdocs\lolix\societe\CVS" RMDir /r "$INSTDIR\htdocs\postnuke\articles\CVS" RMDir /r "$INSTDIR\htdocs\postnuke\CVS" @@ -286,6 +317,37 @@ Section "Clean CVS files" CvsClean RMDir /r "$INSTDIR\htdocs\rapport\CVS" RMDir /r "$INSTDIR\htdocs\societe\CVS" RMDir /r "$INSTDIR\htdocs\societe\notify\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\adsl\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\ca\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\client\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\config\concurrents\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\config\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\contrat\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\distributeurs\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\facture\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\fournisseur\commande\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\fournisseur\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\ligne\commande\retour\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\ligne\commande\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\ligne\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\pdf\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\script\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\service\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\sql\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\stats\clients\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\stats\commerciaux\groupes\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\stats\commerciaux\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\stats\communications\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\stats\contrats\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\stats\destinations\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\stats\distributeurs\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\stats\factures\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\stats\fournisseurs\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\stats\graph\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\stats\lignes\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\stats\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\tarifs\CVS" + RMDir /r "$INSTDIR\htdocs\telephonie\CVS" RMDir /r "$INSTDIR\htdocs\theme\CVS" RMDir /r "$INSTDIR\htdocs\theme\dev\CVS" RMDir /r "$INSTDIR\htdocs\theme\dev\img\CVS" @@ -298,6 +360,9 @@ Section "Clean CVS files" CvsClean RMDir /r "$INSTDIR\htdocs\theme\yellow\CVS" RMDir /r "$INSTDIR\htdocs\theme\yellow\img\CVS" RMDir /r "$INSTDIR\htdocs\user\CVS" + RMDir /r "$INSTDIR\htdocs\user\admin\CVS" + RMDir /r "$INSTDIR\htdocs\user\group\CVS" + RMDir /r "$INSTDIR\htdocs\user\modules\CVS" RMDir /r "$INSTDIR\misc\CVS" RMDir /r "$INSTDIR\mysql\CVS" RMDir /r "$INSTDIR\mysql\data\CVS" @@ -306,10 +371,13 @@ Section "Clean CVS files" CvsClean RMDir /r "$INSTDIR\mysql\tables\CVS" RMDir /r "$INSTDIR\pgsql\CVS" RMDir /r "$INSTDIR\pgsql\data\CVS" + RMDir /r "$INSTDIR\pgsql\functions\CVS" RMDir /r "$INSTDIR\pgsql\tables\CVS" RMDir /r "$INSTDIR\scripts\adherents\CVS" RMDir /r "$INSTDIR\scripts\adherents\mailman\CVS" + RMDir /r "$INSTDIR\scripts\lolix\CVS" RMDir /r "$INSTDIR\scripts\CVS" + SectionEnd