From 2dd657c148457b5262f7900dc75708d2ddb695f6 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 29 Apr 2020 01:06:32 -0400 Subject: refactor shlib_deps_objdump to become a generic objdump-er --- include/shlib.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/shlib.h b/include/shlib.h index 68b8487..8037fa6 100644 --- a/include/shlib.h +++ b/include/shlib.h @@ -18,6 +18,8 @@ #define SPM_SHLIB_EXTENSION ".so" #endif +char *objdump(const char *_filename, char *_args); +char *shlib_rpath(const char *filename); StrList *shlib_deps(const char *_filename); #endif //SPM_SHLIB_H -- cgit From 0ab16882195aa593eace74a7a54117df364b12e7 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 1 May 2020 01:23:21 -0400 Subject: Add SPM_ERR_NOT_IMPLEMENTED error type --- include/error_handler.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/error_handler.h b/include/error_handler.h index e58698e..eaf6420 100644 --- a/include/error_handler.h +++ b/include/error_handler.h @@ -17,6 +17,7 @@ #define SPM_ERR_MANIFEST_INVALID _SPM_ERR(7) // manifest file is invalid (no header) #define SPM_ERR_MANIFEST_EMPTY _SPM_ERR(8) // manifest file has no data #define SPM_ERR_PARSE _SPM_ERR(9) // general parsing error +#define SPM_ERR_NOT_IMPLEMENTED _SPM_ERR(10) // not implemented (does exist on this platform) extern int spmerrno; extern const char *SPM_ERR_STRING[]; -- cgit From 3ffccce8e696b85cf105313efff7334b5c4be20e Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 1 May 2020 01:23:55 -0400 Subject: Add install_name_tool and Darwin specific branches --- include/rpath.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/rpath.h b/include/rpath.h index 46bdbec..2a33bea 100644 --- a/include/rpath.h +++ b/include/rpath.h @@ -5,6 +5,7 @@ #define SPM_RPATH_H Process *patchelf(const char *_filename, const char *_args); +Process *install_name_tool(const char *_filename, const char *_args); FSTree *rpath_libraries_available(const char *root); char *rpath_autodetect(const char *filename, FSTree *tree); int has_rpath(const char *_filename); -- cgit From 28e739017b9b4bc70555d6cef0bcaf36c1bd75c2 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 1 May 2020 01:24:33 -0400 Subject: Use OS_DARWIN, not OS_APPLE --- include/shlib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/shlib.h b/include/shlib.h index 8037fa6..6ae9bb1 100644 --- a/include/shlib.h +++ b/include/shlib.h @@ -8,7 +8,7 @@ #define SPM_SHLIB_EXEC "dumpbin" #define SPM_SHLIB_EXEC_ARGS "/dependents" #define SPM_SHLIB_EXTENSION ".dll" -#elif OS_APPLE +#elif OS_DARWIN #define SPM_SHLIB_EXEC "/usr/bin/objdump" #define SPM_SHLIB_EXEC_ARGS "-macho -p" #define SPM_SHLIB_EXTENSION ".dylib" -- cgit From dd52042d9a243d2e3bff3991b310c67138d15157 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 1 May 2020 01:25:23 -0400 Subject: Add generic OS_SUPPORTED define --- include/spm.h | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/spm.h b/include/spm.h index 5382378..7ea2959 100644 --- a/include/spm.h +++ b/include/spm.h @@ -8,16 +8,24 @@ #define OS_DARWIN 0 #define OS_WINDOWS 0 #define OS_LINUX 0 +#define OS_SUPPORTED 0 #if defined(__APPLE__) && defined(__MACH__) -#undef OS_DARWIN -#define OS_DARWIN 1 +# undef OS_DARWIN +# define OS_DARWIN 1 +# undef OS_SUPPORTED +# define OS_SUPPORTED 1 + +// TODO: Windows is not supported at all yet, so OS_SUPPORTED is untouched #elif defined(_WIN32) -#undef OS_WINDOWS -#define OS_WINDOWS 1 +# undef OS_WINDOWS +# define OS_WINDOWS 1 + #elif defined(__linux) || defined(__linux__) -#undef OS_LINUX -#define OS_LINUX 1 +# undef OS_LINUX +# define OS_LINUX 1 +# undef OS_SUPPORTED +# define OS_SUPPORTED 1 #endif #include -- cgit From 199eb66acc6ceee4c06a9085c72c7b44a05faf1d Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 7 May 2020 01:04:23 -0400 Subject: Remove unused md5 header --- include/checksum.h | 1 - include/spm.h | 1 - 2 files changed, 2 deletions(-) (limited to 'include') diff --git a/include/checksum.h b/include/checksum.h index 780ee97..5309527 100644 --- a/include/checksum.h +++ b/include/checksum.h @@ -4,7 +4,6 @@ #ifndef SPM_CHECKSUM_H #define SPM_CHECKSUM_H -char *md5sum(const char *filename); char *sha256sum(const char *filename); #endif //SPM_CHECKSUM_H diff --git a/include/spm.h b/include/spm.h index 7ea2959..e0e713f 100644 --- a/include/spm.h +++ b/include/spm.h @@ -40,7 +40,6 @@ #include #include #include -#include #include #if !OS_WINDOWS -- cgit From eb2a0eb241e6a187b93aeef3f737b60657758384 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 7 May 2020 01:04:44 -0400 Subject: Add missing error_handler.h --- include/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 68ca824..1009b96 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -6,6 +6,7 @@ install( compat.h conf.h environment.h + error_handler.h find.h fs.h install.h -- cgit