Skip to content

Commit 5111008

Browse files
committed
Commit 34
* New macros `n4_set_counter()`, `n4_has()`, `n4_has_any()`, `n4_nquote()` and `n4_void()`, have been created in `not-m4sugar.m4` * New macros `NC_SUBST_VARS()`, `NC_SUBST_PAIRS()`, `NC_SUBST_VARS_NOTMAKE()` and `NC_SUBST_PAIRS_NOTMAKE()` have been created in `not-autotools.m4` * New macros `NS_HEREDOC()` and `NS_LITERAL_HEREDOC()` have been created in `not-autoshell.m4` * New macro `n4_newlines()` has been created in `not-fancy-texts.m4` * New library file `not-autoversion.m4` has been added to the collection * The behavior of `n4_with()`, `n4_let()` and `n4_qlet()` has changed in respect to quoted arguments * Code review (macros `n4_list_index()`, `n4_joinalln()`, `n4_arg_index()`, `n4_let()`, `n4_case_in()`, `n4_define_substrings_as()`, `n4_expand_once()`, `n4_expanded_once()` and `n4_repeat()` in `not-m4sugar.m4`; macro `NC_CONFIG_SHADOW_DIR()` in `not-extended-config.m4`; macro `NS_TEXT_WRAP()` in `not-autoshell.m4`) * Macro † `NC_THREATEN_BLINDLY()` in `not-extended-config.m4` has been renamed to `NR_THREATEN_BLINDLY()` * An `examples` subdirectory has been added to the package tree * The † `pkgutils` subdirectory has been renamed to `collection-utils`
1 parent fdcbcc2 commit 5111008

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+6802
-363
lines changed

ChangeLog.md

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,70 @@ Change Log
22
==========
33

44

5+
2.0.0
6+
------
7+
8+
Changes:
9+
10+
* New macros `n4_set_counter()`, `n4_has()`, `n4_has_any()`, `n4_nquote()` and
11+
`n4_void()`, have been created in `not-m4sugar.m4`
12+
* New macros `NC_SUBST_VARS()`, `NC_SUBST_PAIRS()`, `NC_SUBST_VARS_NOTMAKE()`
13+
and `NC_SUBST_PAIRS_NOTMAKE()` have been created in `not-autotools.m4`
14+
* New macros `NS_HEREDOC()` and `NS_LITERAL_HEREDOC()` have been created in
15+
`not-autoshell.m4`
16+
* New macro `n4_newlines()` has been created in `not-fancy-texts.m4`
17+
* New library file `not-autoversion.m4` has been created, containing the
18+
following new macros:
19+
* `NR_RECORD_HISTORY()`
20+
* `NR_PROJECT_VERSION`
21+
* `NR_BINARY_VERSION`
22+
* `NR_LIBTOOL_VERSION_INFO`
23+
* `NR_PROJECT_MAJVER`
24+
* `NR_PROJECT_MINVER`
25+
* `NR_PROJECT_MICVER`
26+
* `NR_BINARY_MAJVER`
27+
* `NR_BINARY_MINVER`
28+
* `NR_BINARY_MICVER`
29+
* `NR_INTERFACE_NUM`
30+
* `NR_INTERFACES_SUPPORTED`
31+
* `NR_IMPLEMENTATION_NUM`
32+
* `NR_SOURCE_AGE`
33+
* `NC_AUTOVERSION_SUBSTITUTIONS`
34+
* `NR_HISTORY_CURRENT_EVENT_NAME`
35+
* `NR_HISTORY_CURRENT_VSTATE`
36+
* `NR_HISTORY_ROOT_VSTATE`
37+
* `NR_HISTORY_EVENTS`
38+
* `NR_HISTORY_GET_EVENT_VSTATE()`
39+
* `NR_HISTORY_FOR_EACH_EVENT()`
40+
* `NR_VSTATE_GET_PROJECT_VERSION()`
41+
* `NR_VSTATE_GET_PROJECT_MAJVER()`
42+
* `NR_VSTATE_GET_PROJECT_MINVER()`
43+
* `NR_VSTATE_GET_PROJECT_MICVER()`
44+
* `NR_VSTATE_GET_BINARY_VERSION()`
45+
* `NR_VSTATE_GET_BINARY_MAJVER()`
46+
* `NR_VSTATE_GET_BINARY_MINVER()`
47+
* `NR_VSTATE_GET_BINARY_MICVER()`
48+
* `NR_VSTATE_GET_LIBTOOL_VERSION_INFO()`
49+
* `NR_VSTATE_GET_INTERFACE_NUM()`
50+
* `NR_VSTATE_GET_INTERFACES_SUPPORTED()`
51+
* `NR_VSTATE_GET_IMPLEMENTATION_NUM()`
52+
* `NR_VSTATE_GET_SOURCE_AGE()`
53+
* `NR_BUMP_VSTATE()`
54+
* `NR_GET_EVENT_VSTATE()`
55+
* `NR_FOR_EACH_EVENT()`
56+
* The behavior of `n4_with()`, `n4_let()` and `n4_qlet()` has changed in
57+
respect to quoted arguments
58+
* Code review (macros `n4_list_index()`, `n4_joinalln()`, `n4_arg_index()`,
59+
`n4_let()`, `n4_case_in()`, `n4_define_substrings_as()`, `n4_expand_once()`,
60+
`n4_expanded_once()` and `n4_repeat()` in `not-m4sugar.m4`; macro
61+
`NC_CONFIG_SHADOW_DIR()` in `not-extended-config.m4`; macro `NS_TEXT_WRAP()`
62+
in `not-autoshell.m4`)
63+
* Macro † `NC_THREATEN_BLINDLY()` in `not-extended-config.m4` has been renamed
64+
to `NR_THREATEN_BLINDLY()`
65+
* An `examples` subdirectory has been added to the package tree
66+
* The † `pkgutils` subdirectory has been renamed to `collection-utils`
67+
68+
569
1.1.0
670
------
771

