[ntpsec commit] We don't care whether an installable is C or Perl...

Eric S. Raymond esr at ntpsec.org
Tue Oct 20 09:58:52 UTC 2015


Module:    ntpsec
Branch:    master
Commit:    58f24e4c6e6445d18c958c7717433d36d532f183
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=58f24e4c6e6445d18c958c7717433d36d532f183

Author:    Eric S. Raymond <esr at thyrsus.com>
Date:      Tue Oct 20 05:56:43 2015 -0400

We don't care whether an installable is C or Perl...

...and we won't care when the Perl ones are Pyhton, either.
Reorganize directories appropriately.

---

 README                                             | 7 +++++--
 devel-docs/TODO                                    | 6 +++---
 {scripts/lib => perllib}/NTP/Mode6/Packet.pm       | 0
 {scripts/lib => perllib}/NTP/Util.pm               | 0
 scripts/README                                     | 8 ++------
 {scripts/t => tests/perl}/1_common.t               | 0
 {scripts/t => tests/perl}/calc_tickadj.t           | 0
 {scripts/t => tests/perl}/lib/Test/Command.pm      | 0
 {scripts/t => tests/perl}/lib/Test/Mode6/Server.pm | 0
 {scripts/t => tests/perl}/lib/Test/Util.pm         | 0
 {scripts/t => tests/perl}/ntpsweep.t               | 0
 {scripts/t => tests/perl}/ntptrace.t               | 0
 {scripts/t => tests/perl}/ntpwait.t                | 0
 {scripts/t => tests/perl}/plot_summary.t           | 0
 {scripts/t => tests/perl}/summary.t                | 0
 {scripts/t => tests/perl}/util.t                   | 0
 16 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/README b/README
index e9bd89d..8619aa1 100644
--- a/README
+++ b/README
@@ -79,15 +79,18 @@ ntpq/::		Directory containing sources for a utility program to
 ntptime/:: 	Directory containing a utility for reading and modifying
 		kernel parameters related to the local clock.
 
-ntptrace::	Directory containing source for a utility program that
+ntptrace/::	Directory containing source for a utility program that
 		can be used to reveal the chain of NTP peers from a
 		designated peer to the primary server at the root of the
 		timekeeping subnet.
 
-ntpwait::	Directory contsining a script that nlocks until ntpd is
+ntpwait/::	Directory contsining a script that nlocks until ntpd is
 		in state 4 (synchronized). Useful at boot time, to delay
 		the boot sequence until after "ntpd -g" has set the time.
 
+perllib/::	NTP interface package required to query Mode 6 packets
+		from the daemon from Perl scripts.
+
 ports/::	Subdirectories of this contain code for non-Unix operating
 		systems.  At present there is just one, for Windows.
 
diff --git a/devel-docs/TODO b/devel-docs/TODO
index 2e1da53..39972ab 100644
--- a/devel-docs/TODO
+++ b/devel-docs/TODO
@@ -23,9 +23,9 @@ None right now. (Sep-22 2015)
   is right if we're trying to install a test setup to userspace but wrong
   in the normal case - we want /sbin, not /usr/sbin.
 
-* There's no installation yet for ntpleapfetch, or the three Perl
-  executables under scripts/ that should be installed (ntpwait, ntpsweep,
-  ntptrace), or their support library under scripts/lib/.
+* There's no installation yet for ntpleapfetch, or the Perl
+  executables that should be installed (ntpwait, ntptrace), nor
+  for their support library under perllib/.
 
 * The install production needs to warn of stale ntpdc and ntpdate binaries.
 
diff --git a/scripts/lib/NTP/Mode6/Packet.pm b/perllib/NTP/Mode6/Packet.pm
similarity index 100%
rename from scripts/lib/NTP/Mode6/Packet.pm
rename to perllib/NTP/Mode6/Packet.pm
diff --git a/scripts/lib/NTP/Util.pm b/perllib/NTP/Util.pm
similarity index 100%
rename from scripts/lib/NTP/Util.pm
rename to perllib/NTP/Util.pm
diff --git a/scripts/README b/scripts/README
index b288d3c..43e40be 100644
--- a/scripts/README
+++ b/scripts/README
@@ -1,14 +1,11 @@
 == README file for directory scripts/ ==
 
 This directory contains shell and perl script files for the configuration,
-monitoring and support of NTP installations.  Not all of these are
-installed in a normal setup
+monitoring and support of NTP installations.  These are not installed in
+a normal setup
 
 calc_tickadj::	Calculates "optimal" value for tick given ntp.drift file
 
-lib::		NTP interface package required to query Mode 6 packets
-		from the daemon from Perl scripts.
-
 monitoring::	Directory containing perl scripts useful for monitoring
                 operations
 
@@ -29,6 +26,5 @@ stats::		directory containing awk and shell scripts useful for
 summary::	Generate summary files out of stat files produced by NTP
                 daemon.
 
-t::		Tests for the scripts.
 
 // end
diff --git a/scripts/t/1_common.t b/tests/perl/1_common.t
similarity index 100%
rename from scripts/t/1_common.t
rename to tests/perl/1_common.t
diff --git a/scripts/t/calc_tickadj.t b/tests/perl/calc_tickadj.t
similarity index 100%
rename from scripts/t/calc_tickadj.t
rename to tests/perl/calc_tickadj.t
diff --git a/scripts/t/lib/Test/Command.pm b/tests/perl/lib/Test/Command.pm
similarity index 100%
rename from scripts/t/lib/Test/Command.pm
rename to tests/perl/lib/Test/Command.pm
diff --git a/scripts/t/lib/Test/Mode6/Server.pm b/tests/perl/lib/Test/Mode6/Server.pm
similarity index 100%
rename from scripts/t/lib/Test/Mode6/Server.pm
rename to tests/perl/lib/Test/Mode6/Server.pm
diff --git a/scripts/t/lib/Test/Util.pm b/tests/perl/lib/Test/Util.pm
similarity index 100%
rename from scripts/t/lib/Test/Util.pm
rename to tests/perl/lib/Test/Util.pm
diff --git a/scripts/t/ntpsweep.t b/tests/perl/ntpsweep.t
similarity index 100%
rename from scripts/t/ntpsweep.t
rename to tests/perl/ntpsweep.t
diff --git a/scripts/t/ntptrace.t b/tests/perl/ntptrace.t
similarity index 100%
rename from scripts/t/ntptrace.t
rename to tests/perl/ntptrace.t
diff --git a/scripts/t/ntpwait.t b/tests/perl/ntpwait.t
similarity index 100%
rename from scripts/t/ntpwait.t
rename to tests/perl/ntpwait.t
diff --git a/scripts/t/plot_summary.t b/tests/perl/plot_summary.t
similarity index 100%
rename from scripts/t/plot_summary.t
rename to tests/perl/plot_summary.t
diff --git a/scripts/t/summary.t b/tests/perl/summary.t
similarity index 100%
rename from scripts/t/summary.t
rename to tests/perl/summary.t
diff --git a/scripts/t/util.t b/tests/perl/util.t
similarity index 100%
rename from scripts/t/util.t
rename to tests/perl/util.t



More information about the vc mailing list