Win installer: updates and fixes

[features.git] / development / Win32 / packaging / installer / include / init.nsh

diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh
index b85e11593d03b677bdb1ec78b8834f489b6d173d..59370d49b4a3b1ccd1d92235009ee6ef43df70e6 100644 (file)
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -44,16 +44,6 @@ FunctionEnd
 #--------------------------------
 # visible installer sections
 
-Section "!${APP_NAME}" SecCore
- SectionIn RO
- !if ${SETUPTYPE} == BUNDLE
-  # if no TeX was found MiKTeX will be installed which requires space
-  !if $PathLaTeX == ""
-   AddSize 1020000 # size in KB
-  !endif
- !endif
-SectionEnd
-
 Section "$(SecFileAssocTitle)" SecFileAssoc
  StrCpy $CreateFileAssociations "true" 
 SectionEnd
@@ -73,8 +63,8 @@ Section /o "Afrikaans" SecDAfrikaans
 SectionEnd
 
 Section /o "العربية" SecDArabic
- StrCpy $DictCodes "ar_DZ,$DictCodes"
- AddSize 2500
+ StrCpy $DictCodes "ar_SA,$DictCodes"
+ AddSize 7304
 SectionEnd
 
 Section /o "հայերեն" SecDArmenian
@@ -99,7 +89,7 @@ SectionEnd
 
 Section /o "Brezhoneg" SecDBreton 
  StrCpy $DictCodes "br_FR,$DictCodes"
- AddSize 5510
+ AddSize 5556
 SectionEnd
 
 Section /o "български" SecDBulgarian
@@ -161,19 +151,19 @@ SectionEnd
 
 Section /o "English (AU)" SecDEnglishAU
  StrCpy $DictCodes "en_AU,$DictCodes"
- AddSize 552
+ AddSize 557
 SectionEnd
 
 Section /o "English (CA)" SecDEnglishCA
  StrCpy $DictCodes "en_CA,$DictCodes"
- AddSize 550
+ AddSize 557
 SectionEnd
 
 Section "English (GB)" SecDEnglishGB
  # already installed by default
  SectionIn RO
  #StrCpy $DictCodes "en_GB,$DictCodes"
- AddSize 742
+ AddSize 1044
 SectionEnd
 
 Section /o "English (NZ)" SecDEnglishNZ
@@ -185,7 +175,7 @@ Section "English (US)" SecDEnglishUS
  # already installed by default
  SectionIn RO
  #StrCpy $DictCodes "en_US,$DictCodes"
- AddSize 548
+ AddSize 551
 SectionEnd
 
 Section "Español (ES)" SecDSpanishES
@@ -244,6 +234,11 @@ Section /o "Galego" SecDGalician
  AddSize 3911
 SectionEnd
 
+Section /o "ქართული ენა" SecDGeorgian
+ StrCpy $DictCodes "ka_GE,$DictCodes"
+ AddSize 3952
+SectionEnd
+
 Section /o "עִברִית" SecDHebrew
  StrCpy $DictCodes "he_IL,$DictCodes"
  AddSize 3120
@@ -364,9 +359,9 @@ Section /o "Serbšcina (Horno)" SecDSorbianH
  AddSize 740
 SectionEnd
 
-Section /o "Shqipe" SecDAlbanian
+Section /o "Shqip" SecDAlbanian
  StrCpy $DictCodes "sq_AL,$DictCodes"
- AddSize 2400
+ AddSize 2612
 SectionEnd
 
 Section /o "Slovenšcina" SecDSlovenian
@@ -416,7 +411,7 @@ SectionEnd
 
 Section /o "Türkmençe" SecDTurkmen
  StrCpy $DictCodes "tk_TM,$DictCodes"
- AddSize 950
+ AddSize 2797
 SectionEnd
 
 Section /o "Türkçe" SecDTurkish
@@ -426,7 +421,7 @@ SectionEnd
 
 Section /o "Українська" SecDUkrainian
  StrCpy $DictCodes "uk_UA,$DictCodes"
- AddSize 5555
+ AddSize 6905
 SectionEnd
 
 Section /o "اردو" SecDUrdu
@@ -444,6 +439,11 @@ SectionGroupEnd
 
 SectionGroup "$(SecThesaurus)" SecThesaurus
 
+Section /o "العربية" SecTArabic
+ StrCpy $ThesCodes "ar_SA,$ThesCodes"
+ AddSize 799
+SectionEnd
+
 Section /o "български" SecTBulgarian
  StrCpy $ThesCodes "bg_BG,$ThesCodes"
  AddSize 3020
@@ -583,7 +583,6 @@ SectionGroupEnd
 
 # Section descriptions
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-!insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "$(SecCoreDescription)"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecFileAssoc} "$(SecFileAssocDescription)"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} "$(SecDesktopDescription)"
 !insertmacro MUI_DESCRIPTION_TEXT ${SecDictionaries} "$(SecDictionariesDescription)"
