From 7902eb4fcdada8d39e78ebb4907b0fe41f907fc8 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Mon, 31 Oct 2022 01:04:10 -0700 Subject: [PATCH 1/6] [7zip] Add complete public header files --- ports/7zip/CMakeLists.txt | 72 +++++++++++++++++++++++++++++++++++++++ ports/7zip/vcpkg.json | 1 + 2 files changed, 73 insertions(+) diff --git a/ports/7zip/CMakeLists.txt b/ports/7zip/CMakeLists.txt index a7fb577bc558dd..14449899ad244c 100644 --- a/ports/7zip/CMakeLists.txt +++ b/ports/7zip/CMakeLists.txt @@ -399,26 +399,98 @@ target_include_directories(7zip ) set(PUBLIC_HEADERS + C/7z.h + C/7zAlloc.h + C/7zBuf.h + C/7zCrc.h + C/7zFile.h C/7zTypes.h + C/7zVersion.h + C/Aes.h C/Alloc.h + C/Bcj2.h + C/Blake2.h + C/Bra.h + C/BwtSort.h + C/Compiler.h + C/CpuArch.h + C/Delta.h + C/DllSecur.h + C/HuffEnc.h C/LzFind.h C/LzFindMt.h C/LzHash.h + C/Lzma2Dec.h C/LzmaDec.h + C/Lzma2DecMt.h + C/Lzma2Enc.h C/LzmaEnc.h + C/Lzma86.h C/LzmaLib.h + C/MtCoder.h + C/MtDec.h + C/Ppmd.h + C/Ppmd7.h + C/Ppmd8.h + C/Precomp.h + C/RotateDefs.h + C/Sha1.h + C/Sha256.h + C/Sort.h C/Threads.h + C/Xz.h + C/XzCrc64.h + C/XzEnc.h + CPP/7zip/Archive/IArchive.h + CPP/7zip/Archive/DeflateProps.h + CPP/7zip/Archive/HandlerCont.h + CPP/7zip/Archive/StdAfx.h + CPP/7zip/Archive/XzHandler.h + CPP/7zip/ICoder.h CPP/7zip/IDecl.h CPP/7zip/IPassword.h CPP/7zip/IProgress.h CPP/7zip/IStream.h + CPP/7zip/MyVersion.h CPP/7zip/PropID.h + + CPP/Common/AutoPtr.h + CPP/Common/C_FileIO.h + CPP/Common/CommandLineParser.h + CPP/Common/Common.h + CPP/Common/ComTry.h CPP/Common/Defs.h + CPP/Common/DynamicBuffer.h + CPP/Common/DynLimBuf.h + CPP/Common/IntToString.h + CPP/Common/Lang.h + CPP/Common/ListFileUtils.h + CPP/Common/MyBuffer.h + CPP/Common/MyBuffer2.h + CPP/Common/MyCom.h + CPP/Common/MyException.h + CPP/Common/MyGuidDef.h + CPP/Common/MyInitGuid.h + CPP/Common/MyLinux.h + CPP/Common/MyMap.h + CPP/Common/MyString.h CPP/Common/MyTypes.h CPP/Common/MyUnknown.h + CPP/Common/MyVector.h CPP/Common/MyWindows.h + CPP/Common/MyXml.h + CPP/Common/NewHandler.h + CPP/Common/Random.h + CPP/Common/StdAfx.h + CPP/Common/StdInStream.h + CPP/Common/StdOutStream.h + CPP/Common/StringConvert.h + CPP/Common/StringToInt.h + CPP/Common/TextConfig.h + CPP/Common/UTFConvert.h + CPP/Common/Wildcard.h ) install( diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json index bfb06d702cff09..cd44e7d23153f5 100644 --- a/ports/7zip/vcpkg.json +++ b/ports/7zip/vcpkg.json @@ -1,6 +1,7 @@ { "name": "7zip", "version": "22.0", + "port-version": 1, "description": "Library for archiving file with a high compression ratio.", "homepage": "https://www.7-zip.org", "license": "LGPL-2.1-or-later", From c9575dbf89d75bf9db23ac2091bee0128065453f Mon Sep 17 00:00:00 2001 From: FrankXie Date: Mon, 31 Oct 2022 01:06:13 -0700 Subject: [PATCH 2/6] version --- versions/7-/7zip.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json index 33107cc50d0124..7c3bd2fbb0d8e6 100644 --- a/versions/7-/7zip.json +++ b/versions/7-/7zip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e08be15448af0b197820ba3e5657de3a29c21d40", + "version": "22.0", + "port-version": 1 + }, { "git-tree": "15ce7b0d1812f8640e74075ca9f5e3a08b3bc875", "version": "22.0", diff --git a/versions/baseline.json b/versions/baseline.json index 2adee1dec2f981..487daeddc05ab8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6,7 +6,7 @@ }, "7zip": { "baseline": "22.0", - "port-version": 0 + "port-version": 1 }, "ableton": { "baseline": "3.0.5", From 50165554eb24b839237491a5b4e18b31681926b3 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Mon, 21 Nov 2022 23:48:01 -0800 Subject: [PATCH 3/6] simplify --- ports/7zip/CMakeLists.txt | 115 ++++---------------------------------- ports/7zip/portfile.cmake | 2 + 2 files changed, 14 insertions(+), 103 deletions(-) diff --git a/ports/7zip/CMakeLists.txt b/ports/7zip/CMakeLists.txt index 14449899ad244c..4f5559a3580e1c 100644 --- a/ports/7zip/CMakeLists.txt +++ b/ports/7zip/CMakeLists.txt @@ -398,101 +398,6 @@ target_include_directories(7zip $/7zip/CPP ) -set(PUBLIC_HEADERS - C/7z.h - C/7zAlloc.h - C/7zBuf.h - C/7zCrc.h - C/7zFile.h - C/7zTypes.h - C/7zVersion.h - C/Aes.h - C/Alloc.h - C/Bcj2.h - C/Blake2.h - C/Bra.h - C/BwtSort.h - C/Compiler.h - C/CpuArch.h - C/Delta.h - C/DllSecur.h - C/HuffEnc.h - C/LzFind.h - C/LzFindMt.h - C/LzHash.h - C/Lzma2Dec.h - C/LzmaDec.h - C/Lzma2DecMt.h - C/Lzma2Enc.h - C/LzmaEnc.h - C/Lzma86.h - C/LzmaLib.h - C/MtCoder.h - C/MtDec.h - C/Ppmd.h - C/Ppmd7.h - C/Ppmd8.h - C/Precomp.h - C/RotateDefs.h - C/Sha1.h - C/Sha256.h - C/Sort.h - C/Threads.h - C/Xz.h - C/XzCrc64.h - C/XzEnc.h - - CPP/7zip/Archive/IArchive.h - CPP/7zip/Archive/DeflateProps.h - CPP/7zip/Archive/HandlerCont.h - CPP/7zip/Archive/StdAfx.h - CPP/7zip/Archive/XzHandler.h - - CPP/7zip/ICoder.h - CPP/7zip/IDecl.h - CPP/7zip/IPassword.h - CPP/7zip/IProgress.h - CPP/7zip/IStream.h - CPP/7zip/MyVersion.h - CPP/7zip/PropID.h - - CPP/Common/AutoPtr.h - CPP/Common/C_FileIO.h - CPP/Common/CommandLineParser.h - CPP/Common/Common.h - CPP/Common/ComTry.h - CPP/Common/Defs.h - CPP/Common/DynamicBuffer.h - CPP/Common/DynLimBuf.h - CPP/Common/IntToString.h - CPP/Common/Lang.h - CPP/Common/ListFileUtils.h - CPP/Common/MyBuffer.h - CPP/Common/MyBuffer2.h - CPP/Common/MyCom.h - CPP/Common/MyException.h - CPP/Common/MyGuidDef.h - CPP/Common/MyInitGuid.h - CPP/Common/MyLinux.h - CPP/Common/MyMap.h - CPP/Common/MyString.h - CPP/Common/MyTypes.h - CPP/Common/MyUnknown.h - CPP/Common/MyVector.h - CPP/Common/MyWindows.h - CPP/Common/MyXml.h - CPP/Common/NewHandler.h - CPP/Common/Random.h - CPP/Common/StdAfx.h - CPP/Common/StdInStream.h - CPP/Common/StdOutStream.h - CPP/Common/StringConvert.h - CPP/Common/StringToInt.h - CPP/Common/TextConfig.h - CPP/Common/UTFConvert.h - CPP/Common/Wildcard.h -) - install( TARGETS 7zip EXPORT 7zip-targets @@ -502,14 +407,18 @@ install( ) # Headers makes relative includes so directory structure must be kept -foreach(HEADER ${PUBLIC_HEADERS}) - get_filename_component(HEADER_DIR ${HEADER} DIRECTORY) - install( - FILES ${HEADER} - CONFIGURATIONS Release - DESTINATION include/7zip/${HEADER_DIR} - ) -endforeach() + +file(GLOB HEADERS "${CMAKE_CURRENT_LIST_DIR}/C/*.h") +install(FILES ${HEADERS} DESTINATION "include/7zip/C") + +file(GLOB HEADERS "${CMAKE_CURRENT_LIST_DIR}/CPP/Common/*.h") +install(FILES ${HEADERS} DESTINATION "include/7zip/CPP/Common") + +file(GLOB HEADERS "${CMAKE_CURRENT_LIST_DIR}/CPP/7zip/*.h") +install(FILES ${HEADERS} DESTINATION "include/7zip/CPP/7zip") + +file(GLOB HEADERS "${CMAKE_CURRENT_LIST_DIR}/CPP/7zip/Archive/*.h") +install (FILES ${HEADERS} DESTINATION "include/7zip/CPP/7zip/Archive") include(CMakePackageConfigHelpers) configure_package_config_file( diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake index d4a5cf487b7f91..2546578cceb583 100644 --- a/ports/7zip/portfile.cmake +++ b/ports/7zip/portfile.cmake @@ -28,3 +28,5 @@ file( DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") \ No newline at end of file From 86210be1e39757b9f476cc74fec2c963f3a8d93c Mon Sep 17 00:00:00 2001 From: FrankXie Date: Mon, 21 Nov 2022 23:48:54 -0800 Subject: [PATCH 4/6] version --- versions/7-/7zip.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json index 7c3bd2fbb0d8e6..264bad91a45799 100644 --- a/versions/7-/7zip.json +++ b/versions/7-/7zip.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e08be15448af0b197820ba3e5657de3a29c21d40", + "git-tree": "d8b197e2f6448ce036bef9056df1545e93f00f7a", "version": "22.0", "port-version": 1 }, From 568565c3b2d4f026c896229068c9eb32136318fb Mon Sep 17 00:00:00 2001 From: FrankXie Date: Tue, 22 Nov 2022 01:47:45 -0800 Subject: [PATCH 5/6] add end line --- ports/7zip/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake index 2546578cceb583..5e75095a801dd5 100644 --- a/ports/7zip/portfile.cmake +++ b/ports/7zip/portfile.cmake @@ -29,4 +29,4 @@ file( RENAME copyright ) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") From 38c388ac53413b2f66d86175243cfadc0e48968c Mon Sep 17 00:00:00 2001 From: FrankXie Date: Tue, 22 Nov 2022 01:47:57 -0800 Subject: [PATCH 6/6] vdb --- versions/7-/7zip.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json index 264bad91a45799..f466c631c8ec57 100644 --- a/versions/7-/7zip.json +++ b/versions/7-/7zip.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d8b197e2f6448ce036bef9056df1545e93f00f7a", + "git-tree": "3cbbaee3c546a24fc68b37759c9a5fc62b683ff0", "version": "22.0", "port-version": 1 },