linux-qubasis

commit 9dafa8da4eb329d89efb6e2727bc192bdb6119f6
parent 143e32f5c644e231ac8f06ffd4bd6addb29cbd16
Author: Jul <jul@9o.is>
Date:   Sun, 24 Aug 2025 15:11:51 +0800

rename ninja sub function to subninja

Diffstat:
M
ninja/functions.sh
 | 
24
++++++++++--------------

1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/ninja/functions.sh b/ninja/functions.sh
@@ -12,10 +12,6 @@ include() {
     printf 'include %s\n' "$1" >> "$_ninja_fullpath"
 }
 
-subninja() {
-    printf 'subninja $ninjadir/%s.ninja\n' "$1" >> "$_ninja_fullpath"
-}
-
 rule() {
     printf 'rule %s\n' "$1" >> "$_ninja_fullpath"
     bind 'command' "$2"
@@ -140,10 +136,10 @@ subgen() {
     fi
 
     _ninja_queue_subgen="$_ninja_queue_subgen $subgendir$1"
-    _ninja_buffer_subninja="$_ninja_buffer_subninja $1"
+    _ninja_buffer_subgen="$_ninja_buffer_subgen $1"
 }
 
-sub() {
+subninja() {
     local subname="-$1"
     (
         ninja_init "$_gendir" "$subname"
@@ -151,7 +147,7 @@ sub() {
         eval $2
         ninja_complete
     )
-    subninja "$_gendir$subname"
+    printf 'subninja $ninjadir/%s.ninja\n' "$_gendir$subname" >> "$_ninja_fullpath"
 }
 
 ninja_init() {
@@ -220,7 +216,7 @@ _ninja_queue_subgen=
 
 _ninja_initglobals() {
     _ninja_sub=
-    _ninja_buffer_subninja=
+    _ninja_buffer_subgen=
     _ninja_buffer_builds=
     _ninja_buffer_exe=
     _ninja_buffer_lib=
@@ -339,19 +335,19 @@ _ninja_flush_lib() {
     _ninja_buffer_lib=
 }
 
-_ninja_flush_subninja() {
+_ninja_flush_builds() {
     local subbuilds=''
     local pkg=''
 
-    for pkg in $_ninja_buffer_subninja; do
+    for pkg in $_ninja_buffer_subgen; do
         subbuilds="$subbuilds \$gendir/$pkg/build$_ninja_sub"
-        subninja $pkg
+        printf 'subninja $ninjadir/%s.ninja\n' "$pkg" >> "$_ninja_fullpath"
     done
 
     build phony "\$gendir/configure$_ninja_sub" "\$ninjadir/$_ninja_file"
     build phony "\$gendir/build$_ninja_sub" "$_ninja_buffer_builds" "$subbuilds"
 
-    _ninja_buffer_subninja=
+    _ninja_buffer_subgen=
     _ninja_buffer_builds=
 }
 
@@ -360,7 +356,7 @@ _ninja_flush_sync() {
     local verfile="$dir"/version
     local verout="\$outdir/meta/version$_ninja_sub"
 
-    for pkg in $_ninja_buffer_subninja; do
+    for pkg in $_ninja_buffer_subgen; do
         subsyncs="$subsyncs \$gendir/$pkg/sync"
     done
 
@@ -384,6 +380,6 @@ _ninja_flush() {
     _ninja_flush_lib
     _ninja_flush_exe
     _ninja_flush_sync
-    _ninja_flush_subninja
+    _ninja_flush_builds
 }