1
0
mirror of https://git.savannah.gnu.org/git/gnulib.git synced 2025-08-08 17:22:05 +03:00

Rename module strings to strings-h.

* modules/strings-h: Renamed from modules/strings.
* modules/strings-h-tests: Renamed from modules/strings-tests.
* modules/strings-h-c++-tests: Renamed from modules/strings-c++-tests.
* tests/test-strings-h.c: Renamed from tests/test-strings.c.
* tests/test-strings-h-c++.cc: Renamed from tests/test-strings-c++.cc.
* doc/posix-headers/strings.texi: Update.
* modules/* (Depends-on): Update.
* modules/strings: New file.
This commit is contained in:
Bruno Haible
2024-12-27 23:39:42 +01:00
parent d93e96eb60
commit 93b331de6b
14 changed files with 107 additions and 70 deletions

View File

@@ -1,3 +1,15 @@
2024-12-27 Bruno Haible <bruno@clisp.org>
Rename module strings to strings-h.
* modules/strings-h: Renamed from modules/strings.
* modules/strings-h-tests: Renamed from modules/strings-tests.
* modules/strings-h-c++-tests: Renamed from modules/strings-c++-tests.
* tests/test-strings-h.c: Renamed from tests/test-strings.c.
* tests/test-strings-h-c++.cc: Renamed from tests/test-strings-c++.cc.
* doc/posix-headers/strings.texi: Update.
* modules/* (Depends-on): Update.
* modules/strings: New file.
2024-12-27 Bruno Haible <bruno@clisp.org> 2024-12-27 Bruno Haible <bruno@clisp.org>
Rename module string to string-h. Rename module string to string-h.

View File

@@ -3,8 +3,8 @@
POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/strings.h.html} POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/strings.h.html}
Gnulib module: strings Gnulib module: strings-h
@mindex strings @mindex strings-h
Portability problems fixed by Gnulib: Portability problems fixed by Gnulib:
@itemize @itemize

View File

@@ -11,7 +11,7 @@ Files:
lib/bcopy.c lib/bcopy.c
Depends-on: Depends-on:
strings strings-h
configure.ac: configure.ac:
AC_REPLACE_FUNCS(bcopy) AC_REPLACE_FUNCS(bcopy)

View File

@@ -6,7 +6,7 @@ lib/ffs.c
m4/ffs.m4 m4/ffs.m4
Depends-on: Depends-on:
strings strings-h
configure.ac: configure.ac:
gl_FUNC_FFS gl_FUNC_FFS

View File

@@ -31,7 +31,7 @@ spawn-h
stdio-h stdio-h
stdlib-h stdlib-h
string-h string-h
strings strings-h
sys_file sys_file
sys_ioctl sys_ioctl
sys_random sys_random

View File

@@ -7,7 +7,7 @@ lib/strncasecmp.c
m4/strcase.m4 m4/strcase.m4
Depends-on: Depends-on:
strings strings-h
configure.ac: configure.ac:
gl_STRCASE gl_STRCASE

View File

@@ -1,47 +1,20 @@
Description: Description:
A substitute <strings.h>. A substitute <strings.h>.
Status:
deprecated
Notice:
This module is deprecated. Use the module 'strings-h' instead.
Files: Files:
lib/strings.in.h
m4/strings_h.m4
Depends-on: Depends-on:
gen-header strings-h
include_next
snippet/arg-nonnull
snippet/c++defs
snippet/warn-on-use
sys_types
configure.ac: configure.ac:
gl_STRINGS_H
gl_STRINGS_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
Makefile.am: Makefile.am:
BUILT_SOURCES += strings.h
# We need the following in order to create <strings.h> when the system
# doesn't have one that works with the given compiler.
strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%'
$(gl_V_at)$(SED_HEADER_STDOUT) \
-e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_STRINGS_H''@|$(HAVE_STRINGS_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_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \
-e 's/@''GNULIB_FFS''@/$(GNULIB_FFS)/g' \
-e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \
-e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \
-e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
$(srcdir)/strings.in.h > $@-t
$(AM_V_at)mv $@-t $@
MOSTLYCLEANFILES += strings.h strings.h-t
Include: Include:
<strings.h> <strings.h>
@@ -50,4 +23,3 @@ License:
LGPLv2+ LGPLv2+
Maintainer: Maintainer:
all

View File

@@ -1,18 +0,0 @@
Files:
tests/test-strings-c++.cc
tests/signature.h
Status:
c++-test
Depends-on:
ansi-c++-opt
configure.ac:
Makefile.am:
if ANSICXX
TESTS += test-strings-c++
check_PROGRAMS += test-strings-c++
test_strings_c___SOURCES = test-strings-c++.cc
endif

53
modules/strings-h Normal file
View File

@@ -0,0 +1,53 @@
Description:
A substitute <strings.h>.
Files:
lib/strings.in.h
m4/strings_h.m4
Depends-on:
gen-header
include_next
snippet/arg-nonnull
snippet/c++defs
snippet/warn-on-use
sys_types
configure.ac:
gl_STRINGS_H
gl_STRINGS_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
Makefile.am:
BUILT_SOURCES += strings.h
# We need the following in order to create <strings.h> when the system
# doesn't have one that works with the given compiler.
strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%'
$(gl_V_at)$(SED_HEADER_STDOUT) \
-e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_STRINGS_H''@|$(HAVE_STRINGS_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_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \
-e 's/@''GNULIB_FFS''@/$(GNULIB_FFS)/g' \
-e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \
-e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \
-e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
$(srcdir)/strings.in.h > $@-t
$(AM_V_at)mv $@-t $@
MOSTLYCLEANFILES += strings.h strings.h-t
Include:
<strings.h>
License:
LGPLv2+
Maintainer:
all

View File

@@ -0,0 +1,18 @@
Files:
tests/test-strings-h-c++.cc
tests/signature.h
Status:
c++-test
Depends-on:
ansi-c++-opt
configure.ac:
Makefile.am:
if ANSICXX
TESTS += test-strings-h-c++
check_PROGRAMS += test-strings-h-c++
test_strings_h_c___SOURCES = test-strings-h-c++.cc
endif

11
modules/strings-h-tests Normal file
View File

@@ -0,0 +1,11 @@
Files:
tests/test-strings-h.c
Depends-on:
strings-h-c++-tests
configure.ac:
Makefile.am:
TESTS += test-strings-h
check_PROGRAMS += test-strings-h

View File

@@ -1,11 +0,0 @@
Files:
tests/test-strings.c
Depends-on:
strings-c++-tests
configure.ac:
Makefile.am:
TESTS += test-strings
check_PROGRAMS += test-strings