[vlc-commits] NSIS: fix warnings

[Daniel Amm]

vlc | branch: master | Daniel Amm <da2424 at t-online.de> | Fri Jan 22 18:57:46 2016 +0100| [ca4c538e46e06038106d0828e97b0a6055677660] | committer: Jean-Baptiste Kempf

NSIS: fix warnings

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

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ca4c538e46e06038106d0828e97b0a6055677660
---

 extras/package/win32/NSIS/helpers/utils.nsh      |   17 +++++++------
 extras/package/win32/NSIS/languages/romanian.nsh |    2 +-
 extras/package/win32/NSIS/vlc.win32.nsi.in       |   28 +++++++++++-----------
 3 files changed, 23 insertions(+), 24 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/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 051af55..71a404f 100644
--- a/extras/package/win32/NSIS/vlc.win32.nsi.in
+++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
@@ -544,7 +544,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
@@ -592,12 +592,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
@@ -1069,7 +1069,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
@@ -1117,12 +1117,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