[Git][NTPsec/ntpsec][master] 2 commits: Reformat for readbility.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
2598e2de by Eric S. Raymond at 2016-10-02T19:54:38-04:00
Reformat for readbility.

- - - - -
7d6693b8 by Eric S. Raymond at 2016-10-02T20:04:30-04:00
Address GitLab issue #74: ./waf install includes spurious test_* binaries

Also, uniformly use install_path = None rather than install_path = False, as
the maintainer recommends.

- - - - -


3 changed files:

- ntpd/wscript
- tests/wscript
- util/wscript


Changes:

=====================================
ntpd/wscript
=====================================
--- a/ntpd/wscript
+++ b/ntpd/wscript
@@ -34,7 +34,7 @@ def build(ctx):
 							"%s/ntpd/" % bldnode,
 							"%s/" % ctx.bldnode.parent.abspath()
 			],
-			install_path= False
+			install_path= None,
 		)
 
 		# XXX: needs a dependency to rebuild ntp_keyword.h when keyword-gen is rebuilt


=====================================
tests/wscript
=====================================
--- a/tests/wscript
+++ b/tests/wscript
@@ -38,16 +38,17 @@ def build(ctx):
 	# ntpdig/
 	if ctx.env.LIBEVENT2_ENABLE:
 		ctx.ntp_test(
-			features    = "c cprogram bld_include src_include libisc_include test",
-	        target      = "test_ntpdig",
+			features	= "c cprogram bld_include src_include libisc_include test",
+	        	target		= "test_ntpdig",
+			install_path	= None,
 			defines		= unity_config + ["TEST_NTPDIG=1"],
 			includes	= [
-				"%s/tests/unity/" % srcnode,
-				"%s/tests/common/" % srcnode,
-				"%s/ntpdig/" % srcnode
+						"%s/tests/unity/" % srcnode,
+						"%s/tests/common/" % srcnode,
+						"%s/ntpdig/" % srcnode
 			],
-			use			= "unity ntpdig_obj ntp",
-	        source      = ntpdig_source,
+			use		= "unity ntpdig_obj ntp",
+	        	source		= ntpdig_source,
 			test_args	= ["%s/tests/ntpdig/data/" % srcnode, "%s/tests/ntpdig/" % bldnode]
 		)
 
@@ -85,17 +86,18 @@ def build(ctx):
 	] + common_source
 
 	ctx.ntp_test(
-		features    = "c cprogram bld_include src_include libisc_include test",
-        	target      = "test_libntp",
+		features	= "c cprogram bld_include src_include libisc_include test",
+        	target		= "test_libntp",
+		install_path	= None,
 		defines		= unity_config + ["TEST_LIBNTP=1"],
 		includes	= [
-			"%s/tests/unity/" % srcnode,
-			"%s/tests/libntp/" % srcnode,
-			"%s/tests/ntpdig/" % srcnode,
-			"%s/tests/common/" % srcnode
-		],
-		use			= "unity ntp isc M PTHREAD CRYPTO RT",
-        source      = libntp_source,
+					"%s/tests/unity/" % srcnode,
+					"%s/tests/libntp/" % srcnode,
+					"%s/tests/ntpdig/" % srcnode,
+					"%s/tests/common/" % srcnode
+				],
+		use		= "unity ntp isc M PTHREAD CRYPTO RT",
+		source		= libntp_source,
 	)
 
 	ntpd_source = [
@@ -104,15 +106,16 @@ def build(ctx):
 	] + common_source
 
 	ctx.ntp_test(
-		features    = "c cprogram bld_include src_include libisc_include test",
-        target      = "test_ntpd",
+		features	= "c cprogram bld_include src_include libisc_include test",
+        	target		= "test_ntpd",
+		install_path	= None,
 		defines		= unity_config + ["TEST_NTPD=1"],
 		includes	= [
-			"%s/tests/unity/" % srcnode,
-			"%s/ntpd/" % srcnode,
-			"%s/tests/libntp/" % srcnode,
-			"%s/tests/common/" % srcnode
-		],
-		use			= "ntpd_lib libntpd_obj unity ntp isc M PTHREAD CRYPTO RT",
-        source      = ntpd_source,
+					"%s/tests/unity/" % srcnode,
+					"%s/ntpd/" % srcnode,
+					"%s/tests/libntp/" % srcnode,
+					"%s/tests/common/" % srcnode
+				],
+		use		= "ntpd_lib libntpd_obj unity ntp isc M PTHREAD CRYPTO RT",
+        	source		= ntpd_source,
 	)


=====================================
util/wscript
=====================================
--- a/util/wscript
+++ b/util/wscript
@@ -15,6 +15,6 @@ def build(ctx):
 						"%s/%s/" % (bldnode, name)
 					],
 			use		= "ntp opts isc M RT THR PTHREAD",
-			install_path    = False
+			install_path    = None,
 		)
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/3be6e25341cc697d6a4f066f9d179cda020dbf3b...7d6693b815eeb845b211c65e42b36ad9d0f8040f
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20161003/eecfdf91/attachment.html>