From 2e3c52bbb0d061fd595d0f5528e2a4ff8e34f17c Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 24 Oct 2018 17:09:59 -0700
Subject: [PATCH] Don't show compilation dependencies by default.

---
 src/compiler/base/toplev.scm              | 33 +++++++++++------------
 src/compiler/machines/C/compiler.pkg      |  1 +
 src/compiler/machines/i386/compiler.pkg   |  1 +
 src/compiler/machines/svm/compiler.pkg    |  1 +
 src/compiler/machines/x86-64/compiler.pkg |  1 +
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/compiler/base/toplev.scm b/src/compiler/base/toplev.scm
index 6636b5db6..81bd2e749 100644
--- a/src/compiler/base/toplev.scm
+++ b/src/compiler/base/toplev.scm
@@ -34,6 +34,7 @@ USA.
 (define compile-file:override-usual-integrations '())
 (define compile-file:sf-only? #f)
 (define compile-file:force? #f)
+(define compile-file:show-dependencies? #f)
 (define compiler:compile-data-files-as-expressions? #t)
 (define compile-file)
 (let ((scm-pathname (lambda (path) (pathname-new-type path "scm")))
@@ -64,21 +65,21 @@ USA.
 			     (cons input-file dependencies))))))
 	  (if (pair? reasons)
 	      (begin
-		(write-notification-line
-		 (lambda (port)
-		   (write-string "Generating " port)
-		   (write (->namestring output-file) port)
-		   (write-string " because of:" port)
-		   (for-each (lambda (reason)
-			       (write-char #\space port)
-			       (write (->namestring reason) port))
-			     reasons)))
+		(if compile-file:show-dependencies?
+		    (write-notification-line
+		     (lambda (port)
+		       (write-string "Generating " port)
+		       (write (->namestring output-file) port)
+		       (write-string " because of:" port)
+		       (for-each (lambda (reason)
+				   (write-char #\space port)
+				   (write (->namestring reason) port))
+				 reasons))))
 		(doit)))))))
 
   (set! compile-file
 	(named-lambda (compile-file file #!optional dependencies environment)
-	  (process-file (scm-pathname file)
-			(bin-pathname file)
+	  (process-file (scm-pathname file) (bin-pathname file)
 			(map ext-pathname
 			     (if (default-object? dependencies)
 				 '()
@@ -91,20 +92,18 @@ USA.
 				 (if (not (environment? environment))
 				     (error:wrong-type-argument environment
 								"environment"
-								'COMPILE-FILE))
+								'compile-file))
 				 environment)))
 			  (sf/default-declarations
-			   `((USUAL-INTEGRATIONS
+			   `((usual-integrations
 			      ,@compile-file:override-usual-integrations)
 			     ,@(let ((deps (filter ext-pathname? dependencies)))
 				 (if (null? deps)
 				     '()
-				     `((INTEGRATE-EXTERNAL ,@deps)))))))
+				     `((integrate-external ,@deps)))))))
 		(sf input-file output-file))))
 	  (if (not compile-file:sf-only?)
-	      (process-file (bin-pathname file)
-			    (com-pathname file)
-			    '()
+	      (process-file (bin-pathname file) (com-pathname file) '()
 		(lambda (input-file output-file dependencies)
 		  dependencies
 		  (fluid-let ((compiler:coalescing-constant-warnings? #f))
diff --git a/src/compiler/machines/C/compiler.pkg b/src/compiler/machines/C/compiler.pkg
index a14458be4..5013be5ff 100644
--- a/src/compiler/machines/C/compiler.pkg
+++ b/src/compiler/machines/C/compiler.pkg
@@ -235,6 +235,7 @@ USA.
 	  compile-file:force?
 	  compile-file:override-usual-integrations
 	  compile-file:sf-only?
+	  compile-file:show-dependencies?
 	  compile-procedure
 	  compile-scode
 	  compiler:compiled-code-pathname-type
diff --git a/src/compiler/machines/i386/compiler.pkg b/src/compiler/machines/i386/compiler.pkg
index e81948558..f77d28be7 100644
--- a/src/compiler/machines/i386/compiler.pkg
+++ b/src/compiler/machines/i386/compiler.pkg
@@ -235,6 +235,7 @@ USA.
 	  compile-file:force?
 	  compile-file:override-usual-integrations
 	  compile-file:sf-only?
+	  compile-file:show-dependencies?
 	  compile-procedure
 	  compile-scode
 	  compiler:compiled-code-pathname-type
diff --git a/src/compiler/machines/svm/compiler.pkg b/src/compiler/machines/svm/compiler.pkg
index a0ee4a5c5..666311208 100644
--- a/src/compiler/machines/svm/compiler.pkg
+++ b/src/compiler/machines/svm/compiler.pkg
@@ -235,6 +235,7 @@ USA.
 	  compile-file:force?
 	  compile-file:override-usual-integrations
 	  compile-file:sf-only?
+	  compile-file:show-dependencies?
 	  compile-procedure
 	  compile-scode
 	  compiler:compiled-code-pathname-type
diff --git a/src/compiler/machines/x86-64/compiler.pkg b/src/compiler/machines/x86-64/compiler.pkg
index 0c9e89aae..b1bab34a4 100644
--- a/src/compiler/machines/x86-64/compiler.pkg
+++ b/src/compiler/machines/x86-64/compiler.pkg
@@ -235,6 +235,7 @@ USA.
 	  compile-file:force?
 	  compile-file:override-usual-integrations
 	  compile-file:sf-only?
+	  compile-file:show-dependencies?
 	  compile-procedure
 	  compile-scode
 	  compiler:compiled-code-pathname-type
-- 
2.25.1