[vlc-devel] [PATCH 2/4] NSIS: fix warnings

[Daniel Amm]

This fixes the following warnings (and resulting problems):

unknown variable/constant "{LANG_TRADITIONAL_CHINESE}" detected, ignoring (vlc.win32.nsi:552)
unknown variable/constant "" detected, ignoring (languages\romanian.nsh:51)
unknown variable/constant "{WEERGAWE}" detected, ignoring (languages\afrikaans.nsh:51)
unknown variable/constant "{LANG_TRADITIONAL_CHINESE}" detected, ignoring (vlc.win32.nsi:1097)
label "Line219-Remove" not used
label "Bengali" not used
label "Punjabi" not used
---
 extras/package/win32/NSIS/helpers/utils.nsh       | 17 +++++++-------
 extras/package/win32/NSIS/languages/afrikaans.nsh |  2 +-
 extras/package/win32/NSIS/languages/romanian.nsh  |  2 +-
 extras/package/win32/NSIS/vlc.win32.nsi.in        | 28 +++++++++++------------
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/extras/package/win32/NSIS/helpers/utils.nsh b/extras/package/win32/NSIS/helpers/utils.nsh
index 4a6c773..07cc289 100644
--- a/extras/package/win32/NSIS/helpers/utils.nsh
+++ b/extras/package/win32/NSIS/helpers/utils.nsh
@@ -223,15 +223,14 @@ Function un.RemoveEmptyDirs
     StrCmp $1 "" "${Index}-End"
     StrCmp $1 "." "${Index}-Next"
     StrCmp $1 ".." "${Index}-Next"
-      Push $0
-      Push $1
-      Push $9
-      Push "$9$1\"
-      Call un.RemoveEmptyDirs
-      Pop $9
-      Pop $1
-      Pop $0
-    "${Index}-Remove:"
+    Push $0
+    Push $1
+    Push $9
+    Push "$9$1\"
+    Call un.RemoveEmptyDirs
+    Pop $9
+    Pop $1
+    Pop $0
     RMDir "$INSTDIR$9$1"
     "${Index}-Next:"
     FindNext $0 $1
diff --git a/extras/package/win32/NSIS/languages/afrikaans.nsh b/extras/package/win32/NSIS/languages/afrikaans.nsh
index a767af2..dbc4e34 100644
--- a/extras/package/win32/NSIS/languages/afrikaans.nsh
+++ b/extras/package/win32/NSIS/languages/afrikaans.nsh
@@ -48,7 +48,7 @@ StrCpy $Reinstall_HeadlineInstall "Kies hoe u VLC wil installeer."
 StrCpy $Reinstall_HeadlineMaintenance "Kies die onderhoudopsie om uit te voer."
 StrCpy $Reinstall_MessageOlder "’n Ouer weergawe van VLC is op u stelsel geïnstalleer. Kies die operasie wat u wil uitvoer en klik Volgende om aan te gaan."
 StrCpy $Reinstall_MessageNewer "’n Nuwer weergawe van VLC is reeds geïnstalleer. Dit word nie aanbeveel om af te gradeer na ’n ouer weergawe nie. Kies die operasie wat u wil uitvoer en klik Volgende om aan te gaan."
-StrCpy $Reinstall_MessageSame "VLC ${WEERGAWE} is reeds geïnstalleer. Kies die operasie wat u wil uitvoer en klik Volgende om aan te gaan."
+StrCpy $Reinstall_MessageSame "VLC ${VERSION} is reeds geïnstalleer. Kies die operasie wat u wil uitvoer en klik Volgende om aan te gaan."
 StrCpy $Reinstall_OptionUpgrade "Gradeer VLC op deur vorige instellings te gebruik (aanbeveel)"
 StrCpy $Reinstall_OptionDowngrade "Gradeer VLC af deur vorige instellings te gebruik (aanbeveel)"
 StrCpy $Reinstall_OptionComponents "Voeg komponente toe/Verwyder dit/Installeer dit"
diff --git a/extras/package/win32/NSIS/languages/romanian.nsh b/extras/package/win32/NSIS/languages/romanian.nsh
index 1cf1c6c..d2d709d 100644
--- a/extras/package/win32/NSIS/languages/romanian.nsh
+++ b/extras/package/win32/NSIS/languages/romanian.nsh
@@ -48,7 +48,7 @@ StrCpy $Reinstall_HeadlineInstall "Alegeți modul în care doriți să instalaț
 StrCpy $Reinstall_HeadlineMaintenance "Alegeți efectuarea opțiunii de întreținere"
 StrCpy $Reinstall_MessageOlder "O versiune mai veche a VLC este instalat pe sistem. Selectați operația pe care doriți să o efectuați și faceți clic pe Următorul pentru a continua."
 StrCpy $Reinstall_MessageNewer "O versiune mai nouă a VLC este deja instalată! Nu este recomandat să reveniți la o versiune mai veche. Selectați operația pe care doriți să o efectuați și faceți clic pe Următorul pentru a continua."
