[Git][NTPsec/ntpsec][master] 3 commits: Follow through on name change of ntpviz option.

[Eric S. Raymond]

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


Commits:
f3a7b940 by Eric S. Raymond at 2016-08-10T11:12:55-04:00
Follow through on name change of ntpviz option.

- - - - -
80d17739 by Eric S. Raymond at 2016-08-11T00:46:34-04:00
Add a clean exit condition to an ntpvix branch.

- - - - -
4e6f6197 by Eric S. Raymond at 2016-08-11T00:46:38-04:00
Clean up and better document script installation.

- - - - -


4 changed files:

- INSTALL
- docs/includes/ntpviz-body.txt
- ntpstats/ntpviz
- wscript


Changes:

=====================================
INSTALL
=====================================
--- a/INSTALL
+++ b/INSTALL
@@ -121,15 +121,17 @@ Under Unix, the simplest way to compile this package is:
   You may want to add configuration options after the verb 'configure';
   see below.
 
-  3. Type `./waf build' to compile the package.
+  3. Invoke `./waf build' to compile the package.
 
-  4. Type `./waf install' to install the programs and any data files and
+  4. Invoke `./waf install' to install the programs and any data files and
      documentation.
 
-  5. You can remove the program binaries and object files from the
+  5. You can uninstall cleanly by invoking `./waf uninstall' as root.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `./waf clean'.
 
-  6. To also remove the files that `./waf configure' created (so you can
+  7. To also remove the files that `./waf configure' created (so you can
      configure and compile the package for a different kind of
      computer), type `./waf distclean'.
 


=====================================
docs/includes/ntpviz-body.txt
=====================================
--- a/docs/includes/ntpviz-body.txt
+++ b/docs/includes/ntpviz-body.txt
@@ -6,7 +6,7 @@
 == SYNOPSIS ==
 [verse]
 {ntpviz} [-d statsdir] [-g] [-n name] [-p period] [-s starttime]
-         [--clock-offset | --clock-jitter | --clock-stability]
+         [--local-offset | --local-jitter | --local-stability]
          [--peer-offsets hosts | --all-peer-offsets]
          [--peer-jitters hosts | --all-peer-jitters]
 


=====================================
ntpstats/ntpviz
=====================================
--- a/ntpstats/ntpviz
+++ b/ntpstats/ntpviz
@@ -3,7 +3,7 @@
 ntpviz - logfile visualizer for NTP log files
 
 Usage: ntpviz [-d statsdir] [-g] [-n name] [-p period] [-s starttime]
-              [--clock-offset | --clock-jitter | --clock-stability]
+              [--local-offset | --local-jitter | --local-stability]
               [--peer-offsets hosts | --all-peer-offsets]
               [--peer-jitters hosts | --all-peer-jitters]
 
@@ -113,6 +113,7 @@ if __name__ == '__main__':
             gnuplot(plot)
         else:
             sys.stdout.write(plot)
+        raise SystemExit(0)
 
 
 # end


=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -146,23 +146,30 @@ def build(ctx):
 	ctx.recurse("util")
 	ctx.recurse("tests")
 
-
-	subst_scripts = [
-		"ntpwait/ntpwait",
+	# These don't have installation productions yet.
+	# Installarion for their required Perl and Python libraries
+	# needs to be worked out first. Awkwardly, their man pages do
+	# get installed. There is a note about this mess in INSTALL.
+	scripts = [
+		"ntpleapfetch/ntpleapfetch",
+		"ntpstats/ntpviz",
 		"ntptrace/ntptrace",
+		"ntpwait/ntpwait",
 		"util/ntpsweep/ntpsweep",
 	]
 
 	ctx(
 		features    = "subst",
-		source      = subst_scripts,
-		target	    = [x.replace(".in", "") for x in subst_scripts],
+		source      = scripts,
+		target	    = scripts,
 		chmod	    = Utils.O755
 	)
 
 	ctx.manpage(8, "ntpleapfetch/ntpleapfetch-man.txt")
-	ctx.manpage(8, "ntpwait/ntpwait-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, "util/ntpsweep/ntpsweep-man.txt")
 
 
 	# Skip running unit tests on a cross compile build



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/ba759190fb1471442196ee0b250d71c9ac5bc76c...4e6f6197fc7ebb8bd9ef7fa6c99e5bb094313bb1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160811/bd7b2f46/attachment.html>