Skip to content

Commit aa0598a

Browse files
SamuelMarksSamuelMarks
committed
[acquire/acquire_miniz.h] Add two levels of guards to match .h .c split expectations ; [acquire/CMakeLists.txt] Carefully handle gen_acquire_extract associated .c file ; [vcpkg.json] Depend on kubazip ; [*.h,*.c] clang-format --style=LLVM 
1 parent 15ab408 commit aa0598a

File tree

12 files changed

+86
-68
lines changed

12 files changed

+86
-68
lines changed

‎acquire/CMakeLists.txt‎

Lines changed: 57 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,17 @@ else ()
124124
endif ()
125125
list(APPEND header_impls "${CHECKSUM_SRC}")
126126

127+
if (LIBACQUIRE_USE_LIBARCHIVE)
128+
set(ARCHIVE_LIB "acquire_libarchive.h")
129+
set(ARCHIVE_LIB_LINK "${LibArchive_LIBRARIES}")
130+
elseif (LIBACQUIRE_USE_MINIZ)
131+
set(ARCHIVE_LIB "acquire_miniz.h")
132+
set(ARCHIVE_LIB_LINK kubazip::kubazip)
133+
elseif (NOT DEFINED ARCHIVE_LIB)
134+
message(FATAL_ERROR "ARCHIVE_LIB must be set")
135+
endif ()
136+
list(APPEND header_impls "${ARCHIVE_LIB}")
137+
127138
message(STATUS "header_impls = ${header_impls}")
128139

129140
foreach (header_file IN LISTS header_impls)
@@ -136,8 +147,10 @@ else ()
136147
set(associated_header "gen_acquire_download.h")
137148
elseif (header_file STREQUAL CHECKSUM_SRC)
138149
# set(associated_header "gen_acquire_checksums.h")
139-
else (header_file STREQUAL CHECKSUM_SRC_CRC32c)
150+
elseif (header_file STREQUAL CHECKSUM_SRC_CRC32c)
140151
#
152+
elseif (header_file STREQUAL ARCHIVE_LIB)
153+
set(associated_header "gen_acquire_extract.h")
141154
endif ()
142155

