From 7210a1a695d59d928fc32079d09c1d965cf6e9ad Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Thu, 18 Jul 2024 18:32:20 -0400 Subject: Add GNU Automake --- .gitmodules | 3 +++ Makefile | 3 ++- README.md | 2 ++ src/configs/Flex | 2 +- src/configs/GNU_Autoconf | 2 +- src/configs/GNU_Automake | 1 + src/configs/GNU_Bash | 2 +- src/configs/GNU_Bison | 2 +- src/configs/GNU_Make | 2 +- src/scripts/gnu/index-terms-class.sh | 35 +++++++++++++++++++++++++++++++++++ src/scripts/gnu/index-terms-colon.sh | 33 +++++++++++++++++++++++++++++++++ src/scripts/gnu/index-terms.sh | 33 --------------------------------- 12 files changed, 81 insertions(+), 39 deletions(-) create mode 160000 src/configs/GNU_Automake create mode 100755 src/scripts/gnu/index-terms-class.sh create mode 100755 src/scripts/gnu/index-terms-colon.sh delete mode 100755 src/scripts/gnu/index-terms.sh diff --git a/.gitmodules b/.gitmodules index 9e590af..4c5a4b9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "src/configs/GNU_Bison"] path = src/configs/GNU_Bison url = https://github.com/lshprung/gnu-bison-dash-docset.git +[submodule "src/configs/GNU_Automake"] + path = src/configs/GNU_Automake + url = https://github.com/lshprung/gnu-automake-dash-docset.git diff --git a/Makefile b/Makefile index 2ec926e..f9956ac 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,7 @@ debmake \ Flex \ GNU_Autoconf \ GNU_Autoconf_Archive \ +GNU_Automake \ GNU_Bash \ GNU_Bison \ GNU_Make @@ -36,4 +37,4 @@ $(SUPPORTED_TARGETS): $(SRC_MAKE_CALL) DOCSET_NAME=$@ $(BUILD_DIR)/%.tgz: $(BUILD_DIR)/%.docset - tar --exclude='.DS_Store' -czf $@ $(basename $@).docset + tar --exclude='.DS_Store' -czf $@ -C $(BUILD_DIR) $(notdir $(basename $@).docset) diff --git a/README.md b/README.md index 882d639..66c9d34 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ This table shows which supported docsets support which options. All targets supp |[flex](https://github.com/westes/flex) | | |✓ | |[GNU_Autoconf](https://www.gnu.org/software/autoconf/)| | |✓ | |[GNU_Autoconf_Archive](https://www.gnu.org/software/autoconf-archive/)|||✓| +|[GNU_Automake](https://www.gnu.org/software/automake/)| | | | |[GNU_Bash](https://www.gnu.org/software/bash/) | | | | |[GNU_Bison](https://www.gnu.org/software/bison/) | | | | |[GNU_Make](http://www.gnu.org/software/make/) | |✓ | | @@ -48,6 +49,7 @@ This table shows the dependencies for each supported docset. Additionally, all d |[flex](https://github.com/westes/flex) |✓| |✓|✓| |[GNU_Autoconf](https://www.gnu.org/software/autoconf/) |✓| |✓| | |[GNU_Autoconf_Archive](https://www.gnu.org/software/autoconf-archive/)|✓| |✓|✓| +|[GNU_Automake](https://www.gnu.org/software/automake/) |✓| |✓| | |[GNU_Bash](https://www.gnu.org/software/bash/) |✓| |✓| | |[GNU_Bison](https://www.gnu.org/software/bison/) |✓| |✓| | |[GNU_Make](http://www.gnu.org/software/make/) |✓| |✓| | diff --git a/src/configs/Flex b/src/configs/Flex index aa014d9..8e6c8bb 160000 --- a/src/configs/Flex +++ b/src/configs/Flex @@ -1 +1 @@ -Subproject commit aa014d9c128cbc95ca5d6c0522cd3704629a1f11 +Subproject commit 8e6c8bb61ddb5c90657060be95168f9bc63a857d diff --git a/src/configs/GNU_Autoconf b/src/configs/GNU_Autoconf index 4c38556..3d2ab8b 160000 --- a/src/configs/GNU_Autoconf +++ b/src/configs/GNU_Autoconf @@ -1 +1 @@ -Subproject commit 4c38556bbdf06eaa318fc61117a87c5ea9136ff6 +Subproject commit 3d2ab8b331227610eea27fefe21f7680bce3c232 diff --git a/src/configs/GNU_Automake b/src/configs/GNU_Automake new file mode 160000 index 0000000..9b0d300 --- /dev/null +++ b/src/configs/GNU_Automake @@ -0,0 +1 @@ +Subproject commit 9b0d30029aa6880cdb2bf2ec045524108a684e07 diff --git a/src/configs/GNU_Bash b/src/configs/GNU_Bash index 8fdfbac..870f03b 160000 --- a/src/configs/GNU_Bash +++ b/src/configs/GNU_Bash @@ -1 +1 @@ -Subproject commit 8fdfbacc6fbf173139b64a0bfa20c94903ad9392 +Subproject commit 870f03bf346e24901b9b85057c77c8e3dd2d2439 diff --git a/src/configs/GNU_Bison b/src/configs/GNU_Bison index 9db591c..e3665a5 160000 --- a/src/configs/GNU_Bison +++ b/src/configs/GNU_Bison @@ -1 +1 @@ -Subproject commit 9db591c61e15cf1c6e3c99a7dfbb17efe2bef5b1 +Subproject commit e3665a5e562206c5d91e4c584cec888bfb2b76b2 diff --git a/src/configs/GNU_Make b/src/configs/GNU_Make index 54f17b5..ccdaa2e 160000 --- a/src/configs/GNU_Make +++ b/src/configs/GNU_Make @@ -1 +1 @@ -Subproject commit 54f17b5d0468c0b470a3b7576bcd9b81306ef250 +Subproject commit ccdaa2e36aad155447bff51d21ea67daa6c40447 diff --git a/src/scripts/gnu/index-terms-class.sh b/src/scripts/gnu/index-terms-class.sh new file mode 100755 index 0000000..dc14178 --- /dev/null +++ b/src/scripts/gnu/index-terms-class.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env sh + +# shellcheck source=../create_table.sh +. "$(dirname "$0")"/../create_table.sh +# shellcheck source=../insert.sh +. "$(dirname "$0")"/../insert.sh + +TYPE="$1" +shift +INDEX_ENTRY_CLASS="$1" +shift +DB_PATH="$1" +shift + +insert_index_terms() { + # Get each term from an index page and insert + while [ -n "$1" ]; do + grep -Eo "class=${INDEX_ENTRY_CLASS}.*" "$1" | while read -r line; do + insert_term "$line" + done + + shift + done +} + +insert_term() { + LINK="$1" + NAME="$(echo "$LINK" | pup -p 'a text{}' | sed 's/"/\"\"/g' | tr -d \\n)" + PAGE_PATH="$(echo "$LINK" | pup -p 'a attr{href}')" + + insert "$DB_PATH" "$NAME" "$TYPE" "$PAGE_PATH" +} + +create_table "$DB_PATH" +insert_index_terms "$@" diff --git a/src/scripts/gnu/index-terms-colon.sh b/src/scripts/gnu/index-terms-colon.sh new file mode 100755 index 0000000..e82aff2 --- /dev/null +++ b/src/scripts/gnu/index-terms-colon.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env sh + +# shellcheck source=../create_table.sh +. "$(dirname "$0")"/../create_table.sh +# shellcheck source=../insert.sh +. "$(dirname "$0")"/../insert.sh + +TYPE="$1" +shift +DB_PATH="$1" +shift + +insert_index_terms() { + # Get each term from an index page and insert + while [ -n "$1" ]; do + grep -Eo ":" "$1" | while read -r line; do + insert_term "$line" + done + + shift + done +} + +insert_term() { + LINK="$1" + NAME="$(echo "$LINK" | pup -p 'a text{}' | sed 's/"/\"\"/g' | tr -d \\n)" + PAGE_PATH="$(echo "$LINK" | pup -p 'a attr{href}')" + + insert "$DB_PATH" "$NAME" "$TYPE" "$PAGE_PATH" +} + +create_table "$DB_PATH" +insert_index_terms "$@" diff --git a/src/scripts/gnu/index-terms.sh b/src/scripts/gnu/index-terms.sh deleted file mode 100755 index e82aff2..0000000 --- a/src/scripts/gnu/index-terms.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env sh - -# shellcheck source=../create_table.sh -. "$(dirname "$0")"/../create_table.sh -# shellcheck source=../insert.sh -. "$(dirname "$0")"/../insert.sh - -TYPE="$1" -shift -DB_PATH="$1" -shift - -insert_index_terms() { - # Get each term from an index page and insert - while [ -n "$1" ]; do - grep -Eo ":" "$1" | while read -r line; do - insert_term "$line" - done - - shift - done -} - -insert_term() { - LINK="$1" - NAME="$(echo "$LINK" | pup -p 'a text{}' | sed 's/"/\"\"/g' | tr -d \\n)" - PAGE_PATH="$(echo "$LINK" | pup -p 'a attr{href}')" - - insert "$DB_PATH" "$NAME" "$TYPE" "$PAGE_PATH" -} - -create_table "$DB_PATH" -insert_index_terms "$@" -- cgit