From 9d0fae31d7ca05e8e2062a2b15396405c71507dc Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 29 Aug 2019 19:07:09 -0700 Subject: [libp7client] Rename port folder to lowercase (#7977) --- ports/libP7Client/CONTROL | 3 - ports/libP7Client/fix-runtime-library.patch | 76 ---------------- ports/libP7Client/portfile.cmake | 134 ---------------------------- ports/libp7client/CONTROL | 3 + ports/libp7client/fix-runtime-library.patch | 76 ++++++++++++++++ ports/libp7client/portfile.cmake | 118 ++++++++++++++++++++++++ 6 files changed, 197 insertions(+), 213 deletions(-) delete mode 100644 ports/libP7Client/CONTROL delete mode 100644 ports/libP7Client/fix-runtime-library.patch delete mode 100644 ports/libP7Client/portfile.cmake create mode 100644 ports/libp7client/CONTROL create mode 100644 ports/libp7client/fix-runtime-library.patch create mode 100644 ports/libp7client/portfile.cmake diff --git a/ports/libP7Client/CONTROL b/ports/libP7Client/CONTROL deleted file mode 100644 index 08cf608e8..000000000 --- a/ports/libP7Client/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: libp7client -Version: 5.2 -Description: Open source, cross-platform, fastest library for sending logs, telemetry & trace data from your application. 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 @@ - $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) - false - false -- MultiThreadedDebug -+ MultiThreadedDebugDLL - - - Windows -@@ -137,7 +137,7 @@ - Disabled - _WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) - $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) -- MultiThreadedDebug -+ MultiThreadedDebugDLL - - - Windows -@@ -165,7 +165,7 @@ - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) - ProgramDatabase -- MultiThreaded -+ MultiThreadedDll - - - Windows -@@ -195,7 +195,7 @@ - _WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) - $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) - ProgramDatabase -- MultiThreaded -+ MultiThreadedDll - - - Windows -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 @@ - $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) - false - false -+ MultiThreadedDebug - - - Windows -@@ -181,6 +182,7 @@ - Disabled - _WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) - $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) -+ MultiThreadedDebug - - - Windows -@@ -204,6 +206,7 @@ - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) - ProgramDatabase -+ MultiThreaded - - - Windows -@@ -255,6 +258,7 @@ - _WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) - $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) - ProgramDatabase -+ MultiThreaded - - - Windows diff --git a/ports/libP7Client/portfile.cmake b/ports/libP7Client/portfile.cmake deleted file mode 100644 index b6419dbcd..000000000 --- a/ports/libP7Client/portfile.cmake +++ /dev/null @@ -1,134 +0,0 @@ -# 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 = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - -include(vcpkg_common_functions) - -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "Unsupported system: ${VCPKG_CMAKE_SYSTEM_NAME}") -elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - message(FATAL_ERROR "Unsupported system: ${VCPKG_CMAKE_SYSTEM_NAME}") -elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux ") - 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_download_distfile(ARCHIVE - URLS "http://baical.net/files/libP7Client_v${VERSION}.zip" - FILENAME "libP7Client_v${VERSION}.zip" - SHA512 9744b9c3f091db90aca3485408d3e1169317152ea353ab3845cd7cfb9d61d105b55be17ad83c5970e01d7d0f37566313bc18c0f8a4c16bcd1582cd7a5ea29b87 -) - -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - 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(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 -) - -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/libp7client RENAME copyright) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() - -vcpkg_copy_pdbs() \ No newline at end of file diff --git a/ports/libp7client/CONTROL b/ports/libp7client/CONTROL new file mode 100644 index 000000000..0069877d4 --- /dev/null +++ b/ports/libp7client/CONTROL @@ -0,0 +1,3 @@ +Source: libp7client +Version: 5.2-1 +Description: Open source, cross-platform, fastest library for sending logs, telemetry & trace data from your application. diff --git a/ports/libp7client/fix-runtime-library.patch b/ports/libp7client/fix-runtime-library.patch new file mode 100644 index 000000000..d7d2ab931 --- /dev/null +++ b/ports/libp7client/fix-runtime-library.patch @@ -0,0 +1,76 @@ +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 @@ + $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) + false + false +- MultiThreadedDebug ++ MultiThreadedDebugDLL + + + Windows +@@ -137,7 +137,7 @@ + Disabled + _WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) +- MultiThreadedDebug ++ MultiThreadedDebugDLL + + + Windows +@@ -165,7 +165,7 @@ + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) + ProgramDatabase +- MultiThreaded ++ MultiThreadedDll + + + Windows +@@ -195,7 +195,7 @@ + _WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) + ProgramDatabase +- MultiThreaded ++ MultiThreadedDll + + + Windows +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 @@ + $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) + false + false ++ MultiThreadedDebug + + + Windows +@@ -181,6 +182,7 @@ + Disabled + _WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) ++ MultiThreadedDebug + + + Windows +@@ -204,6 +206,7 @@ + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) + ProgramDatabase ++ MultiThreaded + + + Windows +@@ -255,6 +258,7 @@ + _WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)\..\Shared\;$(ProjectDir)\..\Shared\Platforms\Windows_x86;$(ProjectDir)\..\Headers;%(AdditionalIncludeDirectories) + ProgramDatabase ++ MultiThreaded + + + Windows diff --git a/ports/libp7client/portfile.cmake b/ports/libp7client/portfile.cmake new file mode 100644 index 000000000..1a0b002ea --- /dev/null +++ b/ports/libp7client/portfile.cmake @@ -0,0 +1,118 @@ +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_download_distfile(ARCHIVE + URLS "http://baical.net/files/libP7Client_v${VERSION}.zip" + FILENAME "libP7Client_v${VERSION}.zip" + SHA512 9744b9c3f091db90aca3485408d3e1169317152ea353ab3845cd7cfb9d61d105b55be17ad83c5970e01d7d0f37566313bc18c0f8a4c16bcd1582cd7a5ea29b87 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + 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(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 +) + +file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/libp7client RENAME copyright) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +vcpkg_copy_pdbs() \ No newline at end of file -- cgit v1.2.3