зеркало из https://github.com/microsoft/vcpkg.git
[getopt-win32] Bump to 1.1.0.20220925 (#33893)
* [getopt-win32] Bump to 1.1.0.20220925 * Update version database
This commit is contained in:
Родитель
f0c6587d89
Коммит
41e267049e
|
@ -1,50 +0,0 @@
|
||||||
commit 81c35ed14e07138e44b5b30f52fbc2bb26ae1fed
|
|
||||||
Author: Max Khon <fjoe@samodelkin.net>
|
|
||||||
Date: Mon Jan 24 23:05:24 2022 +0700
|
|
||||||
|
|
||||||
Rename "extern C" macros as MS VC C++ headers use _END_EXTERN_C macro
|
|
||||||
|
|
||||||
diff --git a/getopt.h b/getopt.h
|
|
||||||
index 5ed4a46..5e33682 100644
|
|
||||||
--- a/getopt.h
|
|
||||||
+++ b/getopt.h
|
|
||||||
@@ -57,12 +57,12 @@ EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
|
||||||
|
|
||||||
// Change behavior for C\C++
|
|
||||||
#ifdef __cplusplus
|
|
||||||
- #define _BEGIN_EXTERN_C extern "C" {
|
|
||||||
- #define _END_EXTERN_C }
|
|
||||||
+ #define _GETOPT_BEGIN_EXTERN_C extern "C" {
|
|
||||||
+ #define _GETOPT_END_EXTERN_C }
|
|
||||||
#define _GETOPT_THROW throw()
|
|
||||||
#else
|
|
||||||
- #define _BEGIN_EXTERN_C
|
|
||||||
- #define _END_EXTERN_C
|
|
||||||
+ #define _GETOPT_BEGIN_EXTERN_C
|
|
||||||
+ #define _GETOPT_END_EXTERN_C
|
|
||||||
#define _GETOPT_THROW
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -81,7 +81,7 @@ EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
|
||||||
#include <string.h>
|
|
||||||
#include <wchar.h>
|
|
||||||
|
|
||||||
-_BEGIN_EXTERN_C
|
|
||||||
+_GETOPT_BEGIN_EXTERN_C
|
|
||||||
|
|
||||||
extern _GETOPT_API int optind;
|
|
||||||
extern _GETOPT_API int opterr;
|
|
||||||
@@ -113,10 +113,10 @@ _BEGIN_EXTERN_C
|
|
||||||
extern _GETOPT_API int getopt_long_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW;
|
|
||||||
extern _GETOPT_API int getopt_long_only_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW;
|
|
||||||
|
|
||||||
-_END_EXTERN_C
|
|
||||||
+_GETOPT_END_EXTERN_C
|
|
||||||
|
|
||||||
- #undef _BEGIN_EXTERN_C
|
|
||||||
- #undef _END_EXTERN_C
|
|
||||||
+ #undef _GETOPT_BEGIN_EXTERN_C
|
|
||||||
+ #undef _GETOPT_END_EXTERN_C
|
|
||||||
#undef _GETOPT_THROW
|
|
||||||
#undef _GETOPT_API
|
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO libimobiledevice-win32/getopt
|
REPO xiaozhuai/getopt-win32
|
||||||
REF 0.1
|
REF b69a586f0b1aa37b77c3cf0a9dedba1900007678
|
||||||
SHA512 40e2a901241a5d751cec741e5de423c8f19b105572c7cae18adb6e69be0b408efc6c9a2ecaeb62f117745eac0d093f30d6b91d88c1a27e1f7be91f0e84fdf199
|
SHA512 6e52b6f198073e85b3a29a2fe21435c591fce02c68cb8cf9b546791dd1197e9b91dd9104af449071b4a1d1485817a483f1989a2e585c2d0470cfd079290fe155
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES getopt.h.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
|
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
|
||||||
|
@ -18,8 +17,8 @@ file(COPY "${SOURCE_PATH}/getopt.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include
|
||||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||||
vcpkg_replace_string(
|
vcpkg_replace_string(
|
||||||
"${CURRENT_PACKAGES_DIR}/include/getopt.h"
|
"${CURRENT_PACKAGES_DIR}/include/getopt.h"
|
||||||
" #define __GETOPT_H_"
|
"defined(STATIC_GETOPT)"
|
||||||
" #define __GETOPT_H_\n #define STATIC_GETOPT"
|
"1"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -29,6 +28,7 @@ vcpkg_cmake_config_fixup(
|
||||||
)
|
)
|
||||||
|
|
||||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||||
|
|
||||||
|
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||||
configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
|
|
||||||
set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS "enabled")
|
set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS "enabled")
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
{
|
{
|
||||||
"name": "getopt-win32",
|
"name": "getopt-win32",
|
||||||
"version": "0.1",
|
"version": "1.1.0.20220925",
|
||||||
"port-version": 7,
|
|
||||||
"description": "An implementation of getopt.",
|
"description": "An implementation of getopt.",
|
||||||
"homepage": "https://github.com/libimobiledevice-win32/getopt",
|
"homepage": "https://www.codeproject.com/Articles/157001/Full-getopt-Port-for-Unicode-and-Multibyte-Microso/",
|
||||||
"license": "LGPL-3.0-only",
|
"license": "LGPL-3.0-only",
|
||||||
"supports": "windows & !mingw",
|
"supports": "windows & !mingw",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
|
|
@ -2845,8 +2845,8 @@
|
||||||
"port-version": 3
|
"port-version": 3
|
||||||
},
|
},
|
||||||
"getopt-win32": {
|
"getopt-win32": {
|
||||||
"baseline": "0.1",
|
"baseline": "1.1.0.20220925",
|
||||||
"port-version": 7
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"gettext": {
|
"gettext": {
|
||||||
"baseline": "0.21.1",
|
"baseline": "0.21.1",
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "d735f424134507a2d87a4ab6d5a8d768ca555dbc",
|
||||||
|
"version": "1.1.0.20220925",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "28d4331693c8c94a354365fff55df5f5762b7be6",
|
"git-tree": "28d4331693c8c94a354365fff55df5f5762b7be6",
|
||||||
"version": "0.1",
|
"version": "0.1",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче