From: Bruno Haible Date: Fri, 27 Dec 2024 22:39:47 +0000 (+0100) Subject: Rename module sys_file to sys_file-h. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cd7c52cf08213056994b1677075e15589a5f4c0;p=thirdparty%2Fgnulib.git Rename module sys_file to sys_file-h. * modules/sys_file-h: Renamed from modules/sys_file. * modules/sys_file-h-tests: Renamed from modules/sys_file-tests. * modules/sys_file-h-c++-tests: Renamed from modules/sys_file-c++-tests. * tests/test-sys_file-h.c: Renamed from tests/test-sys_file.c. * tests/test-sys_file-h-c++.cc: Renamed from tests/test-sys_file-c++.cc. * doc/glibc-headers/sys_file.texi: Update. * modules/* (Depends-on): Update. * modules/sys_file: New file. --- diff --git a/ChangeLog b/ChangeLog index f28bf8e63f..bb8d0ba787 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2024-12-27 Bruno Haible + + Rename module sys_file to sys_file-h. + * modules/sys_file-h: Renamed from modules/sys_file. + * modules/sys_file-h-tests: Renamed from modules/sys_file-tests. + * modules/sys_file-h-c++-tests: Renamed from modules/sys_file-c++-tests. + * tests/test-sys_file-h.c: Renamed from tests/test-sys_file.c. + * tests/test-sys_file-h-c++.cc: Renamed from tests/test-sys_file-c++.cc. + * doc/glibc-headers/sys_file.texi: Update. + * modules/* (Depends-on): Update. + * modules/sys_file: New file. + 2024-12-27 Bruno Haible Rename module sysexits to sysexits-h. diff --git a/doc/glibc-headers/sys_file.texi b/doc/glibc-headers/sys_file.texi index 7151336094..1a4ceb89ff 100644 --- a/doc/glibc-headers/sys_file.texi +++ b/doc/glibc-headers/sys_file.texi @@ -3,8 +3,8 @@ Declares the function @code{flock}. -Gnulib module: sys_file -@mindex sys_file +Gnulib module: sys_file-h +@mindex sys_file-h Portability problems fixed by Gnulib: @itemize diff --git a/modules/flock b/modules/flock index 75ce48e584..0fb6274eb2 100644 --- a/modules/flock +++ b/modules/flock @@ -6,7 +6,7 @@ lib/flock.c m4/flock.m4 Depends-on: -sys_file +sys_file-h msvc-nothrow [test $HAVE_FLOCK = 0] configure.ac: diff --git a/modules/posixcheck b/modules/posixcheck index 2371aaf0e4..98f560548e 100644 --- a/modules/posixcheck +++ b/modules/posixcheck @@ -32,7 +32,7 @@ stdio-h stdlib-h string-h strings-h -sys_file +sys_file-h sys_ioctl sys_random sys_resource diff --git a/modules/sys_file b/modules/sys_file index a06a2f4376..59e2b61f2e 100644 --- a/modules/sys_file +++ b/modules/sys_file @@ -1,41 +1,20 @@ Description: for systems with an incomplete header. +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'sys_file-h' instead. + Files: -lib/sys_file.in.h -m4/sys_file_h.m4 Depends-on: -gen-header -include_next -snippet/warn-on-use +sys_file-h configure.ac: -gl_SYS_FILE_H -gl_SYS_FILE_H_REQUIRE_DEFAULTS -AC_PROG_MKDIR_P Makefile.am: -BUILT_SOURCES += sys/file.h - -# We need the following in order to create when the system -# has one that is incomplete. -sys/file.h: sys_file.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) - $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ - -e 's/@''HAVE_SYS_FILE_H''@/$(HAVE_SYS_FILE_H)/g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_FILE_H''@|$(NEXT_SYS_FILE_H)|g' \ - -e 's/@''HAVE_FLOCK''@/$(HAVE_FLOCK)/g' \ - -e 's/@''GNULIB_FLOCK''@/$(GNULIB_FLOCK)/g' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - $(srcdir)/sys_file.in.h > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += sys/file.h sys/file.h-t -MOSTLYCLEANDIRS += sys Include: @@ -44,4 +23,3 @@ License: LGPLv2+ Maintainer: -all diff --git a/modules/sys_file-c++-tests b/modules/sys_file-c++-tests deleted file mode 100644 index 7c2af85f02..0000000000 --- a/modules/sys_file-c++-tests +++ /dev/null @@ -1,17 +0,0 @@ -Files: -tests/test-sys_file-c++.cc - -Status: -c++-test - -Depends-on: -ansi-c++-opt - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-sys_file-c++ -check_PROGRAMS += test-sys_file-c++ -test_sys_file_c___SOURCES = test-sys_file-c++.cc -endif diff --git a/modules/sys_file-h b/modules/sys_file-h new file mode 100644 index 0000000000..a06a2f4376 --- /dev/null +++ b/modules/sys_file-h @@ -0,0 +1,47 @@ +Description: + for systems with an incomplete header. + +Files: +lib/sys_file.in.h +m4/sys_file_h.m4 + +Depends-on: +gen-header +include_next +snippet/warn-on-use + +configure.ac: +gl_SYS_FILE_H +gl_SYS_FILE_H_REQUIRE_DEFAULTS +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += sys/file.h + +# We need the following in order to create when the system +# has one that is incomplete. +sys/file.h: sys_file.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) + $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys' + $(AM_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ + -e 's/@''HAVE_SYS_FILE_H''@/$(HAVE_SYS_FILE_H)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_FILE_H''@|$(NEXT_SYS_FILE_H)|g' \ + -e 's/@''HAVE_FLOCK''@/$(HAVE_FLOCK)/g' \ + -e 's/@''GNULIB_FLOCK''@/$(GNULIB_FLOCK)/g' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + $(srcdir)/sys_file.in.h > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += sys/file.h sys/file.h-t +MOSTLYCLEANDIRS += sys + +Include: + + +License: +LGPLv2+ + +Maintainer: +all diff --git a/modules/sys_file-h-c++-tests b/modules/sys_file-h-c++-tests new file mode 100644 index 0000000000..00f0a97470 --- /dev/null +++ b/modules/sys_file-h-c++-tests @@ -0,0 +1,17 @@ +Files: +tests/test-sys_file-h-c++.cc + +Status: +c++-test + +Depends-on: +ansi-c++-opt + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-sys_file-h-c++ +check_PROGRAMS += test-sys_file-h-c++ +test_sys_file_h_c___SOURCES = test-sys_file-h-c++.cc +endif diff --git a/modules/sys_file-h-tests b/modules/sys_file-h-tests new file mode 100644 index 0000000000..a5b93fd09c --- /dev/null +++ b/modules/sys_file-h-tests @@ -0,0 +1,11 @@ +Files: +tests/test-sys_file-h.c + +Depends-on: +sys_file-h-c++-tests + +configure.ac: + +Makefile.am: +TESTS += test-sys_file-h +check_PROGRAMS += test-sys_file-h diff --git a/modules/sys_file-tests b/modules/sys_file-tests deleted file mode 100644 index 2fdaf0b354..0000000000 --- a/modules/sys_file-tests +++ /dev/null @@ -1,11 +0,0 @@ -Files: -tests/test-sys_file.c - -Depends-on: -sys_file-c++-tests - -configure.ac: - -Makefile.am: -TESTS += test-sys_file -check_PROGRAMS += test-sys_file diff --git a/tests/test-sys_file-c++.cc b/tests/test-sys_file-h-c++.cc similarity index 100% rename from tests/test-sys_file-c++.cc rename to tests/test-sys_file-h-c++.cc diff --git a/tests/test-sys_file.c b/tests/test-sys_file-h.c similarity index 100% rename from tests/test-sys_file.c rename to tests/test-sys_file-h.c