Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[scylla wrapper] only windows #22612

Merged
merged 4 commits into from
Jan 18, 2022
Merged

[scylla wrapper] only windows #22612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0894a85
scylla-wrapper only support windows
Mengna-Li Jan 18, 2022
8a251d5
update
Mengna-Li Jan 18, 2022
9680562
add port version
Mengna-Li Jan 18, 2022
d3fdeb0
update
Mengna-Li Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions ports/scylla-wrapper/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,20 @@ vcpkg_from_bitbucket(
HEAD_REF master
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
file(REMOVE
${SOURCE_PATH}/scylla_wrapper_dll/distorm.h
${SOURCE_PATH}/scylla_wrapper_dll/distorm_x64.lib
${SOURCE_PATH}/scylla_wrapper_dll/distorm_x86.lib
"${SOURCE_PATH}/scylla_wrapper_dll/distorm.h"
"${SOURCE_PATH}/scylla_wrapper_dll/distorm_x64.lib"
"${SOURCE_PATH}/scylla_wrapper_dll/distorm_x86.lib"
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS_DEBUG
-DDISABLE_INSTALL_HEADERS=ON
)

vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()

file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/scylla-wrapper RENAME copyright)
file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
9 changes: 7 additions & 2 deletions ports/scylla-wrapper/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
{
"name": "scylla-wrapper",
"version-string": "2018-08-26-16e6f435",
"port-version": 1,
"port-version": 2,
"description": "This is a wrapper around Scylla. It exports functions for IAT fixing, dumping and PE rebuilding. based on https://github.com/NtQuery/Scylla commit 0f6b7198be (v0.9.6b).",
"supports": "windows & !uwp & !arm & !static",
"dependencies": [
"distorm"
"distorm",
{
"name": "vcpkg-cmake",
"host": true
}
]
}
5 changes: 0 additions & 5 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,11 +1295,6 @@ sciter:x64-windows-static-md=fail
sciter:x86-windows=fail
scnlib:arm-uwp=fail
scnlib:x64-uwp=fail
scylla-wrapper:arm-uwp=fail
scylla-wrapper:x64-linux=fail
scylla-wrapper:x64-osx=fail
scylla-wrapper:x64-uwp=fail
scylla-wrapper:x64-windows-static=fail
sdformat10:x64-windows-static-md=fail
sdformat6:arm-uwp=fail
sdformat6:arm64-windows=fail
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6218,7 +6218,7 @@
},
"scylla-wrapper": {
"baseline": "2018-08-26-16e6f435",
"port-version": 1
"port-version": 2
},
"sdformat10": {
"baseline": "10.0.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/scylla-wrapper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c1633de82a41a7dac94c972377145d3bf67b80a4",
"version-string": "2018-08-26-16e6f435",
"port-version": 2
},
{
"git-tree": "358f082e98f164d3b0fdd5ef1a88dc2ec627610e",
"version-string": "2018-08-26-16e6f435",
Expand Down