commit 44b8301813d3d3975478028663fd3d5899c0bb94
parent 206b9f60096568af8df51add45b96fc5c2407583
Author: Evgeny Grin (Karlson2k) <k2k@drgrin.dev>
Date: Sun, 4 May 2025 13:52:13 +0200
Fixed "make dist"
Diffstat:
5 files changed, 260 insertions(+), 84 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -29,9 +29,10 @@ stamp-h[0-9]
/.vscode
/.settings
/.vs
-po/configure.acT
-po/POTFILES
-po/configargs.stamp
+/po/configure.acT
+/po/POTFILES
+/po/configargs.stamp
+/po/libmicrohttpd2.pot
*~
\#*\#
/uncrustify.cfg
diff --git a/Makefile.am b/Makefile.am
@@ -6,42 +6,59 @@ if BUILD_DOC
SUBDIRS += doc
endif
-
-W32COMMON = w32/common/gen_dll_res.ps1 w32/common/microhttpd_dll_res_vc.rc.in w32/common/microhttpd_dll_res_vc.rc \
- w32/common/MHD_config.h w32/common/vs_dirs.props \
- w32/common/common-build-settings.props w32/common/libmicrohttpd-build-settings.props \
+W32COMMON = \
+ w32/common/vs_dirs.props \
+ w32/common/project-configs.props \
+ w32/common/project-configs-xp.props \
+ w32/common/common-build-settings.props \
+ w32/common/libmicrohttpd2-build-settings.props \
w32/common/apps-build-settings.props \
- w32/common/project-configs.props w32/common/project-configs-xp.props \
- w32/common/libmicrohttpd-files.vcxproj w32/common/libmicrohttpd-filters.vcxproj \
- w32/common/hellobrowser-files.vcxproj w32/common/hellobrowser-filters.vcxproj
-W32VS2013 = w32/VS2013/libmicrohttpd.vcxproj w32/VS2013/libmicrohttpd.vcxproj.filters \
- w32/VS2013/hellobrowser.vcxproj w32/VS2013/hellobrowser.vcxproj.filters \
- w32/VS2013/simplepost.vcxproj w32/VS2013/largepost.vcxproj \
- w32/VS2013/libmicrohttpd.sln
-W32VS2015 = w32/VS2015/libmicrohttpd.vcxproj w32/VS2015/libmicrohttpd.vcxproj.filters \
- w32/VS2015/hellobrowser.vcxproj w32/VS2015/hellobrowser.vcxproj.filters \
- w32/VS2015/simplepost.vcxproj w32/VS2015/largepost.vcxproj \
- w32/VS2015/libmicrohttpd.sln
-W32VS2017 = w32/VS2017/libmicrohttpd.vcxproj w32/VS2017/libmicrohttpd.vcxproj.filters \
- w32/VS2017/hellobrowser.vcxproj w32/VS2017/hellobrowser.vcxproj.filters \
- w32/VS2017/simplepost.vcxproj w32/VS2017/largepost.vcxproj \
- w32/VS2017/libmicrohttpd.sln
-W32VS2019 = w32/VS2019/libmicrohttpd.vcxproj w32/VS2019/libmicrohttpd.vcxproj.filters \
- w32/VS2019/hellobrowser.vcxproj w32/VS2019/hellobrowser.vcxproj.filters \
- w32/VS2019/simplepost.vcxproj w32/VS2019/largepost.vcxproj \
- w32/VS2019/libmicrohttpd.sln
-W32VS2022 = w32/VS2022/libmicrohttpd.vcxproj w32/VS2022/libmicrohttpd.vcxproj.filters \
- w32/VS2022/hellobrowser.vcxproj w32/VS2022/hellobrowser.vcxproj.filters \
- w32/VS2022/simplepost.vcxproj w32/VS2022/largepost.vcxproj \
- w32/VS2022/libmicrohttpd.sln
-W32VSAV = w32/VS-Any-Version/libmicrohttpd.vcxproj w32/VS-Any-Version/libmicrohttpd.vcxproj.filters \
- w32/VS-Any-Version/hellobrowser.vcxproj w32/VS-Any-Version/hellobrowser.vcxproj.filters \
- w32/VS-Any-Version/simplepost.vcxproj w32/VS-Any-Version/largepost.vcxproj \
- w32/VS-Any-Version/libmicrohttpd.sln
+ w32/common/mhd_config.h \
+ w32/common/gen_dll_res.ps1 \
+ w32/common/microhttpd2.rc \
+ w32/common/microhttpd2.rc.in \
+ w32/common/libmicrohttpd2-files.vcxproj \
+ w32/common/libmicrohttpd2-filters.vcxproj \
+ w32/common/demo-files.vcxproj \
+ w32/common/demo-filters.vcxproj \
+ w32/common/minimal_example2-files.vcxproj
+
+W32VS2017 = \
+ w32/VS2017/libmicrohttpd2.sln \
+ w32/VS2017/libmicrohttpd2.vcxproj \
+ w32/VS2017/libmicrohttpd2.vcxproj.filters \
+ w32/VS2017/demo.vcxproj \
+ w32/VS2017/demo.vcxproj.filters \
+ w32/VS2017/minimal_example2.vcxproj
+
+W32VS2019 = \
+ w32/VS2019/libmicrohttpd2.sln \
+ w32/VS2019/libmicrohttpd2.vcxproj \
+ w32/VS2019/libmicrohttpd2.vcxproj.filters \
+ w32/VS2019/demo.vcxproj \
+ w32/VS2019/demo.vcxproj.filters \
+ w32/VS2019/minimal_example2.vcxproj
+
+W32VS2022 = \
+ w32/VS2022/libmicrohttpd2.sln \
+ w32/VS2022/libmicrohttpd2.vcxproj \
+ w32/VS2022/libmicrohttpd2.vcxproj.filters \
+ w32/VS2022/demo.vcxproj \
+ w32/VS2022/demo.vcxproj.filters \
+ w32/VS2022/minimal_example2.vcxproj
+
+W32VSAV = \
+ w32/VS-Any-Version/libmicrohttpd2.sln \
+ w32/VS-Any-Version/libmicrohttpd2.vcxproj \
+ w32/VS-Any-Version/libmicrohttpd2.vcxproj.filters \
+ w32/VS-Any-Version/demo.vcxproj \
+ w32/VS-Any-Version/demo.vcxproj.filters \
+ w32/VS-Any-Version/minimal_example2.vcxproj
+
+W32VS_ALL = $(W32COMMON) $(W32VS2017) $(W32VS2019) $(W32VS2022) $(W32VSAV)
EXTRA_DIST = \
- $(W32COMMON) $(W32VS2013) $(W32VS2015) $(W32VS2017) \
- $(W32VS2019) $(W32VS2022) $(W32VSAV)
+ $(W32VS_ALL)
EXTRA_DIST += pre-dist-hook-dummy
MOSTLYCLEANFILES = pre-dist-hook-dummy
@@ -187,7 +204,7 @@ dist-po: po/Makefile $(PO_MAIN_FILES)
echo "cd po && $(MAKE) $(AM_MAKEFLAGS) distdir='$$rel_distsubdir' distdir" && \
$(am__cd) po && $(MAKE) $(AM_MAKEFLAGS) distdir="$$rel_distsubdir" distdir
-$(srcdir_po)/POTFILES.in: $(top_srcdir)/src/microhttpd/Makefile.am
+$(srcdir_po)/POTFILES.in: $(top_srcdir)/src/mhd2/Makefile.am
@echo "cd $(top_builddir)/src/mhd2 && $(MAKE) $(AM_MAKEFLAGS) update-po-POTFILES.in" && \
$(am__cd) '$(top_builddir)/src/mhd2' && $(MAKE) $(AM_MAKEFLAGS) update-po-POTFILES.in
diff --git a/po/Makevars b/po/Makevars
@@ -12,7 +12,7 @@ subdir = po
top_builddir = ..
# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = -k --keyword=mhd_LOG_MSG:3 --keyword=mhd_LOG_FMT
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
@@ -88,9 +88,9 @@ $(top_builddir)/po-config.status: $(srcdir)/po-configure.ac.in $(top_srcdir)/con
@echo "cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) po-config.status" && \
$(am__cd) '$(top_builddir)' && $(MAKE) $(AM_MAKEFLAGS) po-config.status
-$(srcdir)/POTFILES.in: $(top_srcdir)/src/microhttpd/Makefile.am
- @echo "cd $(top_srcdir)/src/microhttpd && $(MAKE) $(AM_MAKEFLAGS) update-po-POTFILES.in" && \
- $(am__cd) '$(top_srcdir)/src/microhttpd' && $(MAKE) $(AM_MAKEFLAGS) update-po-POTFILES.in
+$(srcdir)/POTFILES.in: $(top_srcdir)/src/mhd2/Makefile.am
+ @echo "cd $(top_srcdir)/src/mhd2 && $(MAKE) $(AM_MAKEFLAGS) update-po-POTFILES.in" && \
+ $(am__cd) '$(top_srcdir)/src/mhd2' && $(MAKE) $(AM_MAKEFLAGS) update-po-POTFILES.in
$(srcdir)/stamp-m.in:
@: > '$@'
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -1,41 +1,199 @@
-src/include/microhttpd.h
-src/microhttpd/base64.h
-src/microhttpd/mhd_mono_clock.h
-src/microhttpd/tsearch.h
-src/microhttpd/connection_https.c
-src/microhttpd/reason_phrase.c
-src/microhttpd/mhd_itc_types.h
-src/microhttpd/sysfdsetsize.h
-src/microhttpd/mhd_threads.h
-src/microhttpd/mhd_sockets.c
-src/microhttpd/mhd_threads.c
-src/microhttpd/mhd_str.h
-src/microhttpd/mhd_compat.c
-src/microhttpd/tsearch.c
-src/microhttpd/internal.c
-src/microhttpd/mhd_byteorder.h
-src/microhttpd/mhd_locks.h
-src/microhttpd/memorypool.h
-src/microhttpd/memorypool.c
-src/microhttpd/connection.h
-src/microhttpd/internal.h
-src/microhttpd/digestauth.c
-src/microhttpd/sysfdsetsize.c
-src/microhttpd/md5.h
-src/microhttpd/postprocessor.c
-src/microhttpd/response.h
-src/microhttpd/mhd_str.c
-src/microhttpd/daemon.c
-src/microhttpd/mhd_assert.h
-src/microhttpd/mhd_mono_clock.c
-src/microhttpd/base64.c
-src/microhttpd/md5.c
-src/microhttpd/mhd_sockets.h
-src/microhttpd/mhd_compat.h
-src/microhttpd/connection.c
-src/microhttpd/response.c
-src/microhttpd/mhd_itc.h
-src/microhttpd/connection_https.h
-src/microhttpd/mhd_limits.h
-src/microhttpd/mhd_itc.c
-src/microhttpd/basicauth.c
+
+src/mhd2/autoinit_funcs.h
+src/mhd2/sys_offsetof.h
+src/mhd2/sys_null_macro.h
+src/mhd2/sys_base_types.h
+src/mhd2/sys_bool_type.h
+src/mhd2/sys_sockets_types.h
+src/mhd2/sys_sockets_headers.h
+src/mhd2/sys_ip_headers.h
+src/mhd2/sys_errno.h
+src/mhd2/sys_file_fd.h
+src/mhd2/sys_malloc.h
+src/mhd2/sys_select.h
+src/mhd2/sys_poll.h
+src/mhd2/sys_sendfile.h
+src/mhd2/compat_calloc.h
+src/mhd2/sys_w32_ver.h
+src/mhd2/mhd_align.h
+src/mhd2/mhd_bithelpers.h
+src/mhd2/mhd_byteorder.h
+src/mhd2/mhd_assert.h
+src/mhd2/mhd_unreachable.h
+src/mhd2/mhd_cntnr_ptr.h
+src/mhd2/mhd_arr_num_elems.h
+src/mhd2/mhd_tristate.h
+src/mhd2/mhd_status_code_int.h
+src/mhd2/mhd_socket_type.h
+src/mhd2/mhd_sockets_macros.h
+src/mhd2/mhd_sockets_funcs.c
+src/mhd2/mhd_sockets_funcs.h
+src/mhd2/mhd_socket_error_funcs.c
+src/mhd2/mhd_socket_error_funcs.h
+src/mhd2/mhd_socket_error.h
+src/mhd2/mhd_atomic_counter.c
+src/mhd2/mhd_atomic_counter.h
+src/mhd2/mhd_bool.h
+src/mhd2/mhd_str.c
+src/mhd2/mhd_str.h
+src/mhd2/mhd_str_macros.h
+src/mhd2/mhd_str_types.h
+src/mhd2/mhd_buffer.h
+src/mhd2/mhd_limits.h
+src/mhd2/mhd_iovec.h
+src/mhd2/mhd_dbg_print.h
+src/mhd2/mhd_panic.c
+src/mhd2/mhd_panic.h
+src/mhd2/mhd_lib_init.c
+src/mhd2/mhd_lib_init_impl.h
+src/mhd2/mhd_lib_init.h
+src/mhd2/mhd_lib_init_auto.h
+src/mhd2/lib_get_info.c
+src/mhd2/mhd_dlinked_list.h
+src/mhd2/mhd_conn_socket.h
+src/mhd2/mhd_connection.h
+src/mhd2/mhd_stream.h
+src/mhd2/mhd_locks.h
+src/mhd2/mhd_itc.c
+src/mhd2/mhd_itc.h
+src/mhd2/mhd_itc_types.h
+src/mhd2/mhd_threads.c
+src/mhd2/mhd_threads.h
+src/mhd2/sys_thread_entry_type.h
+src/mhd2/mhd_mono_clock.c
+src/mhd2/mhd_mono_clock.h
+src/mhd2/mhd_mempool.c
+src/mhd2/mhd_mempool.h
+src/mhd2/mhd_read_file.c
+src/mhd2/mhd_read_file.h
+src/mhd2/mhd_recv.c
+src/mhd2/mhd_recv.h
+src/mhd2/mhd_send.c
+src/mhd2/mhd_send.h
+src/mhd2/mhd_daemon.h
+src/mhd2/mhd_public_api.h
+src/mhd2/mhd_request.h
+src/mhd2/mhd_reply.h
+src/mhd2/mhd_response.h
+src/mhd2/http_method.h
+src/mhd2/http_prot_ver.h
+src/mhd2/http_status_str.c
+src/mhd2/http_status_str.h
+src/mhd2/action.c
+src/mhd2/mhd_action.h
+src/mhd2/dcc_action.c
+src/mhd2/mhd_dcc_action.h
+src/mhd2/events_process.c
+src/mhd2/events_process.h
+src/mhd2/daemon_logger.c
+src/mhd2/daemon_logger.h
+src/mhd2/daemon_logger_default.c
+src/mhd2/daemon_logger_default.h
+src/mhd2/daemon_options.h
+src/mhd2/daemon_set_options.c
+src/mhd2/daemon_create.c
+src/mhd2/daemon_start.c
+src/mhd2/daemon_get_info.c
+src/mhd2/daemon_add_conn.c
+src/mhd2/daemon_add_conn.h
+src/mhd2/daemon_funcs.c
+src/mhd2/daemon_funcs.h
+src/mhd2/daemon_event_update.c
+src/mhd2/extr_events_funcs.c
+src/mhd2/extr_events_funcs.h
+src/mhd2/conn_data_process.c
+src/mhd2/conn_data_process.h
+src/mhd2/conn_data_recv.c
+src/mhd2/conn_data_recv.h
+src/mhd2/conn_data_send.c
+src/mhd2/conn_data_send.h
+src/mhd2/conn_mark_ready.h
+src/mhd2/conn_get_info.c
+src/mhd2/request_funcs.c
+src/mhd2/request_funcs.h
+src/mhd2/request_get_value.c
+src/mhd2/request_get_value.h
+src/mhd2/request_resume.c
+src/mhd2/respond_with_error.c
+src/mhd2/respond_with_error.h
+src/mhd2/request_get_info.c
+src/mhd2/response_from.c
+src/mhd2/response_from.h
+src/mhd2/response_add_header.c
+src/mhd2/response_add_header.h
+src/mhd2/response_destroy.c
+src/mhd2/response_destroy.h
+src/mhd2/response_funcs.c
+src/mhd2/response_funcs.h
+src/mhd2/response_set_options.c
+src/mhd2/response_set_options.h
+src/mhd2/response_options.h
+src/mhd2/stream_funcs.c
+src/mhd2/stream_funcs.h
+src/mhd2/stream_process_states.c
+src/mhd2/stream_process_states.h
+src/mhd2/stream_process_request.c
+src/mhd2/stream_process_request.h
+src/mhd2/stream_process_reply.c
+src/mhd2/stream_process_reply.h
+src/mhd2/stream_get_info.c
+src/mhd2/compat_calloc.c
+src/mhd2/http_post_enc.h
+src/mhd2/mhd_post_parser.h
+src/mhd2/mhd_post_result.h
+src/mhd2/mhd_postfield_int.h
+src/mhd2/post_parser_funcs.c
+src/mhd2/post_parser_funcs.h
+src/mhd2/request_auth_get.c
+src/mhd2/request_auth_get.h
+src/mhd2/auth_basic.c
+src/mhd2/auth_basic.h
+src/mhd2/response_auth_basic.c
+src/mhd2/mhd_digest_auth_data.h
+src/mhd2/mhd_auth_digest_hdr.h
+src/mhd2/response_auth_digest.c
+src/mhd2/response_auth_digest.h
+src/mhd2/auth_digest.c
+src/mhd2/auth_digest.h
+src/mhd2/md5_int.c
+src/mhd2/md5_int.h
+src/mhd2/mhd_md5.h
+src/mhd2/md5_ext.c
+src/mhd2/md5_ext.h
+src/mhd2/sha256_int.c
+src/mhd2/sha256_int.h
+src/mhd2/mhd_sha256.h
+src/mhd2/sha256_ext.c
+src/mhd2/sha256_ext.h
+src/mhd2/sha512_256_int.c
+src/mhd2/sha512_256_int.h
+src/mhd2/mhd_sha512_256.h
+src/mhd2/mhd_upgrade.h
+src/mhd2/upgrade_prep.c
+src/mhd2/upgrade_prep.h
+src/mhd2/upgrade_proc.c
+src/mhd2/upgrade_proc.h
+src/mhd2/upgraded_net.c
+src/mhd2/mhd_tls_choice.h
+src/mhd2/mhd_tls_funcs.c
+src/mhd2/mhd_tls_funcs.h
+src/mhd2/mhd_tls_enums.h
+src/mhd2/mhd_tls_ver_stct.h
+src/mhd2/tls_dh_params.h
+src/mhd2/conn_tls_check.c
+src/mhd2/conn_tls_check.h
+src/mhd2/tls_multi_tls_lib.h
+src/mhd2/tls_multi_daemon_data.h
+src/mhd2/tls_multi_conn_data.h
+src/mhd2/tls_multi_funcs.c
+src/mhd2/tls_multi_funcs.h
+src/mhd2/tls_gnu_tls_lib.h
+src/mhd2/tls_gnu_daemon_data.h
+src/mhd2/tls_gnu_conn_data.h
+src/mhd2/tls_gnu_funcs.c
+src/mhd2/tls_gnu_funcs.h
+src/mhd2/tls_open_tls_lib.h
+src/mhd2/tls_open_daemon_data.h
+src/mhd2/tls_open_conn_data.h
+src/mhd2/tls_open_funcs.c
+src/mhd2/tls_open_funcs.h
diff --git a/src/mhd2/Makefile.am b/src/mhd2/Makefile.am
@@ -275,9 +275,9 @@ update-po-POTFILES.in: $(top_srcdir)/po/POTFILES.in
$(top_srcdir)/po/POTFILES.in: $(srcdir)/Makefile.am
@echo "Creating $@"
- @echo src/include/microhttpd2.h > "$@" && \
+ @echo "" > "$@" && \
for src in $(am__libmicrohttpd2_la_SOURCES_DIST) ; do \
- echo "$(subdir)/$$src" >> "$@" ; \
+ echo "$(subdir)/$$src" >> "$@" || exit $$?; \
done
EXTRA_DIST = \
