early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,35 @@
From 6594abbd953d0e26105fd6c982990eb702f27804 Mon Sep 17 00:00:00 2001
From: Nicole Mazzuca <mazzucan@outlook.com>
Date: Tue, 22 Sep 2020 15:22:00 -0700
Subject: [PATCH 1/2] fix install dirs
---
src/CMakeLists.txt | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 773c4c8..03e112c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,4 @@
-# for now, install in subdirectory of source directory by default
-SET( CMAKE_INSTALL_PREFIX .. )
+include(GNUInstallDirs)
IF( WIN32 )
ADD_LIBRARY( argtable2 arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c )
@@ -7,5 +6,9 @@ ELSE( WIN32 )
ADD_LIBRARY( argtable2 arg_date.c arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_rex.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c )
ENDIF( WIN32 )
-INSTALL( TARGETS argtable2 ARCHIVE DESTINATION lib)
-SET_TARGET_PROPERTIES( argtable2 PROPERTIES DEBUG_POSTFIX d )
+INSTALL(TARGETS argtable2
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+INSTALL(FILES argtable2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
--
2.24.3 (Apple Git-128)

View File

@@ -0,0 +1,60 @@
From 271423adb2900c8bf4aad5d73d7ef1efbb5c35d8 Mon Sep 17 00:00:00 2001
From: Nicole Mazzuca <mazzucan@outlook.com>
Date: Tue, 22 Sep 2020 15:17:18 -0700
Subject: [PATCH 2/2] include correct headers
---
src/arg_date.c | 4 +++-
src/arg_int.c | 1 +
src/getopt.c | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/arg_date.c b/src/arg_date.c
index 22b59e2..5004b42 100644
--- a/src/arg_date.c
+++ b/src/arg_date.c
@@ -37,6 +37,8 @@ USA.
#include <strings.h>
#endif
+#include <string.h>
+
#include "argtable2.h"
/* local error codes */
@@ -112,7 +114,7 @@ static void errorfn(struct arg_date *parent, FILE *fp, int errorcode, const char
char buff[200];
fprintf(fp,"illegal timestamp format \"%s\"\n",argval);
- bzero(&tm,sizeof(tm));
+ memset(&tm, 0, sizeof(tm));
strptime("1999-12-31 23:59:59","%F %H:%M:%S",&tm);
strftime(buff, sizeof(buff), parent->format, &tm);
printf("correct format is \"%s\"\n", buff);
diff --git a/src/arg_int.c b/src/arg_int.c
index 29c20e5..bc10012 100644
--- a/src/arg_int.c
+++ b/src/arg_int.c
@@ -30,6 +30,7 @@ USA.
#include "argtable2.h"
#include <limits.h>
+#include <ctype.h>
/* local error codes */
enum {EMINCOUNT=1,EMAXCOUNT,EBADINT,EOVERFLOW};
diff --git a/src/getopt.c b/src/getopt.c
index b208529..b13acc6 100644
--- a/src/getopt.c
+++ b/src/getopt.c
@@ -47,6 +47,7 @@
#endif
#include <stdio.h>
+#include <string.h>
/* Comment out all this code if we are using the GNU C Library, and are not
actually compiling the library itself. This code is part of the GNU C
--
2.24.3 (Apple Git-128)

View File

@@ -0,0 +1,26 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH
REPO argtable/argtable
REF argtable-2.13
FILENAME "argtable2-13.tar.gz"
SHA512 3d8303f3ba529e3241d918c0127a16402ece951efb964d14a06a3a7d29a252812ad3c44e96da28798871e9923e73a2cfe7ebc84139c1397817d632cae25c4585
PATCHES
0001-fix-install-dirs.patch
0002-include-correct-headers.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DCMAKE_DEBUG_POSTFIX=d
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

8
externals/vcpkg/ports/argtable2/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,8 @@
{
"name": "argtable2",
"version-string": "2.13",
"port-version": 9,
"description": "Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss.",
"homepage": "http://argtable.sourceforge.net",
"supports": "!uwp"
}