linux-qubasis

commit e0811d5e4ca5c15853869ab7eabcfb6156879c32
parent 9efd6aad1e41a721b79057146568871597e9a199
Author: Jul <jul@9o.is>
Date:   Mon, 15 Sep 2025 15:58:15 +0800

set ninja default target to build

Diffstat:
M
gen.sh
 | 
2
++
M
ninja/functions.sh
 | 
44
+++++++++++++++++++++++++++++++++++++-------

2 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/gen.sh b/gen.sh
@@ -40,3 +40,5 @@ subgen pkg/zlib
 subgen pkg/zstd
 
 subgen tpl/example
+
+default build
diff --git a/ninja/functions.sh b/ninja/functions.sh
@@ -21,6 +21,11 @@ include() {
     printf 'include %s\n' $1 >> "$_ninja_writepath"
 }
 
+default() {
+    _ninja_prefix _v $tgtdir $1
+    _ninja_default_target="$_v"
+}
+
 rule() {
     printf 'rule %s\n' $1 >> "$_ninja_writepath"
     bind 'command' "$2"
@@ -217,12 +222,6 @@ _ninja_init() {
 
 _ninja_complete() {
     _ninja_flush
-
-    if [ ! ${_ninja_subninja-} ]; then
-        build phony $gendir/configure $ninjadir/$_ninja_file
-        build gen $ninjadir/$_ninja_file '|' $basedir/config.sh $basedir/ninja/functions.sh $dir/gen.sh
-    fi
-
     mv "$_ninja_writepath" "${_ninja_writepath%.*}"
 
     if [ $_ninja_type = root ]; then
@@ -273,6 +272,7 @@ _ninja_initglobals() {
     _ninja_buffer_fspec=
     _ninja_buffer_fspec_files=
     _ninja_template=
+    _ninja_default_target=
 }
 
 _ninja_setv_init() {
@@ -565,6 +565,12 @@ _ninja_flush_build() {
             build phony $tgtdir/build-pkgs $_subgens_pkg
             build phony $tgtdir/build-tpls $_subgens_tpl
             build phony $tgtdir/build $_subgens
+
+            _subgens_tpl_install=
+            for _v in $_subgens_tpl; do
+                _subgens_tpl_install="$_subgens_tpl_install ${_v%build}install"
+            done
+            build phony $tgtdir/install $_subgens_tpl_install
             ;;
         pkg)
             if [ "$_ninja_buffer_build" ] || [ "$_subgens" ]; then
@@ -581,7 +587,7 @@ _ninja_flush_build() {
             if [ "$_ninja_template" ]; then
                 set -- $_ninja_template
 
-                build qubes-install $outdir/qubes-installed '|' $basedir/ninja/qubes-install.sh $hostdir/pax '||' $outdir/root.tar.zstd
+                build qubes-install $outdir/qubes-installed '|' $basedir/ninja/qubes-install.sh $hostdir/pax $outdir/root.tar.zstd
                 bind template $1
                 bind label $2
                 bind size $3
@@ -716,6 +722,28 @@ _ninja_flush_fspec() {
     esac
 }
 
+_ninja_flush_configure() {
+    if [ ${_ninja_subninja-} ]; then
+        return
+    fi
+
+    _subgens=
+
+    for _v in $_ninja_buffer_subgen; do
+        _subgens="$_subgens \$tgtdir/$_v/configure"
+    done
+
+    build phony $gendir/configure $ninjadir/$_ninja_file $_subgens
+    build gen $ninjadir/$_ninja_file '|' $basedir/config.sh $basedir/ninja/functions.sh $dir/gen.sh
+}
+
+_ninja_flush_default() {
+    if [ ! $_ninja_default_target ]; then
+        return
+    fi
+    printf 'default %s\n' $_ninja_default_target >> "$_ninja_writepath"
+}
+
 _ninja_flush() {
     _ninja_flush_lib
     _ninja_flush_exe
@@ -726,6 +754,8 @@ _ninja_flush() {
     _ninja_flush_fetch
     _ninja_flush_sync
     _ninja_flush_build
+    _ninja_flush_configure
+    _ninja_flush_default
 }
 
 _ninja_dedup() {