Merge branch 'master' into dabrow/ios-functests

maxgolov · web-flow · commit 5cdcab8a69af · 2019-10-24T19:56:43.000-07:00
diff --git a/.gitattributes b/.gitattributes
@@ -77,7 +77,7 @@ GNUmakefile             text
 *.pbxproj               -text diff -merge
 
 ## Resource files and UI design descriptions
-*.rc                    text
+*.rc                    text eol=crlf
 
 ## Diff/patch files
 *.diff                  text diff -merge
diff --git a/.github/workflows/test-win-latest.yml b/.github/workflows/test-win-latest.yml
@@ -28,4 +28,5 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GIT_PULL_TOKEN: ${{ secrets.GIT_PULL_TOKEN }}
-      run: build-tests.bat ${{ matrix.arch }} ${{ matrix.config }}
+      shell: cmd
+      run: build-tests.cmd ${{ matrix.arch }} ${{ matrix.config }}
diff --git a/RunOACR.bat b/RunOACR.bat
@@ -1,4 +1,5 @@
 @echo off
+cd %~dp0
 @setlocal ENABLEEXTENSIONS
 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat"
 
diff --git a/Solutions/VersionInfo.rc b/Solutions/VersionInfo.rc
diff --git a/build-Win32Debug.bat b/build-Win32Debug.bat
@@ -1,4 +1,5 @@
 @echo off
+cd %~dp0
 call tools\gen-version.cmd
 @setlocal ENABLEEXTENSIONS
 
diff --git a/build-Win32Release.bat b/build-Win32Release.bat
@@ -1,4 +1,5 @@
 @echo off
+cd %~dp0
 call tools\gen-version.cmd
 @setlocal ENABLEEXTENSIONS
 
diff --git a/build-all.bat b/build-all.bat
@@ -1,4 +1,5 @@
 @echo off
+cd %~dp0
 call tools\gen-version.cmd
 @setlocal ENABLEEXTENSIONS
 
diff --git a/build-cmake-clang.cmd b/build-cmake-clang.cmd
@@ -1,4 +1,5 @@
 @echo off
+cd %~dp0
 setlocal enableextensions
 setlocal enabledelayedexpansion
 set ROOT=%~dp0
diff --git a/build-docker.cmd b/build-docker.cmd
@@ -1,4 +1,5 @@
 @echo off
+cd %~dp0
 if "%~1"=="" goto help
 
 del .buildtools 2>NUL
diff --git a/build-tests.cmd b/build-tests.cmd
@@ -1,4 +1,5 @@
 @echo off
+cd %~dp0
 call tools\gen-version.cmd
 @setlocal ENABLEEXTENSIONS
 
diff --git a/build-win10-compact.bat b/build-win10-compact.bat
@@ -1,4 +1,5 @@
 @echo off
+cd %~dp0
 REM
 REM Build 'compact' Win 10 SDK for UTC mode :
 REM * exclude built-in SQLite
diff --git a/build-x64Debug.bat b/build-x64Debug.bat
@@ -1,4 +1,5 @@
 @echo off
+cd %~dp0
 call tools\gen-version.cmd
 @setlocal ENABLEEXTENSIONS
 
diff --git a/build-x64Release.bat b/build-x64Release.bat
@@ -1,4 +1,5 @@
 @echo off
+cd %~dp0
 call tools\gen-version.cmd
 @setlocal ENABLEEXTENSIONS
 
@@ -14,4 +15,4 @@ if errorLevel 1 goto end
 Solutions\out\Release\x64\UnitTests\UnitTests.exe
 if errorLevel 1 goto end
 Solutions\out\Release\x64\FuncTests\FuncTests.exe
-:end
+:end
diff --git a/lib/include/public/Version.hpp b/lib/include/public/Version.hpp
@@ -3,8 +3,8 @@
 #define MAT_VERSION_HPP
 // WARNING: DO NOT MODIFY THIS FILE!
 // This file has been automatically generated, manual changes will be lost.
-#define BUILD_VERSION_STR "3.2.253.1"
-#define BUILD_VERSION 3,2,253,1
+#define BUILD_VERSION_STR "3.2.297.1"
+#define BUILD_VERSION 3,2,297,1
 
 #ifndef RESOURCE_COMPILER_INVOKED
 #include <stdint.h>
@@ -30,7 +30,7 @@ namespace ARIASDK_NS_BEGIN {
 uint64_t const Version =
     ((uint64_t)3 << 48) |
     ((uint64_t)2 << 32) |
-    ((uint64_t)253 << 16) |
+    ((uint64_t)297 << 16) |
     ((uint64_t)1);
 
 } ARIASDK_NS_END
diff --git a/lib/pal/typename.hpp b/lib/pal/typename.hpp
@@ -24,7 +24,9 @@ __inline static std::string demangle(const char* name) {
 #define TYPENAME(t)   typeid(t).name()
 #define HAS_RTTI 1
 #else
-#define __typename(t)   "" /* Unknown */
+/* No RTTI support */
+#define TYPENAME(t)   ""
+#define HAS_RTTI 0
 #endif
 
 #endif
diff --git a/test-all.cmd b/test-all.cmd
@@ -1,4 +1,5 @@
 @echo off
+cd %~dp0
 set OUTDIR=%CD%\Solutions\out\
 cd %OUTDIR%
 
diff --git a/tests/unittests/TaskDispatcherCAPITests.cpp b/tests/unittests/TaskDispatcherCAPITests.cpp
@@ -104,7 +104,7 @@ void EVTSDK_LIBABI_CDECL OnTaskDispatcherJoin()
 void CheckTaskTypeNameIsExpectedOrEmptyIfRTTIIsEnabled(task_t* task) noexcept
 {
    std::string typeName { task->typeName };
-#ifdef HAS_RTTI
+#if HAS_RTTI
    EXPECT_TRUE(typeName.find("TestHelper") != string::npos);
 #else
    EXPECT_TRUE(typeName.empty());

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`@echo off`
	`2`	`+cd %~dp0`
`2`	`3`	`@setlocal ENABLEEXTENSIONS`
`3`	`4`	`call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat"`
`4`	`5`