-StrCpy $Reinstall_MessageSame "VLC $ {VERSION} este deja instalat. Selectați operația pe care doriți să o efectuați și faceți clic pe Următorul pentru a continua."
+StrCpy $Reinstall_MessageSame "VLC ${VERSION} este deja instalat. Selectați operația pe care doriți să o efectuați și faceți clic pe Următorul pentru a continua."
 StrCpy $Reinstall_OptionUpgrade "Actualizare VLC folosind setările anterioare (recomandat)"
 StrCpy $Reinstall_OptionDowngrade "Revenire la versiune anterioare VLC folosind setările anterioare (recomandat)"
 StrCpy $Reinstall_OptionComponents "Adaugă/Elimină/Reinstalează componente"
diff --git a/extras/package/win32/NSIS/vlc.win32.nsi.in b/extras/package/win32/NSIS/vlc.win32.nsi.in
index 9d72ffc..4a1c9af 100644
--- a/extras/package/win32/NSIS/vlc.win32.nsi.in
+++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
@@ -549,7 +549,7 @@ UAC_Success:
 ;  StrCmp $LANGUAGE ${LANG_SCOTTISH_GAELIC} Scottish_Gaelic 0
 ;  StrCmp $LANGUAGE ${LANG_SINHALA} Sinhala 0
   StrCmp $LANGUAGE ${LANG_THAI} Thai 0
-  StrCmp $LANGUAGE ${LANG_TRADITIONAL_CHINESE} TradChinese 0
+  StrCmp $LANGUAGE ${LANG_TRADCHINESE} TradChinese 0
   StrCmp $LANGUAGE ${LANG_TURKISH} Turkish 0
   StrCmp $LANGUAGE ${LANG_UKRAINIAN} Ukrainian 0
   StrCmp $LANGUAGE ${LANG_UZBEK} Uzbek 0
@@ -602,12 +602,12 @@ UAC_Success:
   Japanese:
   !include "languages\japanese.nsh"
   Goto EndLanguageCmp
-  Bengali:
-  !include "languages\bengali.nsh"
-  Goto EndLanguageCmp
-  Punjabi:
-  !include "languages\punjabi.nsh"
-  Goto EndLanguageCmp
+;  Bengali:
+;  !include "languages\bengali.nsh"
+;  Goto EndLanguageCmp
+;  Punjabi:
+;  !include "languages\punjabi.nsh"
+;  Goto EndLanguageCmp
   Slovenian:
   !include "languages\slovenian.nsh"
   Goto EndLanguageCmp
@@ -1094,7 +1094,7 @@ UAC_Success:
 ;  StrCmp $LANGUAGE ${LANG_SCOTTISH_GAELIC} Scottish_Gaelic 0
 ;  StrCmp $LANGUAGE ${LANG_SINHALA} Sinhala 0
   StrCmp $LANGUAGE ${LANG_THAI} Thai 0
-  StrCmp $LANGUAGE ${LANG_TRADITIONAL_CHINESE} TradChinese 0
+  StrCmp $LANGUAGE ${LANG_TRADCHINESE} TradChinese 0
   StrCmp $LANGUAGE ${LANG_TURKISH} Turkish 0
   StrCmp $LANGUAGE ${LANG_UKRAINIAN} Ukrainian 0
   StrCmp $LANGUAGE ${LANG_UZBEK} Uzbek 0
@@ -1147,12 +1147,12 @@ UAC_Success:
   Japanese:
   !include "languages\japanese.nsh"
   Goto EndLanguageCmp
-  Bengali:
-  !include "languages\bengali.nsh"
-  Goto EndLanguageCmp
-  Punjabi:
-  !include "languages\punjabi.nsh"
-  Goto EndLanguageCmp
+;  Bengali:
+;  !include "languages\bengali.nsh"
+;  Goto EndLanguageCmp
+;  Punjabi:
+;  !include "languages\punjabi.nsh"
+;  Goto EndLanguageCmp
   Slovenian:
   !include "languages\slovenian.nsh"
   Goto EndLanguageCmp
-- 
2.7.0.windows.1