From f08e0c8ab1f0298047b03bf995eca2886de3ca24 Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Tue, 30 Mar 2021 17:55:48 +0300 Subject: [PATCH 01/19] Add bddisasm port Currently fetching bddisasm from my fork of the project --- ports/bddisasm/CONTROL | 3 + ports/bddisasm/LICENSE | 201 ++++++++++++++++++++++++++++++++++ ports/bddisasm/portfile.cmake | 51 +++++++++ 3 files changed, 255 insertions(+) create mode 100644 ports/bddisasm/CONTROL create mode 100644 ports/bddisasm/LICENSE create mode 100644 ports/bddisasm/portfile.cmake diff --git a/ports/bddisasm/CONTROL b/ports/bddisasm/CONTROL new file mode 100644 index 00000000000000..646d690e6f6864 --- /dev/null +++ b/ports/bddisasm/CONTROL @@ -0,0 +1,3 @@ +Source: bddisasm +Version: 1.31.8 +Description: bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator. diff --git a/ports/bddisasm/LICENSE b/ports/bddisasm/LICENSE new file mode 100644 index 00000000000000..7652714e6d96d7 --- /dev/null +++ b/ports/bddisasm/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2020 Bitdefender + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake new file mode 100644 index 00000000000000..bfa09e4dee3d6c --- /dev/null +++ b/ports/bddisasm/portfile.cmake @@ -0,0 +1,51 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ianichitei/bddisasm + REF cc6cf1e2b6259e80c82877bcfe7051485588f905 + SHA512 122790cc8763497302971ad00e22e71a04ceeeeaa06bb8c009fb2b5885909470925e2b7fe68aca93b7d92ec3cdacb1e164670f2ee5b1e27b0c48d1278df1b8b1 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + OPTIONS -DDCOMPONENT=bddisasm_Development +) + +vcpkg_install_cmake() + +file(INSTALL + ${CURRENT_PORT_DIR}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright +) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/bddisasm TARGET_PATH share/bddisasm) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH bddisasm/bddisasm.vcxproj + USE_VCPKG_INTEGRATION + ) + + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH bdshemu/bdshemu.vcxproj + USE_VCPKG_INTEGRATION + ) + + file(COPY ${SOURCE_PATH}/inc/ + DESTINATION ${CURRENT_PACKAGES_DIR}/include/bddisasm + FILES_MATCHING PATTERN *.h + ) + + # disasmtool.exe will be placed here, but it shouldn't. We can't delete only disasmtool.exe because that will + # leave us with two empty directories, and that's an error. + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/") +endif () From 012f7c774376d4ef24012bb1ffc8657340184aec Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Tue, 30 Mar 2021 18:18:25 +0300 Subject: [PATCH 02/19] bddisasm: Build with BDD_INCLUDE_TOOL=OFF --- ports/bddisasm/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake index bfa09e4dee3d6c..cf3b1be64838ee 100644 --- a/ports/bddisasm/portfile.cmake +++ b/ports/bddisasm/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE - OPTIONS -DDCOMPONENT=bddisasm_Development + OPTIONS -DBDD_INCLUDE_TOOL=OFF ) vcpkg_install_cmake() From 4983e583a6e4698ce0431dc97ff90de994e0b175 Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Tue, 30 Mar 2021 20:05:51 +0300 Subject: [PATCH 03/19] bddisasm: Use PREFER_NINJA --- ports/bddisasm/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake index cf3b1be64838ee..a157f381ff785a 100644 --- a/ports/bddisasm/portfile.cmake +++ b/ports/bddisasm/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE + PREFER_NINJA OPTIONS -DBDD_INCLUDE_TOOL=OFF ) From fef48c799416b23152c0b81162df801b8ac2a4b9 Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Tue, 30 Mar 2021 22:24:11 +0300 Subject: [PATCH 04/19] bddisasm: Update REF --- ports/bddisasm/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake index a157f381ff785a..7c7b1bf48cea7b 100644 --- a/ports/bddisasm/portfile.cmake +++ b/ports/bddisasm/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ianichitei/bddisasm - REF cc6cf1e2b6259e80c82877bcfe7051485588f905 - SHA512 122790cc8763497302971ad00e22e71a04ceeeeaa06bb8c009fb2b5885909470925e2b7fe68aca93b7d92ec3cdacb1e164670f2ee5b1e27b0c48d1278df1b8b1 + REF 237e6ffb3e1e0b15639078efefb0f2b85ae04ee6 + SHA512 0bc15d3efd4ee740342d194da659b5238ffcf744fe95203aba692b4fd05aa730f9fec362a6772c526914f23000ceafb85f8a8bada7b7a9dd24f83308f51a1fd4 HEAD_REF master ) From 5c162bc55834ef80e64e6ae428cefea11575df09 Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Wed, 31 Mar 2021 10:03:15 +0300 Subject: [PATCH 05/19] bddisasm: Don't use vcpkg_install_msbuild --- ports/bddisasm/portfile.cmake | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake index 7c7b1bf48cea7b..34de4b062bd93b 100644 --- a/ports/bddisasm/portfile.cmake +++ b/ports/bddisasm/portfile.cmake @@ -27,26 +27,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() - -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH bddisasm/bddisasm.vcxproj - USE_VCPKG_INTEGRATION - ) - - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH bdshemu/bdshemu.vcxproj - USE_VCPKG_INTEGRATION - ) - - file(COPY ${SOURCE_PATH}/inc/ - DESTINATION ${CURRENT_PACKAGES_DIR}/include/bddisasm - FILES_MATCHING PATTERN *.h - ) - - # disasmtool.exe will be placed here, but it shouldn't. We can't delete only disasmtool.exe because that will - # leave us with two empty directories, and that's an error. - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/") -endif () From d94604ac43e16abed8614c3c7ad1589ecde3d818 Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Wed, 31 Mar 2021 12:47:53 +0300 Subject: [PATCH 06/19] bddisasm: Switch to release 1.32.1 from the bitdefender repo --- ports/bddisasm/portfile.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake index 34de4b062bd93b..5e8da0cb873e61 100644 --- a/ports/bddisasm/portfile.cmake +++ b/ports/bddisasm/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO ianichitei/bddisasm - REF 237e6ffb3e1e0b15639078efefb0f2b85ae04ee6 - SHA512 0bc15d3efd4ee740342d194da659b5238ffcf744fe95203aba692b4fd05aa730f9fec362a6772c526914f23000ceafb85f8a8bada7b7a9dd24f83308f51a1fd4 + REPO bitdefender/bddisasm + REF v1.32.1 + SHA512 78062081ab38f208c29e1a8cd50daad9203c93ab68cb3e48250fc3b38b7bfdb6a878a995c353f63ac7a6144f305dbdc0f5d60d67558f0403a669197979143de1 HEAD_REF master ) From 693d808bbf1755ee143cfce60a169effa7bd1bc0 Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Fri, 21 May 2021 11:08:10 +0300 Subject: [PATCH 07/19] Add the result of ./vcpkg x-add-version --all --- versions/b-/bddisasm.json | 9 +++++++++ versions/baseline.json | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 versions/b-/bddisasm.json diff --git a/versions/b-/bddisasm.json b/versions/b-/bddisasm.json new file mode 100644 index 00000000000000..b6210badd9ba98 --- /dev/null +++ b/versions/b-/bddisasm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "718f2441771683db9982e14e9d3dc3c8ec6a2df8", + "version-string": "1.31.8", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b428bbab5141a3..6b02a58c34b1b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -320,6 +320,10 @@ "baseline": "1.1.1", "port-version": 0 }, + "bddisasm": { + "baseline": "1.31.8", + "port-version": 0 + }, "bde": { "baseline": "3.2.0.0", "port-version": 2 From e3087c33b8e8d32a0553e90e4976574a52b8182d Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Fri, 21 May 2021 11:23:03 +0300 Subject: [PATCH 08/19] Replace the control file with a manifest Converted with ./vcpkg format-manifest --- ports/bddisasm/CONTROL | 3 --- ports/bddisasm/vcpkg.json | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 ports/bddisasm/CONTROL create mode 100644 ports/bddisasm/vcpkg.json diff --git a/ports/bddisasm/CONTROL b/ports/bddisasm/CONTROL deleted file mode 100644 index 646d690e6f6864..00000000000000 --- a/ports/bddisasm/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: bddisasm -Version: 1.31.8 -Description: bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator. diff --git a/ports/bddisasm/vcpkg.json b/ports/bddisasm/vcpkg.json new file mode 100644 index 00000000000000..cda3cb1fd48059 --- /dev/null +++ b/ports/bddisasm/vcpkg.json @@ -0,0 +1,5 @@ +{ + "name": "bddisasm", + "version-string": "1.31.8", + "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator." +} From 2cd1a3d9ec933d13be8b9b6839b54664b94353f4 Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Fri, 21 May 2021 11:36:53 +0300 Subject: [PATCH 09/19] Add more details to bddisasm/vcpkg.json Added port-version, license, homepage, documentation, and port mantainers --- ports/bddisasm/vcpkg.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/bddisasm/vcpkg.json b/ports/bddisasm/vcpkg.json index cda3cb1fd48059..a8bc781c4eff58 100644 --- a/ports/bddisasm/vcpkg.json +++ b/ports/bddisasm/vcpkg.json @@ -1,5 +1,12 @@ { "name": "bddisasm", "version-string": "1.31.8", - "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator." + "port-version": 0, + "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator.", + "license": "Apache-2.0", + "homepage": "https://github.com/bitdefender/bddisasm", + "documentation": "https://bddisasm.readthedocs.io/en/latest/", + "maintainers": [ + "Cristi Anichitei " + ] } From a80d6a466ebf511f50c8bb234318a77673d0ea19 Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Fri, 21 May 2021 13:59:43 +0300 Subject: [PATCH 10/19] Fix bddisasm/vcpkg.json --- ports/bddisasm/vcpkg.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ports/bddisasm/vcpkg.json b/ports/bddisasm/vcpkg.json index a8bc781c4eff58..99f9a50ccea420 100644 --- a/ports/bddisasm/vcpkg.json +++ b/ports/bddisasm/vcpkg.json @@ -1,12 +1,9 @@ { "name": "bddisasm", "version-string": "1.31.8", - "port-version": 0, + "maintainers": "Cristi Anichitei ", "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator.", - "license": "Apache-2.0", "homepage": "https://github.com/bitdefender/bddisasm", "documentation": "https://bddisasm.readthedocs.io/en/latest/", - "maintainers": [ - "Cristi Anichitei " - ] + "license": "Apache-2.0" } From 694680c9c442f12d7837baafbda0a66923efc33f Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Sat, 22 May 2021 11:01:34 +0300 Subject: [PATCH 11/19] Fix the version file --- versions/b-/bddisasm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/b-/bddisasm.json b/versions/b-/bddisasm.json index b6210badd9ba98..b86e19bfd8450b 100644 --- a/versions/b-/bddisasm.json +++ b/versions/b-/bddisasm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "718f2441771683db9982e14e9d3dc3c8ec6a2df8", + "git-tree": "618f67286427864ca73e3861e91a2d88d604f805", "version-string": "1.31.8", "port-version": 0 } From 3dfd2fda9d787a1dbf89027483cb804338d0eb3c Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Sat, 22 May 2021 11:58:53 +0300 Subject: [PATCH 12/19] List arm as not supported --- ports/bddisasm/vcpkg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/bddisasm/vcpkg.json b/ports/bddisasm/vcpkg.json index 99f9a50ccea420..39fea4fc8eef6f 100644 --- a/ports/bddisasm/vcpkg.json +++ b/ports/bddisasm/vcpkg.json @@ -5,5 +5,6 @@ "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator.", "homepage": "https://github.com/bitdefender/bddisasm", "documentation": "https://bddisasm.readthedocs.io/en/latest/", - "license": "Apache-2.0" + "license": "Apache-2.0", + "supports": "!arm" } From 419a58cfbece919515d31e97e7f5aaedd3fa410c Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Sat, 22 May 2021 12:07:26 +0300 Subject: [PATCH 13/19] Update version file --- versions/b-/bddisasm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/b-/bddisasm.json b/versions/b-/bddisasm.json index b86e19bfd8450b..34f55727c28347 100644 --- a/versions/b-/bddisasm.json +++ b/versions/b-/bddisasm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "618f67286427864ca73e3861e91a2d88d604f805", + "git-tree": "ec47a13b95291dd3ff61b7a9b9d5f95b3e011d3a", "version-string": "1.31.8", "port-version": 0 } From a84653edc9c94d42c0cef1e702e75aa771ca2ec5 Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Tue, 25 May 2021 10:29:49 +0300 Subject: [PATCH 14/19] Fail install on arm --- ports/bddisasm/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake index 5e8da0cb873e61..aa675037150be7 100644 --- a/ports/bddisasm/portfile.cmake +++ b/ports/bddisasm/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_ARCH "arm") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bitdefender/bddisasm From 11520c42085cd19b4c7536f31ea0eb36307c60e5 Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Tue, 25 May 2021 10:32:47 +0300 Subject: [PATCH 15/19] Use the new vcpkg_cmake_* functions --- ports/bddisasm/portfile.cmake | 14 +++++++------- ports/bddisasm/vcpkg.json | 12 +++++++++++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake index aa675037150be7..9170a320ad5b8f 100644 --- a/ports/bddisasm/portfile.cmake +++ b/ports/bddisasm/portfile.cmake @@ -8,23 +8,23 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA - OPTIONS -DBDD_INCLUDE_TOOL=OFF + OPTIONS + -DBDD_INCLUDE_TOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(INSTALL - ${CURRENT_PORT_DIR}/LICENSE + ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright ) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/bddisasm TARGET_PATH share/bddisasm) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/bddisasm) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/bddisasm/vcpkg.json b/ports/bddisasm/vcpkg.json index 39fea4fc8eef6f..f3485fbb84f262 100644 --- a/ports/bddisasm/vcpkg.json +++ b/ports/bddisasm/vcpkg.json @@ -6,5 +6,15 @@ "homepage": "https://github.com/bitdefender/bddisasm", "documentation": "https://bddisasm.readthedocs.io/en/latest/", "license": "Apache-2.0", - "supports": "!arm" + "supports": "!arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } From 1476f800baac858073e4c32100fda639bcd882b5 Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Tue, 25 May 2021 10:35:23 +0300 Subject: [PATCH 16/19] Remove the LICENSE file --- ports/bddisasm/LICENSE | 201 ----------------------------------------- 1 file changed, 201 deletions(-) delete mode 100644 ports/bddisasm/LICENSE diff --git a/ports/bddisasm/LICENSE b/ports/bddisasm/LICENSE deleted file mode 100644 index 7652714e6d96d7..00000000000000 --- a/ports/bddisasm/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2020 Bitdefender - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. From f669dfbc4bc9c73d99a7b59b955f102a7e1d15d0 Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Tue, 25 May 2021 10:36:35 +0300 Subject: [PATCH 17/19] Fix version --- ports/bddisasm/vcpkg.json | 2 +- versions/baseline.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/bddisasm/vcpkg.json b/ports/bddisasm/vcpkg.json index f3485fbb84f262..9dbf7e0c465f3d 100644 --- a/ports/bddisasm/vcpkg.json +++ b/ports/bddisasm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bddisasm", - "version-string": "1.31.8", + "version": "1.32.1", "maintainers": "Cristi Anichitei ", "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator.", "homepage": "https://github.com/bitdefender/bddisasm", diff --git a/versions/baseline.json b/versions/baseline.json index 6b02a58c34b1b0..490d0efe28e71a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -321,7 +321,7 @@ "port-version": 0 }, "bddisasm": { - "baseline": "1.31.8", + "baseline": "1.32.1", "port-version": 0 }, "bde": { From 4b3260e9ce472f2b20813cd668014872bfdc3195 Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Tue, 25 May 2021 10:37:56 +0300 Subject: [PATCH 18/19] Update version file --- versions/b-/bddisasm.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/b-/bddisasm.json b/versions/b-/bddisasm.json index 34f55727c28347..e425b9696ef549 100644 --- a/versions/b-/bddisasm.json +++ b/versions/b-/bddisasm.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "ec47a13b95291dd3ff61b7a9b9d5f95b3e011d3a", - "version-string": "1.31.8", + "git-tree": "4d196cdb251227836d30031a586ae2baa47452c6", + "version": "1.32.1", "port-version": 0 } ] From 89dacc79daf1483f720697452c201bd9011d9e9d Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Tue, 1 Jun 2021 14:44:23 -0500 Subject: [PATCH 19/19] build only static library bddisasm only supports being built as a static library, so say that in the portfile --- ports/bddisasm/portfile.cmake | 5 ++--- versions/b-/bddisasm.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake index 9170a320ad5b8f..3444aa10fbf8d3 100644 --- a/ports/bddisasm/portfile.cmake +++ b/ports/bddisasm/portfile.cmake @@ -1,4 +1,5 @@ vcpkg_fail_port_install(ON_ARCH "arm") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -26,6 +27,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/bddisasm) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/versions/b-/bddisasm.json b/versions/b-/bddisasm.json index e425b9696ef549..66bde09a4dbc48 100644 --- a/versions/b-/bddisasm.json +++ b/versions/b-/bddisasm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4d196cdb251227836d30031a586ae2baa47452c6", + "git-tree": "252ddf848e0ed2e3c58537bf0cc09bc6ccd067f1", "version": "1.32.1", "port-version": 0 }