[Git][NTPsec/ntpsec][master] Deleted 2 commits: Add module install of pylib.

[Eric S. Raymond]

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


WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below.


Deleted commits:
e9db8066 by Eric S. Raymond at 2016-08-19T14:52:39-04:00
Add module install of pylib.

- - - - -
04b48b7c by Eric S. Raymond at 2016-08-19T14:52:39-04:00
Move ntpstats/ntpstats.py to pylib/statfiles.py.

Create an ntpstats/ntp symlink to pylib so ntpviz can be run in place
for testing.

- - - - -


6 changed files:

- + ntpstats/ntp
- ntpstats/ntpviz
- − ntpstats/wscript
- ntpstats/ntpstats.py → pylib/statfiles.py
- pylib/wscript
- wscript


Changes:

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


=====================================
ntpstats/ntpviz
=====================================
--- a/ntpstats/ntpviz
+++ b/ntpstats/ntpviz
@@ -19,7 +19,7 @@ Python by ESR, concept and GNUPLOT code by Dan Drown.
 from __future__ import print_function, division
 
 import os, sys, getopt, socket, binascii, datetime, collections, gzip
-from ntpstats import *
+from ntp.statfiles import *
 
 # RMS frequency jitter - Deviation from a root-mean-square linear approximation?
 # Investigate.


=====================================
ntpstats/wscript deleted
=====================================
--- a/ntpstats/wscript
+++ /dev/null
@@ -1,9 +0,0 @@
-def options(opt):
-        opt.load('python')
-
-def configure(conf):
-        conf.load('python')
-        conf.check_python_version((2,7,0))
-
-def build(bld):
-        bld(features='py', source=bld.path.ant_glob('*.py'), install_from='.')


=====================================
ntpstats/ntpstats.py → pylib/statfiles.py
=====================================
--- a/ntpstats/ntpstats.py
+++ b/pylib/statfiles.py
@@ -1,5 +1,5 @@
 """
-ntpstats.py - class for digesting and plotting NTP logfiles
+statfiles.py - class for digesting and plotting NTP logfiles
 
 Requires GNUPLOT and liberation fonts installed.
 


=====================================
pylib/wscript
=====================================
--- a/pylib/wscript
+++ b/pylib/wscript
@@ -5,4 +5,4 @@ def configure(conf):
         conf.load('python')
 
 def build(bld):
-        pass	# Don't know how to install compound module yet
+	bld(features='py', source=bld.path.ant_glob('*.py'), install_from='.',install_path='${PYTHONDIR}/ntp')


=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -37,13 +37,12 @@ def dist(ctx):
 
 def options(ctx):
 	options_cmd(ctx, config)
-	ctx.recurse("ntpstats")
 	ctx.recurse("pylib")
 
 def configure(ctx):
 	from wafhelpers.configure import cmd_configure
 	cmd_configure(ctx, config)
-	ctx.recurse("ntpstats")
+	ctx.recurse("pylib")
 
 from waflib.Build import BuildContext
 class check(BuildContext):
@@ -145,7 +144,7 @@ def build(ctx):
 	ctx.recurse("ntpq")
 	ctx.recurse("ntpkeygen")
 	ctx.recurse("ntptime")
-	ctx.recurse("ntpstats")
+	ctx.recurse("pylib")
 	ctx.recurse("util")
 	ctx.recurse("tests")
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/9a9d2c4bfabb85cda329a00c290b20a947d9f183...04b48b7cb1636da864989866a66cdbd5853beb6e
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160819/876b0cbe/attachment.html>