Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/3425

4 files changed, 137 insertions, 0 deletions

diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL
new file mode 100644
index 000000000..c96e1b0b8
--- /dev/null
+++ b/ports/ecsutil/CONTROL
@@ -0,0 +1,4 @@
+Source: ecsutil

+Version: 1.0.1.4

+Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol.

+Build-Depends: atlmfc

diff --git a/ports/ecsutil/NoLibSyms.patch b/ports/ecsutil/NoLibSyms.patch
new file mode 100644
index 000000000..e4f7e77bd
--- /dev/null
+++ b/ports/ecsutil/NoLibSyms.patch
@@ -0,0 +1,41 @@
+ ECSUtil/ECSUtil.vcxproj | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj
+index 05c5726..4b5de57 100644
+--- a/ECSUtil/ECSUtil.vcxproj
++++ b/ECSUtil/ECSUtil.vcxproj
+@@ -289,7 +289,7 @@
+       <SDLCheck>true</SDLCheck>
+       <PreprocessToFile>false</PreprocessToFile>
+       <PreprocessKeepComments>false</PreprocessKeepComments>
+-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++      <DebugInformationFormat>None</DebugInformationFormat>
+     </ClCompile>
+     <Link>
+       <SubSystem>Windows</SubSystem>
+@@ -317,7 +317,7 @@
+       <SDLCheck>true</SDLCheck>
+       <PreprocessToFile>false</PreprocessToFile>
+       <PreprocessKeepComments>false</PreprocessKeepComments>
+-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++      <DebugInformationFormat>None</DebugInformationFormat>
+     </ClCompile>
+     <Link>
+       <SubSystem>Windows</SubSystem>
+@@ -462,6 +462,7 @@
+       <SDLCheck>true</SDLCheck>
+       <PreprocessToFile>false</PreprocessToFile>
+       <PreprocessKeepComments>false</PreprocessKeepComments>
++      <DebugInformationFormat>None</DebugInformationFormat>
+     </ClCompile>
+     <Link>
+       <SubSystem>Windows</SubSystem>
+@@ -493,6 +494,7 @@
+       <SDLCheck>true</SDLCheck>
+       <PreprocessToFile>false</PreprocessToFile>
+       <PreprocessKeepComments>false</PreprocessKeepComments>
++      <DebugInformationFormat>None</DebugInformationFormat>
+     </ClCompile>
+     <Link>
+       <SubSystem>Windows</SubSystem>
diff --git a/ports/ecsutil/disable-setversion.patch b/ports/ecsutil/disable-setversion.patch
new file mode 100644
index 000000000..2899a0108
--- /dev/null
+++ b/ports/ecsutil/disable-setversion.patch
@@ -0,0 +1,36 @@
+diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj

+index 05c5726..f8ac64e 100644

+--- a/ECSUtil/ECSUtil.vcxproj

++++ b/ECSUtil/ECSUtil.vcxproj

+@@ -274,7 +274,6 @@

+       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+     </ResourceCompile>

+     <PostBuildEvent>

+-      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>

+     </PostBuildEvent>

+     <PostBuildEvent>

+       <Message>set version resource in DLL from source file</Message>

+@@ -361,7 +360,6 @@

+       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+     </ResourceCompile>

+     <PostBuildEvent>

+-      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>

+     </PostBuildEvent>

+     <PostBuildEvent>

+       <Message>set version resource in DLL from source file</Message>

+@@ -445,7 +443,6 @@

+       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+     </ResourceCompile>

+     <PostBuildEvent>

+-      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>

+     </PostBuildEvent>

+     <PostBuildEvent>

+       <Message>set version resource in DLL from source file</Message>

+@@ -541,7 +538,6 @@

+       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+     </ResourceCompile>

+     <PostBuildEvent>

+-      <Command>$(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll</Command>

+     </PostBuildEvent>

+     <PostBuildEvent>

+       <Message>set version resource in DLL from source file</Message>

diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake
new file mode 100644
index 000000000..0dc5fa8fa
--- /dev/null
+++ b/ports/ecsutil/portfile.cmake
@@ -0,0 +1,56 @@
+include(vcpkg_common_functions)

+

+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")

+    set(PLATFORM x86)

+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")

+    set(PLATFORM x64)

+else()

+    message(FATAL_ERROR "Unsupported architecture")

+endif()

+

+if(VCPKG_CMAKE_SYSTEM_NAME)

+    message(FATAL_ERROR "Unsupported platform. ECSUTIL currently only supports windows desktop.")

+endif()

+

+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

+    set(ECSUtil_CONFIGURATION_RELEASE Release)

+    set(ECSUtil_CONFIGURATION_DEBUG Debug)

+else()

+    if (VCPKG_CRT_LINKAGE STREQUAL dynamic)

+        set(ECSUtil_CONFIGURATION_RELEASE "Release Lib")

+        set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib")

+    else()

+        set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static")

+        set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static")

+    endif()

+endif()

+

+vcpkg_from_github(

+    OUT_SOURCE_PATH SOURCE_PATH

+    REPO EMCECS/ecs-object-client-windows-cpp

+    REF v1.0.1.4

+    SHA512 796ed227268cd92fce3eba2a842260d552222900b1df1261200032a7678a48776388dd566f408df2ee4dbc0cee39b70090d524a99e6741e0c8f92594d207761a

+    HEAD_REF master

+    PATCHES NoLibSyms.patch

+)

+

+vcpkg_install_msbuild(

+    SOURCE_PATH ${SOURCE_PATH}

+    PROJECT_SUBPATH ECSUtil.sln

+    PLATFORM ${PLATFORM}

+    LICENSE_SUBPATH license.txt

+    TARGET ECSUtil

+    RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE}

+    DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG}

+)

+

+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)

+endif()

+

+file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h)

+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools)

+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll)

+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)

+endif()