[prev in list] [next in list] [prev in thread] [next in thread] 

List:       nsis-commits
Subject:    [NSIS-commits] SF.net SVN: nsis:[6864]
From:       anders_k () users ! sourceforge ! net
Date:       2017-06-03 2:56:46
Message-ID: 1496458606.816546.4243 () sfp-scm-1 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 6864
          http://sourceforge.net/p/nsis/code/6864
Author:   anders_k
Date:     2017-06-03 02:56:46 +0000 (Sat, 03 Jun 2017)
Log Message:
-----------
TravisCI OSX instance needs cppunit v1.13.2

Modified Paths:
--------------
    NSIS/trunk/.travis.yml
    NSIS/trunk/Source/makenssi.cpp
    NSIS/trunk/Source/script.cpp
    NSIS/trunk/Source/utf.cpp

Added Paths:
-----------
    web-scripts/trunk/cppunit.rb

Modified: NSIS/trunk/.travis.yml
===================================================================
--- NSIS/trunk/.travis.yml	2017-05-29 16:25:18 UTC (rev 6863)
+++ NSIS/trunk/.travis.yml	2017-06-03 02:56:46 UTC (rev 6864)
@@ -7,7 +7,8 @@
 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

Modified: NSIS/trunk/Source/makenssi.cpp
===================================================================
--- NSIS/trunk/Source/makenssi.cpp	2017-05-29 16:25:18 UTC (rev 6863)
+++ NSIS/trunk/Source/makenssi.cpp	2017-06-03 02:56:46 UTC (rev 6864)
@@ -705,7 +705,7 @@
   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

Modified: NSIS/trunk/Source/script.cpp
===================================================================
--- NSIS/trunk/Source/script.cpp	2017-05-29 16:25:18 UTC (rev 6863)
+++ NSIS/trunk/Source/script.cpp	2017-06-03 02:56:46 UTC (rev 6864)
@@ -3003,7 +3003,7 @@
         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);

Modified: NSIS/trunk/Source/utf.cpp
===================================================================
--- NSIS/trunk/Source/utf.cpp	2017-05-29 16:25:18 UTC (rev 6863)
+++ NSIS/trunk/Source/utf.cpp	2017-06-03 02:56:46 UTC (rev 6864)
@@ -331,11 +331,11 @@
   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++))
   {

Added: web-scripts/trunk/cppunit.rb
===================================================================
--- web-scripts/trunk/cppunit.rb	                        (rev 0)
+++ web-scripts/trunk/cppunit.rb	2017-06-03 02:56:46 UTC (rev 6864)
@@ -0,0 +1,21 @@
+# TravisCI OSX instance needs cppunit v1.13.2
+
+class Cppunit < Formula
+  desc "Unit testing framework for C++, forced version 1.13.2"
+  homepage "https://wiki.freedesktop.org/www/Software/cppunit/"
+  url "https://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz"
+  sha256 "3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f"
+
+  bottle do
+    cellar :any
+  end
+
+  def install
+    system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
+    system "make", "install"
+  end
+
+  test do
+    assert_match "Usage", shell_output("#{bin}/DllPlugInTester", 2)
+  end
+end

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
NSIS-commits mailing list
NSIS-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nsis-commits


[prev in list] [next in list] [prev in thread] [next in thread]