Merge branch 'master' of https://github.com/EMCECS/vcpkg

# Conflicts:
#	ports/ecsutil/CONTROL
#	ports/ecsutil/portfile.cmake

3 files changed, 69 insertions, 60 deletions

diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL
index 1a4eff9c2..4bcfb031b 100644
--- a/ports/ecsutil/CONTROL
+++ b/ports/ecsutil/CONTROL
@@ -1,3 +1,4 @@
 Source: ecsutil

-Version: 1.0.1.2

+Version: 1.0.1.3

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

+Build-Depends: atlmfc

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
index 874759afc..7946b0738 100644
--- a/ports/ecsutil/portfile.cmake
+++ b/ports/ecsutil/portfile.cmake
@@ -1,80 +1,52 @@
-# Common Ambient Variables:

-#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}

-#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}

-#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}

-#   PORT                      = current port name (zlib, etc)

-#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)

-#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)

-#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)

-#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>

-#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)

-#

-

 include(vcpkg_common_functions)

 

-set(ECSUTIL_VERSION "v1.0.1.2")

-set(ECSUtil_HASH 399aec10a625ee6eb8f7869005b9221a1e4930c7e8774c20467ddc0e86312e7e1224fb29a1b54d3c9669b78708a23db548195f8973a19eb5559338f600688888)

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)

-

-#architecture detection

 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")

-   set(ECSUtil_ARCH Win32)

+    set(PLATFORM x86)

 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")

-   set(ECSUtil_ARCH x64)

+    set(PLATFORM x64)

 else()

-   message(FATAL_ERROR "unsupported architecture")

+    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()

+    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_download_distfile(ARCHIVE

-    URLS "https://github.com/EMCECS/ecs-object-client-windows-cpp/releases/download/${ECSUTIL_VERSION}/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip"

-    FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip"

-    SHA512 ${ECSUtil_HASH}

+vcpkg_from_github(

+    OUT_SOURCE_PATH SOURCE_PATH

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

+    REF v1.0.1.3

+    SHA512 0c79e522c687aa942e018f5bab619522523b3efee6e421439bda2a93dfa8e2c2665e136a6aae9cba2f8637c296822b91127cd06053c2a39be4e3324cd1792dda

+    HEAD_REF master

 )

-vcpkg_extract_source_archive(${ARCHIVE})

 

-vcpkg_build_msbuild(

-    PROJECT_PATH ${SOURCE_PATH}/ECSUtil.sln

-	TARGET ECSUtil

+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}

 )

 

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

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

-

-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

-    file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)

-    file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)

-    file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)

-    file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)

-elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static)

-	if (VCPKG_CRT_LINKAGE STREQUAL dynamic)

-		file(COPY "${SOURCE_PATH}/Debug Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)

-		file(COPY "${SOURCE_PATH}/objDebug Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)

-		file(COPY "${SOURCE_PATH}/Release Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)

-		file(COPY "${SOURCE_PATH}/objRelease Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)

-	else()

-		file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)

-		file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)

-		file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)

-		file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)

-	endif()

+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

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

 endif()

 

-# Handle copyright

-file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecsutil/copyright)

-

-vcpkg_copy_pdbs()

+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)