Tue Dec 28 16:11:01 2021 UTC ()

make: make debug logging for .ORDER more human-friendly

The interesting part of the .ORDER constraint is what is made before
what, so reveal this information in the debug log.

The debug output from the test looks a bit strange since it forces
'three' to be made before 'one', but that's because the test exercises
the edge case of introducing a circular dependency.


(rillig)

diff -r1.591 -r1.592 src/usr.bin/make/parse.c
diff -r1.4 -r1.5 src/usr.bin/make/unit-tests/deptgt-order.exp

--- src/usr.bin/make/parse.c 2021/12/28 15:48:59	1.591
+++ src/usr.bin/make/parse.c 2021/12/28 16:11:00	1.592

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.591 2021/12/28 15:48:59 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.592 2021/12/28 16:11:00 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -99,27 +99,27 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.591 2021/12/28 15:48:59 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.592 2021/12/28 16:11:00 rillig Exp $");
 /* types and constants */
 /*
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
 	FStr name;		/* absolute or relative to the cwd */
 	bool fromForLoop;	/* simulated .include by the .for loop */
 	int lineno;		/* current line number in file */
 	int first_lineno;	/* line number of start of text */
 	unsigned int cond_depth; /* 'if' nesting when file opened */
 	bool depending;	/* state of doing_depend on EOF */
 @@ -890,28 +890,27 @@ ParseDependencySourceOrder(const char *s
 	GNode *gn;
 	/*
 	 * Create proper predecessor/successor links between the previous
 	 * source and the current one.
 	 */
 	gn = Targ_GetNode(src);
 	if (doing_depend)
 		RememberLocation(gn);
 	if (order_pred != NULL) {
 		Lst_Append(&order_pred->order_succ, gn);
 		Lst_Append(&gn->order_pred, order_pred);
 		if (DEBUG(PARSE)) {
 			debug_printf(
-			    "# ParseDependencySourceOrder: "
+			    "# .ORDER forces '%s' to be made before '%s'\n",
 			    "added Order dependency %s - %s\n",
 			    order_pred->name, gn->name);
 			Targ_PrintNode(order_pred, 0);
 			Targ_PrintNode(gn, 0);
+		}
+	}
 	/*
 	 * The current source now becomes the predecessor for the next one.
 	 */
 	order_pred = gn;
+}
 static void
 ParseDependencySourceOther(const char *src, GNodeType targetAttr,

--- src/usr.bin/make/unit-tests/deptgt-order.exp 2021/12/28 15:49:00	1.4
+++ src/usr.bin/make/unit-tests/deptgt-order.exp 2021/12/28 16:11:00	1.5

 @@ -1,11 +1,11 @@
 Parsing line 15: .ORDER: three one
 ParseDependency(.ORDER: three one)
-# ParseDependencySourceOrder: added Order dependency three - one
+# .ORDER forces 'three' to be made before 'one'
 # three, unmade, type OP_DEPENDS|OP_PHONY|OP_HAS_COMMANDS, flags none
 # one, unmade, type OP_DEPENDS|OP_PHONY, flags none
 Parsing line 16: .MAKEFLAGS: -d0
 ParseDependency(.MAKEFLAGS: -d0)
 : 'Making two out of one.'
 : 'Making three out of two.'
 : 'Making all out of three.'
 exit status 0