[Many Ports] Baseline Fixes for 2020-10-24 CI Build (#14208)

* [libp7client, libp7-baical] Combine identical ports and update to libp7client 5.6.

In a recent CI build, we started getting output like:

Installing package libp7-baical[core]:x86-windows...
The following files are already installed in C:/Dev/vcpkg/installed/x86-windows and are in conflict with libp7-baical:x86-windows

Installed by libp7client:x86-windows
    bin/P7x32.dll
    bin/P7x32.pdb
    debug/bin/P7x32d.dll
    debug/bin/P7x32d.pdb
    include/P7/GTypes.h
    include/P7/P7_Client.h
    include/P7/P7_Cproxy.h
    include/P7/P7_Extensions.h
    include/P7/P7_Telemetry.h
    include/P7/P7_Trace.h

It turns out that these ports are identical, they are just different versions of the same library. The libp7-baical version supported more platforms and was simpler, so took that one and updated it to a current version.

* [ignition-modularscripts, ignition-msgs1] Attempt to fix intermittent build failures by disabling parallel configure.

* Fix several "passing: remove from fail list."

* [akali] Disable parallel configure.

REGRESSION: akali:x64-windows. If expected, add akali:x64-windows=fail to .\scripts\ci.baseline.txt.

Attempts to fix:

CMake Error: Could not open file for write in copy operation C:/Dev/vcpkg/buildtrees/akali/src/fc94eb83a9-01654d3f7c.clean/include/akali_config.h.tmp
CMake Error: : System Error: Permission denied
CMake Error at CMakeLists.txt:20 (configure_file):
  configure_file Problem configuring file

* [nvtt] Devendor libsquish

This was regressed by https://github.com/microsoft/vcpkg/pull/13674

REGRESSION: nvtt:x64-linux. If expected, add nvtt:x64-linux=fail to .\scripts\ci.baseline.txt.
REGRESSION: nvtt:x64-osx. If expected, add nvtt:x64-osx=fail to .\scripts\ci.baseline.txt.
REGRESSION: nvtt:x64-windows-static. If expected, add nvtt:x64-windows-static=fail to .\scripts\ci.baseline.txt.
REGRESSION: nvtt:x64-windows. If expected, add nvtt:x64-windows=fail to .\scripts\ci.baseline.txt.

Installing package nvtt[core]:x64-linux...
The following files are already installed in /mnt/vcpkg-ci/installed/x64-linux and are in conflict with nvtt:x64-linux

Installed by libsquish:x64-linux
    debug/lib/libsquishd.a
    include/squish.h
    lib/libsquish.a

* [knet] Disable parallel configure.

REGRESSION: knet:x64-windows. If expected, add knet:x64-windows=fail to .\scripts\ci.baseline.txt.

CMake Error at src/CMakeLists.txt:1 (configure_file):
  configure_file Problem configuring file

* [libnice] Diable parallel configure.

REGRESSION: libnice:x64-windows. If expected, add libnice:x64-windows=fail to .\scripts\ci.baseline.txt.

CMake Error at CMakeLists.txt:13 (configure_file):
  configure_file Problem configuring file

4 files changed, 62 insertions, 182 deletions

diff --git a/ports/libp7client/CMakeLists.txt b/ports/libp7client/CMakeLists.txt
new file mode 100644
index 000000000..f2eb53af3
--- /dev/null
+++ b/ports/libp7client/CMakeLists.txt
@@ -0,0 +1,46 @@
+project(P7)
+cmake_minimum_required(VERSION 3.18)
+
+add_library(P7
+  "Sources/ClBaical.cpp"
+  "Sources/ClFile.cpp"
+  "Sources/Client.cpp"
+  "Sources/ClNull.cpp"
+  "Sources/ClText.cpp"
+  "Sources/CRC32.cpp"
+  "Sources/Proxy.cpp"
+  "Sources/Telemetry.cpp"
+  "Sources/Trace.cpp")
+
+target_include_directories(P7 PRIVATE "Headers/")
+target_include_directories(P7 PRIVATE "Shared/")
+if(WIN32)
+  target_include_directories(P7 PRIVATE "Shared/Platforms/Windows_x86/")
+  target_link_libraries(P7 "ws2_32")
+else()
+  target_include_directories(P7 PRIVATE "Shared/Platforms/Linux_x86/")
+endif()
+
+if(WIN32)
+  set_target_properties(P7 PROPERTIES PREFIX "")
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set_target_properties(P7 PROPERTIES DEBUG_POSTFIX "x64d")
+    set_target_properties(P7 PROPERTIES RELEASE_POSTFIX "x64")
+  else()
+    set_target_properties(P7 PROPERTIES DEBUG_POSTFIX "x32d")
+    set_target_properties(P7 PROPERTIES RELEASE_POSTFIX "x32")
+  endif()
+else()
+  set_target_properties(P7 PROPERTIES PREFIX "lib")
+  set_target_properties(P7 PROPERTIES POSTFIX "")
+  set_target_properties(P7 PROPERTIES DEBUG_POSTFIX "d")
+endif()
+
+install(TARGETS P7
+        RUNTIME DESTINATION "bin"
+        ARCHIVE DESTINATION "lib"
+        LIBRARY DESTINATION "lib")
+
+install(DIRECTORY Headers/
+        DESTINATION include/P7
+        FILES_MATCHING PATTERN "*.h")
diff --git a/ports/libp7client/CONTROL b/ports/libp7client/CONTROL
index f7020b6f1..aa506cf6c 100644
--- a/ports/libp7client/CONTROL
+++ b/ports/libp7client/CONTROL
@@ -1,4 +1,5 @@
 Source: libp7client

-Version: 5.2-1

+Version: 5.6

+Homepage: https://baical.net/

 Description: Open source, cross-platform, fastest library for sending logs, telemetry & trace data from your application.

-Supports: x86|x64
\ No newline at end of file
+Supports: !(arm|uwp|osx)

diff --git a/ports/libp7client/fix-runtime-library.patch b/ports/libp7client/fix-runtime-library.patch
deleted file mode 100644
index d7d2ab931..000000000
--- a/ports/libp7client/fix-runtime-library.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/Sources/P7ClientDll.vcxproj b/Sources/P7ClientDll.vcxproj

-index 9fab3d0..a7035d9 100644

---- a/Sources/P7ClientDll.vcxproj

-+++ b/Sources/P7ClientDll.vcxproj

-@@ -112,7 +112,7 @@

-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-       <ShowIncludes>false</ShowIncludes>

-       <EnablePREfast>false</EnablePREfast>

--      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-     </ClCompile>

-     <Link>

-       <SubSystem>Windows</SubSystem>

-@@ -137,7 +137,7 @@

-       <Optimization>Disabled</Optimization>

-       <PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

--      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-     </ClCompile>

-     <Link>

-       <SubSystem>Windows</SubSystem>

-@@ -165,7 +165,7 @@

-       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

--      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-+      <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>

-     </ClCompile>

-     <Link>

-       <SubSystem>Windows</SubSystem>

-@@ -195,7 +195,7 @@

-       <PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

--      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-+      <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>

-     </ClCompile>

-     <Link>

-       <SubSystem>Windows</SubSystem>

-diff --git a/Sources/P7ClientLib.vcxproj b/Sources/P7ClientLib.vcxproj

-index 3b46bab..725f8a4 100644

---- a/Sources/P7ClientLib.vcxproj

-+++ b/Sources/P7ClientLib.vcxproj

-@@ -161,6 +161,7 @@

-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-       <ShowIncludes>false</ShowIncludes>

-       <EnablePREfast>false</EnablePREfast>

-+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-     </ClCompile>

-     <Link>

-       <SubSystem>Windows</SubSystem>

-@@ -181,6 +182,7 @@

-       <Optimization>Disabled</Optimization>

-       <PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-     </ClCompile>

-     <Link>

-       <SubSystem>Windows</SubSystem>

-@@ -204,6 +206,7 @@

-       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-     </ClCompile>

-     <Link>

-       <SubSystem>Windows</SubSystem>

-@@ -255,6 +258,7 @@

-       <PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-       <AdditionalIncludeDirectories>$(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-     </ClCompile>

-     <Link>

-       <SubSystem>Windows</SubSystem>

diff --git a/ports/libp7client/portfile.cmake b/ports/libp7client/portfile.cmake
index 1a0b002ea..66a878834 100644
--- a/ports/libp7client/portfile.cmake
+++ b/ports/libp7client/portfile.cmake
@@ -1,118 +1,27 @@
-include(vcpkg_common_functions)

-

-if (NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)

-    message(FATAL_ERROR "Unsupported system: ${VCPKG_CMAKE_SYSTEM_NAME}")

-endif()

-

-if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")

-    set(BUILD_ARCH "Win32")

-    set(ARCH "32")

-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")

-    set(BUILD_ARCH "x64")

-    set(ARCH "64")

-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")

-    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")

-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")

-    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")

-else()

-    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")

-endif()

-

-set(VERSION 5.2)

+vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx")

 

 vcpkg_download_distfile(ARCHIVE

-    URLS "http://baical.net/files/libP7Client_v${VERSION}.zip"

-    FILENAME "libP7Client_v${VERSION}.zip"

-    SHA512 9744b9c3f091db90aca3485408d3e1169317152ea353ab3845cd7cfb9d61d105b55be17ad83c5970e01d7d0f37566313bc18c0f8a4c16bcd1582cd7a5ea29b87

+    URLS http://baical.net/files/libP7Client_v5.6.zip

+    FILENAME libP7Client_v5.6.zip

+    SHA512 992256854b717a45ae9e11ed16aa27b8b054de97718f027664634597d756aa26fe10dcad765cde7695802c90def46461abbcbfde81923fdd40ea2b659e1a8240

 )

 

 vcpkg_extract_source_archive_ex(

     OUT_SOURCE_PATH SOURCE_PATH

-    ARCHIVE ${ARCHIVE} 

+    ARCHIVE "${ARCHIVE}"

     NO_REMOVE_ONE_LEVEL

-    REF ${VERSION}

-    PATCHES

-        "fix-runtime-library.patch"

 )

-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

-    vcpkg_build_msbuild(

-        PROJECT_PATH ${SOURCE_PATH}/Sources/P7ClientLib.vcxproj

-        PLATFORM ${BUILD_ARCH}

-        RELEASE_CONFIGURATION 

-        DEBUG_CONFIGURATION 

-        OPTIONS

-            "/p:NoWarn=C4996" 

-    )

-

-    file(GLOB LIB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.lib")

-    file(GLOB D_LIB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.lib")

-else()

-    vcpkg_build_msbuild(

-        PROJECT_PATH ${SOURCE_PATH}/Sources/P7ClientDll.vcxproj

-        PLATFORM ${BUILD_ARCH}

-        #RELEASE_CONFIGURATION 

-        #DEBUG_CONFIGURATION 

-        OPTIONS

-            "/p:NoWarn=C4996"

-    )

-

-    file(GLOB DLL_LIB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.dll.lib")

-    file(GLOB D_DLL_LIB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.dll.lib")

 

-    file(GLOB DLL_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.dll")

-    file(GLOB D_DLL_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.dll")

-

-    file(GLOB PDB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.pdb")

-    file(GLOB D_PDB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.pdb")

-

-endif()

-

-file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Headers/*.h")

-file(INSTALL

-    ${HEADER_FILES}

-    DESTINATION ${CURRENT_PACKAGES_DIR}/include/P7

-)

+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

 

-#file(GLOB EXE_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}.exe")

-#file(GLOB D_EXE_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Binaries/*${ARCH}d.exe")

-

-file(INSTALL

-    ${LIB_FILES}

-    DESTINATION ${CURRENT_PACKAGES_DIR}/lib

-)

-file(INSTALL

-    ${D_LIB_FILES}

-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib

-)

-file(INSTALL

-    ${DLL_LIB_FILES}

-    DESTINATION ${CURRENT_PACKAGES_DIR}/lib

-)

-file(INSTALL

-    ${D_DLL_LIB_FILES}

-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib

-)

-file(INSTALL

-    ${DLL_FILES}

-    DESTINATION ${CURRENT_PACKAGES_DIR}/bin

-)

-file(INSTALL

-    ${D_DLL_FILES}

-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin

-)

-file(INSTALL

-    ${PDB_FILES}

-    DESTINATION ${CURRENT_PACKAGES_DIR}/bin

-)

-file(INSTALL

-    ${D_PDB_FILES}

-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin

+vcpkg_configure_cmake(

+    SOURCE_PATH ${SOURCE_PATH}

+    PREFER_NINJA

 )

 

-file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/libp7client RENAME copyright)

+vcpkg_install_cmake()

+vcpkg_copy_pdbs()

 

-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

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

-endif()

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

 

-vcpkg_copy_pdbs()
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)