Skip to content

Commit

Permalink
Support Visual Studio 2017 builds
Browse files Browse the repository at this point in the history
  • Loading branch information
@damonbarry
damonbarry committed Mar 24, 2017
1 parent a213531 commit c1687a8
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 13 deletions.
2 changes: 1 addition & 1 deletion deps/c-utility
Submodule c-utility updated 2 files
+218 −216 src/aziotsharedutil.def
+7 −3 testtools/micromock/CMakeLists.txt
2 changes: 1 addition & 1 deletion deps/iot-sdk-c
Submodule iot-sdk-c updated 23 files
+0 −1 CMakeLists.txt
+1 −4 build_all/linux/build.sh
+6 −13 build_all/windows/build.cmd
+2 −9 build_all/windows/build_client.cmd
+1 −1 c-utility
+1 −11 configs/azure_iot_sdksFunctions.cmake
+0 −6 dependencies.cmake
+1 −1 doc/devbox_setup.md
+44 −55 iothub_client/CMakeLists.txt
+5 −0 iothub_client/devdoc/requirement_docs/iothubtransport_amqp_common_requirements.md
+7 −6 iothub_client/inc/iothubtransport_amqp_connection.h
+3 −7 iothub_client/samples/CMakeLists.txt
+35 −1 iothub_client/src/iothubtransport_amqp_common.c
+4 −0 iothub_client/src/iothubtransport_amqp_connection.c
+4 −13 iothub_client/tests/CMakeLists.txt
+4 −3 iothub_client/tests/common_e2e/iothubclient_common_e2e.c
+13 −5 iothub_client/tests/iothubclient_amqp_ws_e2e/CMakeLists.txt
+14 −6 iothub_client/tests/iothubclient_mqtt_ws_e2e/CMakeLists.txt
+199 −2 iothub_client/tests/iothubtransport_amqp_common_ut/iothubtransport_amqp_common_ut.c
+0 −3 iothub_client/tests/iothubtransportmqtt_ws_ut/CMakeLists.txt
+1 −1 jenkins/linux_c_gcc44.sh
+1 −1 uamqp
+1 −1 umqtt
2 changes: 1 addition & 1 deletion deps/uamqp
Submodule uamqp updated 9 files
+0 −1 CMakeLists.txt
+1 −4 build_all/linux/build.sh
+1 −1 build_all/packaging/linux/debian/rules
+6 −13 build_all/windows/build.cmd
+1 −1 c-utility
+1 −1 jenkins/windows_c.cmd
+0 −8 readme.md
+1 −3 samples/CMakeLists.txt
+1 −1 samples/websockets_sample/CMakeLists.txt
2 changes: 1 addition & 1 deletion deps/umqtt
Submodule umqtt updated 1 files
+1 −1 c-utility
26 changes: 17 additions & 9 deletions tools/build.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,21 @@ rem ----------------------------------------------------------------------------
rem this is setting the cmake path in a quoted way
set "cmake-root=%build-root%\build"

rem Figure out which CMake generator to use
if "%VisualStudioVersion%" == "14.0" (
set "cmake-generator=Visual Studio 14 2015"
) else if "%VisualStudioVersion%" == "15.0" (
set "cmake-generator=Visual Studio 15 2017"
)
if NOT DEFINED cmake-generator (
echo ERROR: VisualStudioVersion not defined, or not one of ^(14.0, 15.0^)
exit /b 1
)
if "%build-platform%" == "x64" (
set "cmake-generator=%cmake-generator% Win64"
)
echo **Building for "%cmake-generator%"

echo Cleaning up build artifacts...
rmdir /s/q %cmake-root%
if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
Expand All @@ -168,15 +183,8 @@ mkdir %cmake-root%
if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!

pushd %cmake-root%
if %build-platform% == x64 (
echo ***Running CMAKE for Win64***
cmake %dependency_install_prefix% -DCMAKE_BUILD_TYPE="%build-config%" -Drun_unittests:BOOL=%CMAKE_run_unittests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Denable_dotnet_binding:BOOL=%CMAKE_enable_dotnet_binding% -Denable_dotnet_core_binding:BOOL=%CMAKE_enable_dotnet_core_binding% -Denable_java_binding:BOOL=%enable-java-binding% -Denable_nodejs_binding:BOOL=%enable_nodejs_binding% -Denable_native_remote_modules:BOOL=%enable_native_remote_modules% -Denable_java_remote_modules:BOOL=%enable_java_remote_modules% -Denable_ble_module:BOOL=%CMAKE_enable_ble_module% -Drebuild_deps:BOOL=%rebuild_deps% -Duse_xplat_uuid:BOOL=%use_xplat_uuid% -G "Visual Studio 14 Win64" "%build-root%"
if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
) else (
echo ***Running CMAKE for Win32***
cmake %dependency_install_prefix% -DCMAKE_BUILD_TYPE="%build-config%" -Drun_unittests:BOOL=%CMAKE_run_unittests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Denable_dotnet_binding:BOOL=%CMAKE_enable_dotnet_binding% -Denable_dotnet_core_binding:BOOL=%CMAKE_enable_dotnet_core_binding% -Denable_java_binding:BOOL=%enable-java-binding% -Denable_nodejs_binding:BOOL=%enable_nodejs_binding% -Denable_native_remote_modules:BOOL=%enable_native_remote_modules% -Denable_java_remote_modules:BOOL=%enable_java_remote_modules% -Denable_ble_module:BOOL=%CMAKE_enable_ble_module% -Drebuild_deps:BOOL=%rebuild_deps% -Duse_xplat_uuid:BOOL=%use_xplat_uuid% -G "Visual Studio 14" "%build-root%"
if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
)
cmake %dependency_install_prefix% -DCMAKE_BUILD_TYPE="%build-config%" -Drun_unittests:BOOL=%CMAKE_run_unittests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Denable_dotnet_binding:BOOL=%CMAKE_enable_dotnet_binding% -Denable_dotnet_core_binding:BOOL=%CMAKE_enable_dotnet_core_binding% -Denable_java_binding:BOOL=%enable-java-binding% -Denable_nodejs_binding:BOOL=%enable_nodejs_binding% -Denable_native_remote_modules:BOOL=%enable_native_remote_modules% -Denable_java_remote_modules:BOOL=%enable_java_remote_modules% -Denable_ble_module:BOOL=%CMAKE_enable_ble_module% -Drebuild_deps:BOOL=%rebuild_deps% -Duse_xplat_uuid:BOOL=%use_xplat_uuid% -G "%cmake-generator%" "%build-root%"
if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!

msbuild /m /p:Configuration="%build-config%" /p:Platform="%build-platform%" azure_iot_gateway_sdk.sln
if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
Expand Down

0 comments on commit c1687a8

Please sign in to comment.