From a2aa3ed305cab811c865e902e4fed5c2eacb52ab Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sat, 3 Jun 2017 02:56:46 +0000
Subject: [PATCH] TravisCI OSX instance needs cppunit v1.13.2

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6864 212acab6-be3b-0410-9dea-997c60f758d6
---
 .travis.yml         | 3 ++-
 Source/makenssi.cpp | 2 +-
 Source/script.cpp   | 2 +-
 Source/utf.cpp      | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e0a74a9a..803e644e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,8 @@ os:
 before_install:
 - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo apt-get install scons mingw32 mingw32-binutils zlib1g-dev libcppunit-dev; fi
 - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then brew update; fi
-- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then brew install scons mingw-w64 zlib cppunit; fi
+- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then brew install https://sourceforge.net/p/nsis/code/HEAD/tree/web-scripts/trunk/cppunit.rb?format=raw; fi
+- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then brew install scons mingw-w64 zlib; fi
 install:
 - wget -O /tmp/zlib.zip "https://downloads.sourceforge.net/project/libpng/zlib/1.2.8/zlib128-dll.zip?r=&ts=1403402496&use_mirror=hivelocity"
 - mkdir /tmp/zlib
diff --git a/Source/makenssi.cpp b/Source/makenssi.cpp
index d7ee74c3..c95e9a06 100644
--- a/Source/makenssi.cpp
+++ b/Source/makenssi.cpp
@@ -705,7 +705,7 @@ int main(int argc, char **argv)
   wchar_t term[1], *p, **wargv = (wchar_t **) malloc((argc+1) * sizeof(void*));
   if (wargv) 
     for ( ; wargc < argc; ++wargc )
-      if ((p = NSISRT_mbtowc(argv[wargc]))) wargv[wargc] = p; else break;
+      if ((p = NSISRT_mbtowc(argv[wargc]))) { wargv[wargc] = p; } else { break; }
   if (wargc == argc)
     *term = L'\0', wargv[wargc] = term, errno = _tmain(wargc,wargv);
   else
diff --git a/Source/script.cpp b/Source/script.cpp
index 42e480e1..5aaa8b07 100644
--- a/Source/script.cpp
+++ b/Source/script.cpp
@@ -3003,7 +3003,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
         int a=line.gettoken_enum(to+4,_T("SW_SHOWDEFAULT\0SW_SHOWNORMAL\0SW_SHOWMAXIMIZED\0SW_SHOWMINIMIZED\0SW_HIDE\0SW_SHOW\0SW_SHOWNA\0SW_SHOWMINNOACTIVE\0"));
         if (a >= 0) ent.offsets[3]=tab[a]; else PRINTHELP()
       }
-      tstring detail=tstring(verb)+(_T(" ")+!*verb)+tstring(file);
+      tstring detail=tstring(verb)+(_T(" ")[!*verb])+tstring(file);
       ent.offsets[5]=add_string(detail.c_str());
       SCRIPT_MSG(_T("%") NPRIs _T(": %") NPRIs _T(": \"%") NPRIs _T("\" \"%") NPRIs _T("\" %") NPRIs _T("\n"),cnam,verb,file,params,line.gettoken_str(to+4));
       DefineInnerLangString(NLF_EXEC_SHELL);
diff --git a/Source/utf.cpp b/Source/utf.cpp
index f380f4cc..3bb4eba3 100644
--- a/Source/utf.cpp
+++ b/Source/utf.cpp
@@ -331,11 +331,11 @@ WORD GetEncodingFromString(const TCHAR*s, bool&BOM)
   if (!_tcsicmp(s,_T("ACP"))) return NStreamEncoding::ACP;
   if (!_tcsicmp(s,_T("OEM"))) return NStreamEncoding::OEMCP;
   if (!_tcsicmp(s,_T("UTF8"))) return NStreamEncoding::UTF8;
-  if ((!_tcsicmp(s,_T("UTF8SIG")) || !_tcsicmp(s,_T("UTF8BOM"))) && ++BOM)
+  if ((!_tcsicmp(s,_T("UTF8SIG")) || !_tcsicmp(s,_T("UTF8BOM"))) && (BOM = true))
     return NStreamEncoding::UTF8;
-  if (!_tcsicmp(s,_T("UTF16LE")) || (!_tcsicmp(s,_T("UTF16LEBOM")) && ++BOM))
+  if (!_tcsicmp(s,_T("UTF16LE")) || (!_tcsicmp(s,_T("UTF16LEBOM")) && (BOM = true)))
     return NStreamEncoding::UTF16LE;
-  if (!_tcsicmp(s,_T("UTF16BE")) || (!_tcsicmp(s,_T("UTF16BEBOM")) && ++BOM))
+  if (!_tcsicmp(s,_T("UTF16BE")) || (!_tcsicmp(s,_T("UTF16BEBOM")) && (BOM = true)))
     return NStreamEncoding::UTF16BE;
   if (S7IsChEqualI('C',*s++) && S7IsChEqualI('P',*s++))
   {