[Git][NTPsec/ntpsec][master] 2 commits: Banish a waf -v warning.

[Eric S. Raymond]

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


Commits:
c6b4ff61 by Eric S. Raymond at 2016-11-06T00:05:27-04:00
Banish a waf -v warning.

- - - - -
9fc48582 by Eric S. Raymond at 2016-11-06T04:22:07-05:00
Make magic links to support in-tree testing.

- - - - -


9 changed files:

- .gitignore
- − ntpq/ntp
- − ntpstats/ntp
- − ntpsweep/ntp
- − ntptrace/ntp
- − ntpwait/ntp
- − pylib/ntpc.so
- pylib/wscript
- wscript


Changes:

=====================================
.gitignore
=====================================
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 pylib/version.py
 pylib/ntp_control.py
 pylib/ntp_magic.py
-pylib/libntpc.so
+*/ntp
 wafhelpers/.autorevision-cache
 .lock-waf*
 .waf*


=====================================
ntpq/ntp deleted
=====================================
--- a/ntpq/ntp
+++ /dev/null
@@ -1 +0,0 @@
-../pylib
\ No newline at end of file


=====================================
ntpstats/ntp deleted
=====================================
--- a/ntpstats/ntp
+++ /dev/null
@@ -1 +0,0 @@
-../pylib/
\ No newline at end of file


=====================================
ntpsweep/ntp deleted
=====================================
--- a/ntpsweep/ntp
+++ /dev/null
@@ -1 +0,0 @@
-../pylib/
\ No newline at end of file


=====================================
ntptrace/ntp deleted
=====================================
--- a/ntptrace/ntp
+++ /dev/null
@@ -1 +0,0 @@
-../pylib
\ No newline at end of file


=====================================
ntpwait/ntp deleted
=====================================
--- a/ntpwait/ntp
+++ /dev/null
@@ -1 +0,0 @@
-../pylib
\ No newline at end of file


=====================================
pylib/ntpc.so deleted
=====================================
--- a/pylib/ntpc.so
+++ /dev/null
@@ -1 +0,0 @@
-../build/main/libntp/ntpc.so
\ No newline at end of file


=====================================
pylib/wscript
=====================================
--- a/pylib/wscript
+++ b/pylib/wscript
@@ -41,7 +41,6 @@ def build(ctx):
 	)
 
     ctx(
-	after       = ['pyc', 'pyo'],
 	features     ='py',
 	source       = ctx.path.ant_glob('*.py'),
 	install_from = '.',


=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -3,6 +3,7 @@ from waflib.Build import BuildContext, CleanContext, InstallContext, UninstallCo
 from waflib import Context, Errors
 from waflib import Scripting
 from waflib.Logs import pprint
+import os
 
 pprint.__doc__ = None
 
@@ -174,13 +175,24 @@ def build(ctx):
 		install_path = "${PREFIX}/bin/"
 	)
 
+	# Make magic links to support in-tree testing.
+	# The idea is that all directories where the Python tools
+	# listed above live should have an 'ntp' symlink so they
+	# can import compiled Python modules from the build directory.
+	# Also, they need to be able to see the Python extension
+	# module built in libntp.
+	bldnode = ctx.bldnode.abspath()
+	srcnode = ctx.srcnode.abspath()
+	for d in ("ntpq", "ntpstats", "ntpsweep", "ntptrace", "ntpwait"):
+		os.system("ln -sf %s/pylib %s/%s/ntp" % (bldnode, srcnode, d))
+	os.system("ln -sf %s/libntp/ntpc.so %s/pylib/ntpc.so " % (bldnode, bldnode))
+
 	ctx.manpage(8, "ntpleapfetch/ntpleapfetch-man.txt")
 	ctx.manpage(1, "ntptrace/ntptrace-man.txt")
 	ctx.manpage(1, "ntpstats/ntpviz-man.txt")
 	ctx.manpage(8, "ntpwait/ntpwait-man.txt")
 	ctx.manpage(1, "ntpsweep/ntpsweep-man.txt")
 
-
 	# Skip running unit tests on a cross compile build
 	if not ctx.env.ENABLE_CROSS:
 		# Force re-running of tests.  Same as 'waf --alltests'



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/66de0c0d3964b9f452a13e3cd7adfdee9baaf71b...9fc4858222232a284da1ba46e6bcc5adeb7bab2c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20161106/90bd365c/attachment.html>