@@ -599,38 +598,13 @@ Function .onInit
   ${if} $R0 == "5.0" # 2000
   ${orif} $R0 == "5.1" # XP
   ${orif} $R0 == "5.2" # 2003
-    MessageBox MB_OK|MB_ICONSTOP "${APP_NAME} ${APP_VERSION} requires Windows Vista or newer." /SD IDOK
+  ${orif} $R0 == "6.0" # Vista
+    MessageBox MB_OK|MB_ICONSTOP "${APP_NAME} ${APP_VERSION} requires Windows 7 or newer." /SD IDOK
     Quit
   ${endif}
   
-  # Fixme: the Unicode version of FindProcDLL::FindProc
-  # reports always that it is already running
-  # check that the installer is not currently running
-  #FindProcDLL::FindProc "${BundleExeFile}"
-  #${if} $R0 == "1"
-  # MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
-  # Abort
-  #${endif}
-  #FindProcDLL::FindProc "${ExeFile}"
-  #${if} $R0 == "1"
-  # MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
-  # Abort
-  #${endif}
-  #System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${BundleExeFile}.Instance") i .r1 ?e'
-  #Pop $R0
-  #${if} $R0 != "0"
-  # MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
-  # Abort
-  #${endif}
-  #System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${ExeFile}.Instance") i .r1 ?e'
-  #Pop $R0
-  #${if} $R0 != "0"
-  # MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
-  # Abort
-  #${endif}
-  
   # Check that LyX is not currently running
-  FindProcDLL::FindProc "lyx.exe"
+  FindProcDLL::FindProc "${BIN_LYX}"
   ${if} $R0 == "1"
    MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)" /SD IDOK
    Abort
@@ -660,7 +634,7 @@ Function .onInit
    # because he won't have a chance to deny this
    StrCpy $4 $0 -10 # remove '\bin\lyx,0'
    # (for FileCheck the variables $0 and $1 cannot be used)
-   !insertmacro FileCheck $5 "Uninstall-LyX.exe" "$4" # macro from LyXUtils.nsh
+   !insertmacro FileCheck $5 "Uninstall-${APP_NAME}.exe" "$4" # macro from LyXUtils.nsh
    ${if} $5 == "False"
     Goto ForceInstallation
    ${endif}
@@ -718,13 +692,6 @@ Function .onInit
  
   Call SearchExternal
   
-  #!if ${SETUPTYPE} == BUNDLE
-  # # don't let the installer sections appear when the programs are already installed
-  # ${if} $PathBibTeXEditor != ""
-  #  SectionSetText 3 "" # hides the corresponding uninstaller section, ${SecInstJabRef}
-  # ${endif}
-  #!endif
-  
   # select sections of already installed spell-checker dictionaries, make them read-only
   # and set the necessary size to 0 bytes
   StrCpy $String $FoundDict
@@ -735,7 +702,7 @@ Function .onInit
    SectionSetFlags ${SecDAfrikaans} $0
    SectionSetSize ${SecDAfrikaans} 0
   ${endif}
-  StrCpy $Search "ar_DZ"
+  StrCpy $Search "ar_SA"
   Call StrPoint
   ${if} $Pointer != "-1"
    IntOp $0 ${SF_SELECTED} | ${SF_RO}
@@ -960,6 +927,13 @@ Function .onInit
    SectionSetFlags ${SecDGalician} $0
    SectionSetSize ${SecDGalician} 0
   ${endif}
+  StrCpy $Search "ka_GE"
+  Call StrPoint
+  ${if} $Pointer != "-1"
+   IntOp $0 ${SF_SELECTED} | ${SF_RO}
+   SectionSetFlags ${SecDGeorgian} $0
+   SectionSetSize ${SecDGeorgian} 0
+  ${endif}
   StrCpy $Search "he_IL"
   Call StrPoint
   ${if} $Pointer != "-1"
@@ -1237,8 +1211,15 @@ Function .onInit
   # select sections of already installed thesaurus dictionaries, make them read-only
   # and set the necessary size to 0 bytes
   StrCpy $String $FoundThes
-  StrCpy $Search "bg_BG"
+  StrCpy $Search "ar_SA"
   Call StrPoint # function from LyXUtils.nsh
+  ${if} $Pointer != "-1"
+   IntOp $0 ${SF_SELECTED} | ${SF_RO}
+   SectionSetFlags ${SecTArabic} $0
+   SectionSetSize ${SecTArabic} 0
+  ${endif}
+  StrCpy $Search "bg_BG"
+  Call StrPoint
   ${if} $Pointer != "-1"
    IntOp $0 ${SF_SELECTED} | ${SF_RO}
    SectionSetFlags ${SecTBulgarian} $0
@@ -1439,7 +1420,7 @@ Function un.onInit
   !insertmacro MULTIUSER_UNINIT
 
   # Check that LyX is not currently running
-  FindProcDLL::FindProc "lyx.exe"
+  FindProcDLL::FindProc "${BIN_LYX}"
   ${if} $R0 == "1"
    MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)" /SD IDOK
    Abort