mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 10:28:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[rttr] Fix executables. Fix read-only permissions.

Browse Source
This commit is contained in:
Robert Schumacher 2018-03-08 23:51:55 -08:00
parent a506559ba9
commit 965e99cf26
4 changed files with 66 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/rttr/CONTROL
View File

@ -1,3 +1,3 @@
Source: rttr
Version: 0.9.5-1
Version: 0.9.5-2
Description: an easy and intuitive way to use reflection in C++

9
ports/rttr/portfile.cmake
View File

@ -20,6 +20,7 @@ vcpkg_apply_patches(
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/fix-directory-output.patch"
"${CMAKE_CURRENT_LIST_DIR}/disable-unit-tests.patch"
"${CMAKE_CURRENT_LIST_DIR}/remove-owner-read-perms.patch"
)
vcpkg_configure_cmake(
@ -31,6 +32,14 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
file(GLOB REL_EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
file(GLOB DBG_EXES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
if(REL_EXES)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/rttr)
file(COPY ${REL_EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/rttr)
endif()
file(REMOVE ${REL_EXES} ${DBG_EXES})
#Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rttr)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/rttr/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/rttr/copyright)

41
ports/rttr/remove-owner-read-perms.patch Normal file
View File

@ -0,0 +1,41 @@
diff --git a/CMake/config.cmake b/CMake/config.cmake
index 1d753b3..393e3d0 100644
--- a/CMake/config.cmake
+++ b/CMake/config.cmake
@@ -131,4 +131,4 @@ install(
install(FILES "${LICENSE_FILE}" "${README_FILE}"
DESTINATION "."
- PERMISSIONS OWNER_READ)
+ )
diff --git a/CMake/utility.cmake b/CMake/utility.cmake
index 9dbc172..c37671e 100644
--- a/CMake/utility.cmake
+++ b/CMake/utility.cmake
@@ -165,7 +165,7 @@ function(loadFolder FOLDER _HEADER_FILES _SOURCE_FILES)
# we don't want to install header files which are marked as private
if (${shouldInstall})
if (NOT ${FULL_HEADER_PATH} MATCHES ".*_p.h$")
- install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}" PERMISSIONS OWNER_READ)
+ install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}")
endif()
endif()
endforeach()
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index ec10eaf..454c41e 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -127,11 +127,11 @@ add_custom_target(doc ALL
install(DIRECTORY "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_CUSTOM_HTML_DIR}"
DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}"
PATTERN "*.*"
- PERMISSIONS OWNER_READ)
+ )
install(FILES "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_INDEX_FILE}"
DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}"
- PERMISSIONS OWNER_READ)
+ )
#########################################################################################

19
toolsrc/src/vcpkg/remove.cpp
View File

@ -58,7 +58,7 @@ namespace vcpkg::Remove
const auto status = fs.status(target, ec);
if (ec)
{
System::println(System::Color::error, "failed: %s", ec.message());
System::println(System::Color::error, "failed: status(%s): %s", target.u8string(), ec.message());
continue;
}
@ -71,12 +71,23 @@ namespace vcpkg::Remove
fs.remove(target, ec);
if (ec)
{
System::println(System::Color::error, "failed: %s: %s", target.u8string(), ec.message());
#if defined(_WIN32)
fs::stdfs::permissions(target, fs::stdfs::perms::owner_all | fs::stdfs::perms::group_all, ec);
fs.remove(target, ec);
if (ec)
{
System::println(
System::Color::error, "failed: remove(%s): %s", target.u8string(), ec.message());
}
#else
System::println(
System::Color::error, "failed: remove(%s): %s", target.u8string(), ec.message());
#endif
}
}
else if (!fs::status_known(status))
else if (!fs::stdfs::exists(status))
{
System::println(System::Color::warning, "Warning: unknown status: %s", target.u8string());
System::println(System::Color::warning, "Warning: %s: file not found", target.u8string());
}
else
{