microsoft
/
cpp_client_telemetry
зеркало из https://github.com/microsoft/cpp_client_telemetry.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Trying to fix ARM build issue that happens only on ARIA-BUILD-02, but not other machines :-/

This commit is contained in:
Max Golovanov 2018-09-05 12:32:22 -07:00
Родитель 8cc73f9ed6
Коммит 560de53ed1
3 изменённых файлов: 6 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
build-all.bat
Просмотреть файл

@ -15,6 +15,7 @@ msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win1
msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=x64 msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=x64
msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=x64 msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=x64
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\vsdevcmd\ext\vcvars.bat" arm
msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=ARM msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=ARM
msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=ARM msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=ARM

6
lib/include/public/Version.hpp
Просмотреть файл

@ -2,8 +2,8 @@
// WARNING: DO NOT MODIFY THIS FILE! // WARNING: DO NOT MODIFY THIS FILE!
// Copyright (c) Microsoft. All rights reserved. // Copyright (c) Microsoft. All rights reserved.
// This file has been automatically generated, manual changes will be lost. // This file has been automatically generated, manual changes will be lost.
#define BUILD_VERSION_STR "3.0.247.1" #define BUILD_VERSION_STR "3.0.248.1"
#define BUILD_VERSION 3,0,247,1 #define BUILD_VERSION 3,0,248,1
#ifndef RESOURCE_COMPILER_INVOKED #ifndef RESOURCE_COMPILER_INVOKED
#include <stdint.h> #include <stdint.h>
@ -24,7 +24,7 @@ namespace ARIASDK_NS_BEGIN {
uint64_t const Version = uint64_t const Version =
((uint64_t)3 << 48) | ((uint64_t)3 << 48) |
((uint64_t)0 << 32) | ((uint64_t)0 << 32) |
((uint64_t)247 << 16) | ((uint64_t)248 << 16) |
((uint64_t)1); ((uint64_t)1);
// TODO: [MG] - move declaration of ARIA_SDK_UNUSED to separate include file // TODO: [MG] - move declaration of ARIA_SDK_UNUSED to separate include file

4
zlib/contrib/vstudio/vc14/zlibvc.vcxproj
Просмотреть файл

@ -455,7 +455,7 @@ bld_ml32.bat</Command>
</DataExecutionPrevention> </DataExecutionPrevention>
<ImportLibrary>$(OutDir)zlib.lib</ImportLibrary> <ImportLibrary>$(OutDir)zlib.lib</ImportLibrary>
</Link> </Link>
<PreBuildEvent> <PreBuildEvent>
</PreBuildEvent> </PreBuildEvent>
<Lib> <Lib>
<TargetMachine>MachineARM</TargetMachine> <TargetMachine>MachineARM</TargetMachine>
@ -613,7 +613,7 @@ bld_ml32.bat</Command>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers> <OmitFramePointers>true</OmitFramePointers>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet> <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<WholeProgramOptimization>false</WholeProgramOptimization> <WholeProgramOptimization>false</WholeProgramOptimization>
<DisableSpecificWarnings>4267</DisableSpecificWarnings> <DisableSpecificWarnings>4267</DisableSpecificWarnings>
<ControlFlowGuard>Guard</ControlFlowGuard> <ControlFlowGuard>Guard</ControlFlowGuard>