linux-qubasis

commit 3fae276865268011db79f0377f5cc6a4c8d56d56
parent 431590abfc50ca8cbbc2b81f27ca1bd211c346de
Author: Jul <jul@9o.is>
Date:   Sat, 22 Nov 2025 02:36:34 -0500

Revert "move files gen functions to root"

This reverts commit 431590abfc50ca8cbbc2b81f27ca1bd211c346de.

Diffstat:
M
genfn.sh
 | 
52
+++++++---------------------------------------------
M
pkg/genfn.sh
 | 
38
++++++++++++++++++++++++++++++++++++++

2 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/genfn.sh b/genfn.sh
@@ -7,17 +7,17 @@ main() {
 	GEN_OUTS=$DIR/$NINJA_FILE
 
 	set_target "$1"
-	init_ninja
+	init_file
 	trap gen_done EXIT
 }
 
-init_ninja() {
+init_file() {
 	if persist && [ -e $DIR/$NINJA_FILE.tmp ]; then
 		rm -f $DIR/$NINJA_FILE.tmp
 	fi
 }
 
-fini_ninja() {
+fini_file() {
 	_f=$DIR/$NINJA_FILE
 	if persist && [ -e $_f.tmp ]; then
 		if cmp -s $_f.tmp $_f; then
@@ -28,35 +28,10 @@ fini_ninja() {
 	fi
 }
 
-init_files() {
-	if persist && [ -e $DIR/files.tmp ]; then
-		rm -f $DIR/files.tmp
-	fi
-}
-
-fini_files() {
-	_f=$DIR/files
-	if persist && [ -e $_f.tmp ]; then
-		if cmp -s $_f.tmp $_f; then
-			rm -f $_f.tmp
-		else
-			mv $_f.tmp $_f
-		fi
-		GEN_OUTS="$GEN_OUTS $DIR/files"
-	fi
-}
-
-file() {
-	if persist; then
-		printf '%s\n' "$*" >> $DIR/files.tmp
-	fi
-}
-
 gen_done() {
 	gen "$GEN_OUTS" '|' $GEN_FILES
 	phony $dir/ninja $NINJA_FILES
-	fini_files
-	fini_ninja
+	fini_file
 	wait
 }
 
@@ -107,12 +82,12 @@ write() {
 sub() (
 	write "subninja $dir/$1.ninja"
 	NINJA_FILE=$1.ninja
-	init_ninja
+	init_file
 
 	[ "${2-}" ] && eval "$2 $1"
 	$1
 	[ "${3-}" ] && eval "$3 $1"
-	fini_ninja
+	fini_file
 )
 
 subgen() {
@@ -127,8 +102,7 @@ subgen() {
 			GEN_FILES="$GEN_FILES $DIR/gen.sh"
 			GEN_OUTS=$DIR/$NINJA_FILE
 
-			init_ninja
-			init_files
+			init_file
 
 			var dir	$dir/$1
 			var outdir $outdir/$1
@@ -268,16 +242,4 @@ foreach() {
 	GEN_FILES="$GEN_FILES $DIR/$1"
 }
 
-sym() {
-	case ${1%%/*} in
-	bin)	_prefix='$bindir';;
-	man)	_prefix='$mandir';;
-	share)	_prefix='$datadir';;
-	etc)	_prefix='$sysconfdir';;
-	*)		error sym cannot handles prefix $_prefix;;
-	esac
-
-	file sym 0777 $_prefix/${1#*/} $2
-}
-
 main "${1-}"
diff --git a/pkg/genfn.sh b/pkg/genfn.sh
@@ -16,6 +16,7 @@ init_pkg() {
 	var datdir $outdir/share
 
 	unset -f host
+	init_files
 }
 
 fini_pkg() {
@@ -29,6 +30,8 @@ fini_pkg() {
 	if [ "$SRCS" ]; then
 		phony "$(printf '%s\n' $SRCS | sort | uniq | xargs)" $outdir/fetched "$PCHS"
 	fi
+
+	fini_files
 }
 
 pkgsub() {
@@ -336,3 +339,38 @@ man() {
 	gzip $_out.gz $_src
 	file reg 0644 '$mandir'/man$_sec/$_out.gz $OUTDIR/$_out.gz
 }
+
+sym() {
+	case ${1%%/*} in
+	bin)	_prefix='$bindir';;
+	man)	_prefix='$mandir';;
+	share)	_prefix='$datadir';;
+	*)		error sym cannot handles prefix $_prefix;;
+	esac
+
+	file sym 0777 $_prefix/${1#*/} $2
+}
+
+file() {
+	if persist; then
+		printf '%s\n' "$*" >> $DIR/files.tmp
+	fi
+}
+
+init_files() {
+	if persist && [ -e $DIR/files.tmp ]; then
+		rm -f $DIR/files.tmp
+	fi
+}
+
+fini_files() {
+	_f=$DIR/files
+	if persist && [ -e $_f.tmp ]; then
+		if cmp -s $_f.tmp $_f; then
+			rm -f $_f.tmp
+		else
+			mv $_f.tmp $_f
+		fi
+		GEN_OUTS="$GEN_OUTS $DIR/files"
+	fi
+}