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.

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

[mmloader] Fix supports #25232

Merged
merged 8 commits into from
Jun 14, 2022
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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: 5 additions & 12 deletions ports/mmloader/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# source
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tishion/mmLoader
Expand All @@ -7,27 +8,19 @@ vcpkg_from_github(
HEAD_REF master
)

# feature
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
shellcode BUILD_SHELLCODE_GEN
)

# config
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
)

# pre-clean
file(REMOVE_RECURSE "${SOURCE_PATH}/output")

# build and install
vcpkg_install_cmake(DISABLE_PARALLEL)
vcpkg_cmake_install(DISABLE_PARALLEL)

# remove the debug/include directory
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

# collect license files
file(INSTALL "${SOURCE_PATH}/License" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
13 changes: 10 additions & 3 deletions ports/mmloader/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
{
"name": "mmloader",
"version-date": "2021-12-13",
"port-version": 1,
"version": "1.0.1",
"port-version": 2,
"description": "A library for loading dll module bypassing windows PE loader from memory (x86/x64)",
"homepage": "http://tishion.github.io/mmLoader/",
"supports": "(x86 | x64) & windows & static",
"license": "MIT",
"supports": "(x86 | x64) & windows & !uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
}
],
"features": {
"shellcode": {
"description": "Generate mmLoader shell code headers"
Expand Down
7 changes: 0 additions & 7 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -654,13 +654,6 @@ microsoft-signalr:x64-windows-static-md=skip
microsoft-signalr:x86-windows=skip
# https://github.com/mlpack/mlpack/pull/2945
mlpack:x64-uwp=fail
mmloader:arm64-windows=fail
mmloader:arm-uwp=fail
mmloader:x64-linux=fail
mmloader:x64-osx=fail
mmloader:x64-uwp=fail
mmloader:x64-windows=fail
mmloader:x86-windows=fail
# mmx installs many problematic headers, such as `json.h` and `sched.h`
mmx:x64-windows=skip
mmx:x64-windows-static=skip
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4601,8 +4601,8 @@
"port-version": 5
},
"mmloader": {
"baseline": "2021-12-13",
"port-version": 1
"baseline": "1.0.1",
"port-version": 2
},
"mmx": {
"baseline": "2019-09-29",
Expand Down
9 changes: 7 additions & 2 deletions versions/m-/mmloader.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
{
"versions": [
{
"git-tree": "4b102ccdbd92919d2f3f62fff55b2a51839199ad",
"version": "1.0.1",
"port-version": 2
},
{
"git-tree": "104d16ae01f6ae753fde8406f75a01b9353aa1f2",
"version-date": "2021-12-13",
"version": "1.0.1",
"port-version": 1
},
{
"git-tree": "030c251ff729f1063950f5473cf393125f888ca2",
"version-date": "2021-12-13",
"version": "1.0.1",
Thomas1664 marked this conversation as resolved.
Show resolved Hide resolved
"port-version": 0
},
{
Expand Down