143156
generate_header_and_source_from_header_only(
@@ -174,31 +187,31 @@ else ()
174187
#############
175188
if (src MATCHES "/gen_acquire_checksums.c$")
176189
# if (NOT ("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
177-
set_source_files_properties(
178-
${src} PROPERTIES
179-
COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1"
180-
)
181-
# list(APPEND impls "LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL")
190+
set_source_files_properties(
191+
${src} PROPERTIES
192+
COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1"
193+
)
194+
# list(APPEND impls "LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL")
182195
# endif (NOT ("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
183196
elseif (src MATCHES "/gen_acquire_crc32c.c$")
184-
if (NOT("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
197+
if (NOT ("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
185198
set_source_files_properties(
186199
${src} PROPERTIES
187200
COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL=1;LIBACQUIRE_USE_CRC32C=1;LIBACQUIRE_ACQUIRE_CRC32C_IMPL=1"
188201
)
189202
list(APPEND impls "LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" "LIBACQUIRE_USE_CRC32C" "LIBACQUIRE_ACQUIRE_CRC32C_IMPL")
190-
endif (NOT("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
203+
endif (NOT ("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
191204
elseif (src MATCHES "/gen_acquire_librhash.c$")
192-
if (NOT("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
205+
if (NOT ("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
193206
set_source_files_properties(
194207
${src} PROPERTIES
195208
COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL=1;LIBACQUIRE_USE_LIBRHASH=1"
196209
)
197210
list(APPEND impls "LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" "LIBACQUIRE_USE_LIBRHASH")
198-
endif (NOT("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
199-
#############
200-
# Fileutils #
201-
#############
211+
endif (NOT ("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
212+
#############
213+
# Fileutils #
214+
#############
202215
elseif (src MATCHES "/gen_acquire_fileutils.c$")
203216
if (NOT ("LIBACQUIRE_ACQUIRE_FILEUTILS_IMPL" IN_LIST impls))
204217
set_source_files_properties(
@@ -207,9 +220,9 @@ else ()
207220
)
208221
list(APPEND impls "LIBACQUIRE_ACQUIRE_FILEUTILS_IMPL")
209222
endif (NOT ("LIBACQUIRE_ACQUIRE_FILEUTILS_IMPL" IN_LIST impls))
210-
#################
211-
# String extras #
212-
#################
223+
#################
224+
# String extras #
225+
#################
213226
elseif (src MATCHES "/gen_acquire_string_extras.c$")
214227
set_source_files_properties(
215228
${src} PROPERTIES
@@ -220,17 +233,17 @@ else ()
220233
${src} PROPERTIES
221234
COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1"
222235
)
223-
##################
224-
# Network common #
225-
##################
236+
##################
237+
# Network common #
238+
##################
226239
elseif (src MATCHES "/gen_acquire_net_common.c$")
227240
set_source_files_properties(
228241
${src} PROPERTIES
229242
COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1"
230243
)
231-
##############
232-
# Networking #
233-
##############
244+
##############
245+
# Networking #
246+
##############
234247
elseif (src MATCHES "/gen_acquire_libcurl.c$")
235248
if (NOT ("LIBACQUIRE_DOWNLOAD_DIR_IMPL" IN_LIST impls))
236249
set_source_files_properties(
@@ -263,25 +276,25 @@ else ()
263276
)
264277
list(APPEND impls "LIBACQUIRE_DOWNLOAD_DIR_IMPL" "LIBACQUIRE_DOWNLOAD_IMPL" "LIBACQUIRE_USE_OPENBSD_FTP")
265278
endif (NOT ("LIBACQUIRE_DOWNLOAD_DIR_IMPL" IN_LIST impls))
266-
###########
267-
# Extract #
268-
###########
279+
###########
280+
# Extract #
281+
###########
269282
elseif (src MATCHES "/gen_acquire_extract.c$")
270283
# For extract, could detect MINIZ or LIBARCHIVE.
271284
# NOTE: only one .c file is generated so not `IN_LIST impls` required
272285
if (LIBACQUIRE_USE_MINIZ)
273286
set_source_files_properties(${src} PROPERTIES
274-
COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;LIBACQUIRE_USE_MINIZ=1")
287+
COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;LIBACQUIRE_EXTRACT_IMPL=1;LIBACQUIRE_USE_MINIZ=1")
275288
elseif (LIBACQUIRE_USE_LIBARCHIVE)
276289
set_source_files_properties(${src} PROPERTIES
277-
COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;LIBACQUIRE_USE_LIBARCHIVE=1")
290+
COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;LIBACQUIRE_EXTRACT_IMPL=1;LIBACQUIRE_USE_LIBARCHIVE=1")
278291
else ()
279292
set_source_files_properties(${src} PROPERTIES
280-
COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1")
293+
COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;LIBACQUIRE_EXTRACT_IMPL=1")
281294
endif ()
282-
############
283-
# Fallback #
284-
############
295+
############
296+
# Fallback #
297+
############
285298
else ()
286299
message(STATUS "Nothing special with ${src}")
287300
set_source_files_properties(${src} PROPERTIES COMPILE_DEFINITIONS "")
@@ -337,15 +350,20 @@ else ()
337350
message(STATUS "[libacquire] Using var ${CHECKSUM_LIBRARIES} for checksums")
338351
target_link_libraries("${LIBRARY_NAME}" PUBLIC "${CHECKSUM_LIBRARIES}")
339352
target_compile_definitions("${LIBRARY_NAME}" PRIVATE "${CHECKSUM_LIBRARIES_USE}=1")
340-
elseif (LIBACQUIRE_USE_LIBRHASH)
353+
elseif (LIBACQUIRE_USE_CRC32C)
354+
message(STATUS "[libacquire] Using internal CRC32C implementation")
355+
target_compile_definitions("${LIBRARY_NAME}" PRIVATE LIBACQUIRE_USE_CRC32C=1)
356+
else ()
357+
message(FATAL_ERROR "No checksum implementation selected: define `LIBACQUIRE_USE_LIBRHASH` or `LIBACQUIRE_USE_CRC32C`")
358+
endif ()
359+
360+
if (LIBACQUIRE_USE_LIBRHASH)
341361
message(STATUS "[libacquire] Using LibRHash for checksums")
342362

343363
find_package(LibRHash REQUIRED)
344364
target_compile_definitions("${LIBRARY_NAME}" PRIVATE LIBACQUIRE_USE_LIBRHASH=1)
345365

346366
get_target_property(linked_libs "${LIBRARY_NAME}" LINK_LIBRARIES)
347-
message(STATUS "linked_libs = ${linked_libs}")
348-
message(STATUS "CHECKSUM_LIBRARIES at here is ${CHECKSUM_LIBRARIES}")
349367
list(FIND linked_libs "${LibRHash_LIBRARIES}" lib_index)
350368
if (lib_index EQUAL -1)
351369
target_include_directories("${LIBRARY_NAME}" PUBLIC "${LibRHash_INCLUDE_DIRS}")
@@ -354,11 +372,10 @@ else ()
354372
else ()
355373
message(STATUS "${LIBRARY_NAME} already linked with '${_lib}'")
356374
endif (lib_index EQUAL -1)
357-
elseif (LIBACQUIRE_USE_CRC32C)
358-
message(STATUS "[libacquire] Using internal CRC32C implementation")
359-
target_compile_definitions("${LIBRARY_NAME}" PRIVATE LIBACQUIRE_USE_CRC32C=1)
360-
else ()
361-
message(FATAL_ERROR "No checksum implementation selected: define `LIBACQUIRE_USE_LIBRHASH` or `LIBACQUIRE_USE_CRC32C`")
375+
elseif (LIBACQUIRE_USE_MINIZ)
376+
find_package(kubazip CONFIG REQUIRED)
377+
target_compile_definitions("${LIBRARY_NAME}" PRIVATE LIBACQUIRE_USE_MINIZ=1)
378+
target_link_libraries("${EXEC_NAME}" PRIVATE kubazip::kubazip)
362379
endif ()
363380

364381
if (NOT BSD)
@@ -380,7 +397,6 @@ else ()
380397
"$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/acquire>"
381398
"$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/gen>"
382399
"$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>"
383-
"$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/third_party/miniz>"
384400
"$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/acquire>"
385401
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
386402
)
@@ -436,7 +452,7 @@ include(GenerateExportHeader)
436452
set(_export_file "${CMAKE_CURRENT_BINARY_DIR}/lib${LIBRARY_NAME}_export.h")
437453

438454
if (1)
439-
# pass
455+
# pass
440456
elseif (LIBACQUIRE_HEADER_ONLY)
441457
file(WRITE "${_export_file}"
442458
"#ifndef LIBACQUIRE_EXPORT_H\n"

‎acquire/acquire_download.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ extern "C" {
3434
#elif defined(LIBACQUIRE_USE_WINCRYPT) && LIBACQUIRE_USE_WINCRYPT
3535
#include "acquire_wincrypt.h"
3636
#endif /* (defined(LIBACQUIRE_USE_COMMON_CRYPTO) && \
37-
LIBACQUIRE_USE_COMMON_CRYPTO) || (defined(LIBACQUIRE_USE_OPENSSL) && \
37+
LIBACQUIRE_USE_COMMON_CRYPTO) || (defined(LIBACQUIRE_USE_OPENSSL) && \
3838
LIBACQUIRE_USE_OPENSSL) */
3939

4040
extern LIBACQUIRE_EXPORT const char *get_download_dir(void);

‎acquire/acquire_librhash.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ HASHES
114114
}
115115
#endif /* __cplusplus */
116116

117-
#endif /* defined(LIBACQUIRE_IMPLEMENTATION) && defined(LIBACQUIRE_USE_LIBRHASH) && \
118-
LIBACQUIRE_USE_LIBRHASH && defined(LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL) */
117+
#endif /* defined(LIBACQUIRE_IMPLEMENTATION) && \
118+
defined(LIBACQUIRE_USE_LIBRHASH) && LIBACQUIRE_USE_LIBRHASH && \
119+
defined(LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL) */
119120

120121
#endif /* !LIBACQUIRE_ACQUIRE_LIBRHASH_H */

‎acquire/acquire_miniz.h‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#if !defined(LIBACQUIRE_ACQUIRE_MINIZ_H) && defined(LIBACQUIRE_USE_MINIZ) && \
2-
LIBACQUIRE_USE_MINIZ && defined(LIBACQUIRE_IMPLEMENTATION) && \
3-
!defined(LIBACQUIRE_EXTRACT_IMPL)
1+
#ifndef LIBACQUIRE_ACQUIRE_MINIZ_H
42
#define LIBACQUIRE_ACQUIRE_MINIZ_H
5-
#define LIBACQUIRE_EXTRACT_IMPL
3+
4+
#if defined(LIBACQUIRE_USE_MINIZ) && LIBACQUIRE_USE_MINIZ && \
5+
defined(LIBACQUIRE_IMPLEMENTATION) && defined(LIBACQUIRE_EXTRACT_IMPL)
66

77
#ifdef __cplusplus
88
extern "C" {
@@ -11,7 +11,7 @@ extern "C" {
1111
#include <stdio.h>
1212
#include <stdlib.h>
1313

14-
#include <zip.h>
14+
#include <kubazip/zip/zip.h>
1515

1616
#include "acquire_errors.h"
1717
#include "acquire_extract.h"
@@ -42,7 +42,8 @@ int extract_archive(enum Archive archive, const char *archive_filepath,
4242
}
4343
#endif /* __cplusplus */
4444

45-
#endif /* !defined(LIBACQUIRE_ACQUIRE_MINIZ_H) && \
46-
defined(LIBACQUIRE_USE_MINIZ) && LIBACQUIRE_USE_MINIZ && \
45+
#endif /* defined(LIBACQUIRE_USE_MINIZ) && LIBACQUIRE_USE_MINIZ && \
4746
defined(LIBACQUIRE_IMPLEMENTATION) && \
48-
!defined(LIBACQUIRE_EXTRACT_IMPL) */
47+
defined(LIBACQUIRE_EXTRACT_IMPL) */
48+
49+
#endif /* !LIBACQUIRE_ACQUIRE_MINIZ_H */

‎acquire/acquire_openssl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ extern "C" {
5252
#define SHA512_BLOCK_BYTES (SHA256_BLOCK_BYTES * 2)
5353

5454
#endif /* (defined(LIBACQUIRE_USE_COMMON_CRYPTO) && \
55-
LIBACQUIRE_USE_COMMON_CRYPTO) || (defined(LIBACQUIRE_USE_OPENSSL) && \
55+
LIBACQUIRE_USE_COMMON_CRYPTO) || (defined(LIBACQUIRE_USE_OPENSSL) && \
5656
LIBACQUIRE_USE_OPENSSL) */
5757

5858
#include <errno.h>

‎acquire/acquire_wincrypt.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,5 +147,5 @@ bool sha512(const char *filename, const char *hash) {
147147
#endif /* __cplusplus */
148148

149149
#endif /* !defined(LIBACQUIRE_WINCRYPT_H) && defined(LIBACQUIRE_USE_WINCRYPT) \
150-
&& LIBACQUIRE_USE_WINCRYPT && defined(LIBACQUIRE_IMPLEMENTATION) && \
150+
&& LIBACQUIRE_USE_WINCRYPT && defined(LIBACQUIRE_IMPLEMENTATION) && \
151151
defined(LIBACQUIRE_CRYPTO_IMPL) */

‎acquire/acquire_wininet.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ extern "C" {
1919
#include "acquire_stdbool.h"
2020
#endif /* __cplusplus */
2121

22-
#include "acquire_config.h"
2322
#include "acquire_checksums.h"
23+
#include "acquire_config.h"
2424

2525
#ifndef NAME_MAX
2626
#ifdef PATH_MAX

‎acquire/acquire_winseccng.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,6 @@ void __cdecl wmain(int argc, __in_ecount(argc) LPWSTR *wargv) {
125125
#endif /* __cplusplus */
126126

127127
#endif /* !defined(LIBACQUIRE_WINSECCNG_H) && \
128-
defined(LIBACQUIRE_USE_WINSECCNG) && LIBACQUIRE_USE_WINSECCNG \
128+
defined(LIBACQUIRE_USE_WINSECCNG) && LIBACQUIRE_USE_WINSECCNG \
129129
defined(LIBACQUIRE_IMPLEMENTATION) && \
130130
defined(LIBACQUIRE_CRYPTO_IMPL) */

‎acquire/cli/main.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
#include <acquire_openssl.h>
4343
#elif defined(LIBACQUIRE_USE_WINCRYPT) && LIBACQUIRE_USE_WINCRYPT
4444
#include <acquire_wincrypt.h>
45-
#endif /* (defined(LIBACQUIRE_USE_OPENSSL) && LIBACQUIRE_USE_OPENSSL) || \
46-
(defined(LIBACQUIRE_USE_LIBRESSL) && LIBACQUIRE_USE_LIBRESSL) || \
47-
(defined(LIBACQUIRE_USE_COMMON_CRYPTO) && \
48-
LIBACQUIRE_USE_COMMON_CRYPTO)
45+
#endif /* (defined(LIBACQUIRE_USE_OPENSSL) && LIBACQUIRE_USE_OPENSSL) || \
46+
(defined(LIBACQUIRE_USE_LIBRESSL) && LIBACQUIRE_USE_LIBRESSL) || \
47+
(defined(LIBACQUIRE_USE_COMMON_CRYPTO) && \
48+
LIBACQUIRE_USE_COMMON_CRYPTO) \
4949
*/
5050

5151
#if defined(LIBACQUIRE_USE_MINIZ) && LIBACQUIRE_USE_MINIZ

‎acquire/tests/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ foreach (EXEC_NAME ${_targets})
131131
)
132132

133133
if (LIBACQUIRE_USE_MINIZ)
134-
find_package(zip CONFIG REQUIRED)
135-
target_link_libraries("${EXEC_NAME}" PRIVATE "zip")
134+
find_package(kubazip CONFIG REQUIRED)
135+
target_link_libraries("${EXEC_NAME}" PRIVATE kubazip::kubazip)
136136
message(STATUS "LINKING zip here")
137137
endif (LIBACQUIRE_USE_MINIZ)
138138

@@ -172,8 +172,8 @@ foreach (ARCHIVE_LIB ${_archives})
172172
set_source_files_properties("test_extract.c"
173173
PROPERTIES COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;LIBACQUIRE_USE_MINIZ=1")
174174

175-
find_package(zip CONFIG REQUIRED)
176-
target_link_libraries("${EXEC_NAME}" PRIVATE "zip")
175+
find_package(kubazip CONFIG REQUIRED)
176+
target_link_libraries("${EXEC_NAME}" PRIVATE kubazip::kubazip)
177177
message(STATUS "LINKING zip")
178178
elseif (LIBACQUIRE_USE_LIBARCHIVE)
179179
set_source_files_properties("test_extract.c"
@@ -197,7 +197,7 @@ foreach (ARCHIVE_LIB ${_archives})
197197
PRIVATE
198198
"${PROJECT_NAME}"
199199
"$<$<STREQUAL:${ARCHIVE_LIB},libarchive>:${LibArchive_LIBRARIES}>"
200-
"$<$<STREQUAL:${ARCHIVE_LIB},miniz>:miniz>"
200+
# "$<$<STREQUAL:${ARCHIVE_LIB},miniz>:miniz>"
201201
)
202202

203203
test_wrapper()

0 commit comments

Comments
 (0)