@@ -54,7 +118,7 @@ Changes:
54118
`NS_STRING_IF_UNQUOTED()` have been created in `not-autoshell.m4`
55119
* The complete macro index has been published (see `macro-index.md`)
56120
* A script for generating automatically the complete macro index has been added
57-
to the package tree (see `pkgutils/macro-index-generator.sh`)
121+
to the package tree (see `pkgutils/macro-index-generator.sh`)
58122
* Documentation
59123

60124

@@ -304,7 +368,7 @@ Changes:
304368
`not-utf8.m4` have been created, containing the following new macros:
305369
`NC_MSG_ERRORBOX()`, `NC_MSG_FAILUREBOX()`, `NC_MSG_NOTICEBOX()` and
306370
`NC_MSG_WARNBOX()` (`not-ac-messages.m4`); `NC_CONFIG_SHADOW_DIR()`,
307-
`NC_SHADOW_MAYBE_OUTPUT`, `NC_THREATEN_BLINDLY` and `NC_THREATEN_FILES()`
371+
`NC_SHADOW_MAYBE_OUTPUT`, `NC_THREATEN_BLINDLY` and `NC_THREATEN_FILES()`
308372
(`not-extended-config.m4`); `n4_charcode()`, `n4_codeunit_at()`,
309373
`n4_codepoint_to_ascii()`, `n4_escape_non_ascii()` and
310374
`n4_escape_everything()` (`not-utf8.m4`);

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ A collection of awesome and self-documented m4 macros for GNU Autotools
77
Overview
88
--------
99

10-
This collection is still relatively small. The macros are organized by topic
11-
and each topic has its own file. Most of the macros are independent from each
12-
other, so you can just copy and paste what you need. The few cases where a
13-
macro depends on a helper macro are documented.
10+
This collection has grown steadly and has now more than 100 macros. The macros
11+
are organized by topic and each topic has its own file. With the exception of
12+
two stand-alone frameworks (`not-autoversion.m4` and `not-extended-config.m4`),
13+
most of the macros are independent from each other, so you can just copy and
14+
paste what you need. The few cases where a macro depends on a helper macro are
15+
documented.
1416

1517
For the complete list of the macros released by the **Not Autotools** project,
1618
please see [`macro-index.md`][1].
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/sh
2+
#
3+
# macro-index-generator.sh
4+
#
5+
# Run this script to generate the complete macro list
6+
#
7+
8+
{
9+
echo '_Not Autotools_ Macro Index'
10+
echo '==========================='
11+
echo
12+
echo 'This is the complete list of macros released by the **Not Autotools** project.'
13+
(cd .. && find 'm4' -type f -name '*.m4' -printf '\n\n## `%p`\n\n' \
14+
-exec grep -oPHn '(?<=^dnl )\w+\(\)?' '{}' ';') | \
15+
sed 's/()$//g;s/($/()/g;s,\([^:]\+\):\([^:]\+\):\([^(]\+\(()\)\?\)$,* [\3](\1#L\2),g'
16+
echo
17+
} > ../macro-index.md
18+
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
#
3+
# strip-comments.sh
4+
#
5+
6+
cd ..
7+
rm -rf undocumented-m4
8+
cp -r m4 undocumented-m4
9+
10+
find 'undocumented-m4' -type f -name '*.m4' \
11+
-exec sed -i '/^dnl\(\W\|\s*$\)/d' '{}' ';' \
12+
-exec sed -i -z 's/^\n*//;s/\n\n\+/\n\n\n/g' '{}' ';'
13+
14+
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
root = true
2+
3+
[package.json]
4+
indent_style = tab
5+
indent_size = 2
6+
7+
[{**.sh,configure.ac,**/Makefile.am}]
8+
indent_style = tab
9+
indent_size = 4
10+
11+
[src/nautilus-__REPL_IDCASE_PACKAGENAME__.c]
12+
charset = utf-8
13+
indent_style = tab
14+
indent_size = 4
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
John Doe <me@example.com>

0 commit comments

Comments
 (0)