[ntpsec commit] Finiush namespace cleanup: ntpkeygen and ntpwait.
Eric S. Raymond
esr at ntpsec.org
Wed Oct 14 00:57:29 UTC 2015
Module: ntpsec
Branch: master
Commit: 36e61b940bd154c562e6f06879366db4950e059a
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=36e61b940bd154c562e6f06879366db4950e059a
Author: Eric S. Raymond <esr at thyrsus.com>
Date: Tue Oct 13 20:56:38 2015 -0400
Finiush namespace cleanup: ntpkeygen and ntpwait.
---
README | 2 +-
docs/asciidoc.conf | 10 ++---
docs/includes/keygen-body.txt | 4 +-
.../{ntp-wait-body.txt => ntpwait-body.txt} | 2 +-
docs/index.txt | 3 +-
docs/{keygen.txt => ntpkeygen.txt} | 0
docs/{ntp-wait.txt => ntpwait.txt} | 2 +-
.../ntpkeygen-man.txt.in | 2 +-
ntp-keygen/ntp-keygen.c => ntpkeygen/ntpkeygen.c | 2 +-
{ntp-keygen => ntpkeygen}/wscript | 6 +--
ports/winnt/vs2005/ntpkeygen.vcproj | 48 +++++++++++-----------
ports/winnt/vs2008/ntp.sln | 2 +-
.../ntpkeygen.vcproj} | 24 +++++------
ports/winnt/vs2013/ntp.sln | 2 +-
.../ntpkeygen.vcxproj} | 30 +++++++-------
.../ntpkeygen.vcxproj.filters} | 4 +-
scripts/README | 2 +-
.../ntpwait-man.txt.in} | 4 +-
.../ntp-wait-opts => ntpwait/ntpwait-opts} | 8 ++--
.../{ntp-wait/ntp-wait.in => ntpwait/ntpwait.in} | 0
scripts/rc/rc.d/ntpwait | 4 +-
scripts/t/1_common.t | 2 +-
scripts/t/{ntp-wait.t => ntpwait.t} | 2 +-
wscript | 8 ++--
24 files changed, 87 insertions(+), 86 deletions(-)
diff --git a/README b/README
index 37f7347..922b08f 100644
--- a/README
+++ b/README
@@ -58,7 +58,7 @@ ntpdate/:: Directory containing sources for a program to set the
local machine time from one or more remote machines
running NTP. Operates like rdate, but much more accurate.
-ntp-keygen::
+ntpkeygen::
Directory containing the utility program used to generate
NTP authentication keys.
diff --git a/docs/asciidoc.conf b/docs/asciidoc.conf
index 19ecf91..ea22949 100644
--- a/docs/asciidoc.conf
+++ b/docs/asciidoc.conf
@@ -19,20 +19,20 @@ ntp=ntp
ntpd=ntpd
ntpdig=ntpdig
ntpdconf=ntpd.conf
-ntpkeygen=ntp-keygen
+ntpkeygen=ntpkeygen
ntpkeys=ntp.keys
ntpq=ntpq
ntptickadj=ntptickadj
ntptime=ntptime
-ntpwait=ntp-wait
+ntpwait=ntpwait
# Annoyingly, these have to be *manually* synchronized with the headers
# on their manual pages - asciidoc doesn't expand attributes in header lines.
ntpdconfman=ntp.conf(5)
-ntpkeygenman=ntp-keygen(8)
+ntpkeygenman=ntpkeygen(8)
ntpkeysman=ntp.keys(5)
ntpdman=ntpd(8)
ntpqman=ntpq(1)
-ntptickadjman=tntptickadj(8)
+ntptickadjman=ntptickadj(8)
ntptimeman=ntptime(8)
-ntpwaitman=ntp-wait(8)
+ntpwaitman=ntpwait(8)
ntpdigman=ntpdig(1)
diff --git a/docs/includes/keygen-body.txt b/docs/includes/keygen-body.txt
index ebb9bb0..394751e 100644
--- a/docs/includes/keygen-body.txt
+++ b/docs/includes/keygen-body.txt
@@ -1,4 +1,4 @@
-// This is the body of the manual page for ntp-keygen.
+// This is the body of the manual page for ntpkeygen.
// It's included in two places: once for the docs/ HTML
// tree, and once to make an individual man page.
@@ -349,7 +349,7 @@ or dynamic means described on the _Automatic_ _NTP_ _Configuration_
_Options_ section of {ntpconfman}.
On each trusted host as root, change to the keys directory. To insure a
-fresh fileset, remove all _ntpkey_ files. Then run `ntp-keygen` `-T` to
+fresh fileset, remove all _ntpkey_ files. Then run `{ntpkeygen}` `-T` to
generate keys and a trusted certificate. On all other hosts do the same,
but leave off the `-T` flag to generate keys and nontrusted
certificates. When complete, start the NTP daemons beginning at the
diff --git a/docs/includes/ntp-wait-body.txt b/docs/includes/ntpwait-body.txt
similarity index 94%
rename from docs/includes/ntp-wait-body.txt
rename to docs/includes/ntpwait-body.txt
index 9e4fbab..8ca87d6 100644
--- a/docs/includes/ntp-wait-body.txt
+++ b/docs/includes/ntpwait-body.txt
@@ -33,7 +33,7 @@ returns "the time is not yet stable".
`-v`, `--verbose`::
Be verbose.
+
-By default, `{ntpwait}` is silent. With this option, `ntp-wait` will
+By default, `{ntpwait}` is silent. With this option, `{ntpwait}` will
provide status information.
== AUTHOR ==
diff --git a/docs/index.txt b/docs/index.txt
index 3e25aad..226eb66 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -88,7 +88,8 @@ few will be user-visible:
* The sntp program has been renamed {ntpdig} in order to make
NTP installables have a uniform name prefix and take up less
- namespace.
+ namespace. Also, `ntp-keygen` is now {ntpkeygen} and `ntp-wait`
+ is {ntpwait}.
* The deprecated ntpdate program has been replaced with a shell
wrapper around {ntpdig}.
diff --git a/docs/keygen.txt b/docs/ntpkeygen.txt
similarity index 100%
rename from docs/keygen.txt
rename to docs/ntpkeygen.txt
diff --git a/docs/ntp-wait.txt b/docs/ntpwait.txt
similarity index 72%
rename from docs/ntp-wait.txt
rename to docs/ntpwait.txt
index 4f9813f..db554c6 100644
--- a/docs/ntp-wait.txt
+++ b/docs/ntpwait.txt
@@ -1,6 +1,6 @@
= `{ntpwait}` - wait until {ntpd} is in synchronized state =
-include::includes/ntp-wait-body.txt[]
+include::includes/ntpwait-body.txt[]
'''''
diff --git a/ntp-keygen/ntp-keygen-man.txt.in b/ntpkeygen/ntpkeygen-man.txt.in
similarity index 94%
rename from ntp-keygen/ntp-keygen-man.txt.in
rename to ntpkeygen/ntpkeygen-man.txt.in
index 625c9a5..4eb18c7 100644
--- a/ntp-keygen/ntp-keygen-man.txt.in
+++ b/ntpkeygen/ntpkeygen-man.txt.in
@@ -1,4 +1,4 @@
-= ntp-keygen(8) =
+= ntpkeygen(8) =
:doctype: manpage
== NAME ==
diff --git a/ntp-keygen/ntp-keygen.c b/ntpkeygen/ntpkeygen.c
similarity index 99%
rename from ntp-keygen/ntp-keygen.c
rename to ntpkeygen/ntpkeygen.c
index 9fa83a7..3967c9e 100644
--- a/ntp-keygen/ntp-keygen.c
+++ b/ntpkeygen/ntpkeygen.c
@@ -193,7 +193,7 @@ readlink(
* Vista and later only. Instead, if CreateHardLink is available (XP
* and later), hardlink the linkname to the original filename. On
* earlier systems, user must rename file to match expected link for
- * ntpd to find it. To allow building a ntp-keygen.exe which loads on
+ * ntpd to find it. To allow building a ntpkeygen.exe which loads on
* Windows pre-XP, runtime link to CreateHardLinkA().
*/
int
diff --git a/ntp-keygen/wscript b/ntpkeygen/wscript
similarity index 83%
rename from ntp-keygen/wscript
rename to ntpkeygen/wscript
index 60b6b83..b06f4da 100644
--- a/ntp-keygen/wscript
+++ b/ntpkeygen/wscript
@@ -5,15 +5,15 @@ def build(ctx):
bldnode = ctx.bldnode.abspath()
ntp_keygen_source = [
- "ntp-keygen.c",
+ "ntpkeygen.c",
]
ctx(
- target = "ntp-keygen",
+ target = "ntpkeygen",
features = "c cprogram bld_include src_include libisc_include",
source = ntp_keygen_source,
includes = [
- "%s/ntp-keygen/" % bldnode
+ "%s/ntpkeygen/" % bldnode
],
use = "ntp opts isc M RT LIBEVENT LIBEVENT_CORE LIBEVENT_PTHREADS PTHREAD CRYPTO",
install_path= "${PREFIX}/bin/"
diff --git a/ports/winnt/vs2005/ntpkeygen.vcproj b/ports/winnt/vs2005/ntpkeygen.vcproj
index 0b7bc60..72529e5 100644
--- a/ports/winnt/vs2005/ntpkeygen.vcproj
+++ b/ports/winnt/vs2005/ntpkeygen.vcproj
@@ -15,8 +15,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\ntp-keygen\Debug"
- IntermediateDirectory=".\ntp-keygen\Debug"
+ OutputDirectory=".\ntpkeygen\Debug"
+ IntermediateDirectory=".\ntpkeygen\Debug"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
@@ -37,7 +37,7 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\ntp-keygen\Debug/ntpkeygen.tlb"
+ TypeLibraryName=".\ntpkeygen\Debug/ntpkeygen.tlb"
HeaderFileName=""
/>
<Tool
@@ -48,10 +48,10 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- PrecompiledHeaderFile=".\ntp-keygen\Debug/ntpkeygen.pch"
- AssemblerListingLocation=".\ntp-keygen\Debug/"
- ObjectFile=".\ntp-keygen\Debug/"
- ProgramDataBaseFileName=".\ntp-keygen\Debug/"
+ PrecompiledHeaderFile=".\ntpkeygen\Debug/ntpkeygen.pch"
+ AssemblerListingLocation=".\ntpkeygen\Debug/"
+ ObjectFile=".\ntpkeygen\Debug/"
+ ProgramDataBaseFileName=".\ntpkeygen\Debug/"
BrowseInformation="1"
WarningLevel="4"
SuppressStartupBanner="true"
@@ -71,11 +71,11 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib libntp\Debug\libntp.lib"
- OutputFile="bin/Debug/ntp-keygen.exe"
+ OutputFile="bin/Debug/ntpkeygen.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="bin/Debug/ntp-keygen.pdb"
+ ProgramDatabaseFile="bin/Debug/ntpkeygen.pdb"
SubSystem="1"
TargetMachine="1"
Version="0x0400"
@@ -92,7 +92,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\ntp-keygen\Debug/ntpkeygen.bsc"
+ OutputFile=".\ntpkeygen\Debug/ntpkeygen.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -109,8 +109,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\ntp-keygen\Release"
- IntermediateDirectory=".\ntp-keygen\Release"
+ OutputDirectory=".\ntpkeygen\Release"
+ IntermediateDirectory=".\ntpkeygen\Release"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
@@ -131,7 +131,7 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\ntp-keygen\Release/ntpkeygen.tlb"
+ TypeLibraryName=".\ntpkeygen\Release/ntpkeygen.tlb"
HeaderFileName=""
/>
<Tool
@@ -143,10 +143,10 @@
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\ntp-keygen\Release/ntpkeygen.pch"
- AssemblerListingLocation=".\ntp-keygen\Release/"
- ObjectFile=".\ntp-keygen\Release/"
- ProgramDataBaseFileName=".\ntp-keygen\Release/"
+ PrecompiledHeaderFile=".\ntpkeygen\Release/ntpkeygen.pch"
+ AssemblerListingLocation=".\ntpkeygen\Release/"
+ ObjectFile=".\ntpkeygen\Release/"
+ ProgramDataBaseFileName=".\ntpkeygen\Release/"
WarningLevel="4"
SuppressStartupBanner="true"
/>
@@ -164,10 +164,10 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib libntp\Release\libntp.lib"
- OutputFile="bin/Release/ntp-keygen.exe"
+ OutputFile="bin/Release/ntpkeygen.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- ProgramDatabaseFile="bin/Release/ntp-keygen.pdb"
+ ProgramDatabaseFile="bin/Release/ntpkeygen.pdb"
SubSystem="1"
TargetMachine="1"
Version="0x0400"
@@ -184,7 +184,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\ntp-keygen\Release/ntpkeygen.bsc"
+ OutputFile=".\ntpkeygen\Release/ntpkeygen.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -230,7 +230,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\util\ntp-keygen-opts.c"
+ RelativePath="..\..\..\util\ntpkeygen-opts.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -252,7 +252,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\util\ntp-keygen.c"
+ RelativePath="..\..\..\util\ntpkeygen.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -358,7 +358,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="echo Using NT Shell Script to generate version.c
..\scripts\mkver.bat -P ntp-keygen
"
+ CommandLine="echo Using NT Shell Script to generate version.c
..\scripts\mkver.bat -P ntpkeygen
"
Outputs="$(ProjectDir)version.c"
/>
</FileConfiguration>
@@ -367,7 +367,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="echo Using NT Shell Script to generate version.c
..\scripts\mkver.bat -P ntp-keygen
"
+ CommandLine="echo Using NT Shell Script to generate version.c
..\scripts\mkver.bat -P ntpkeygen
"
Outputs="$(ProjectDir)version.c"
/>
</FileConfiguration>
diff --git a/ports/winnt/vs2008/ntp.sln b/ports/winnt/vs2008/ntp.sln
index 40f1bad..483c60b 100644
--- a/ports/winnt/vs2008/ntp.sln
+++ b/ports/winnt/vs2008/ntp.sln
@@ -16,7 +16,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpdate", "ntpdate\ntpdate.
{400FBFCB-462E-40D0-B06B-3B74E3FFFD00} = {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntp-keygen", "ntp-keygen\ntp-keygen.vcproj", "{C88C1FBF-59D2-447F-BF57-0BCA8889028F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpkeygen", "ntpkeygen\ntpkeygen.vcproj", "{C88C1FBF-59D2-447F-BF57-0BCA8889028F}"
ProjectSection(ProjectDependencies) = postProject
{400FBFCB-462E-40D0-B06B-3B74E3FFFD00} = {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}
EndProjectSection
diff --git a/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj b/ports/winnt/vs2008/ntpkeygen/ntpkeygen.vcproj
similarity index 91%
rename from ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj
rename to ports/winnt/vs2008/ntpkeygen/ntpkeygen.vcproj
index fd89859..fb45356 100644
--- a/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj
+++ b/ports/winnt/vs2008/ntpkeygen/ntpkeygen.vcproj
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="ntp-keygen"
+ Name="ntpkeygen"
ProjectGUID="{C88C1FBF-59D2-447F-BF57-0BCA8889028F}"
- RootNamespace="ntp-keygen"
+ RootNamespace="ntpkeygen"
TargetFrameworkVersion="0"
>
<Platforms>
@@ -37,12 +37,12 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName="$(IntDir)ntp-keygen.tlb"
+ TypeLibraryName="$(IntDir)ntpkeygen.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\ntp-keygen;..\..\..\..\ntp-keygen"
+ AdditionalIncludeDirectories="..\..\ntpkeygen;..\..\..\..\ntpkeygen"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -105,12 +105,12 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName="$(IntDir)ntp-keygen.tlb"
+ TypeLibraryName="$(IntDir)ntpkeygen.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\ntp-keygen;..\..\..\..\ntp-keygen"
+ AdditionalIncludeDirectories="..\..\ntpkeygen;..\..\..\..\ntpkeygen"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -171,12 +171,12 @@
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
- TypeLibraryName="$(IntDir)ntp-keygen.tlb"
+ TypeLibraryName="$(IntDir)ntpkeygen.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\ntp-keygen;..\..\..\..\ntp-keygen"
+ AdditionalIncludeDirectories="..\..\ntpkeygen;..\..\..\..\ntpkeygen"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -240,12 +240,12 @@
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
- TypeLibraryName="$(IntDir)ntp-keygen.tlb"
+ TypeLibraryName="$(IntDir)ntpkeygen.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\ntp-keygen;..\..\..\..\ntp-keygen"
+ AdditionalIncludeDirectories="..\..\ntpkeygen;..\..\..\..\ntpkeygen"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -295,11 +295,11 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
- RelativePath="..\..\..\..\util\ntp-keygen-opts.c"
+ RelativePath="..\..\..\..\util\ntpkeygen-opts.c"
>
</File>
<File
- RelativePath="..\..\..\..\util\ntp-keygen.c"
+ RelativePath="..\..\..\..\util\ntpkeygen.c"
>
</File>
<File
diff --git a/ports/winnt/vs2013/ntp.sln b/ports/winnt/vs2013/ntp.sln
index c3a6784..6bf0d8b 100644
--- a/ports/winnt/vs2013/ntp.sln
+++ b/ports/winnt/vs2013/ntp.sln
@@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libntp", "libntp\libntp.vcx
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpdate", "ntpdate\ntpdate.vcxproj", "{2789A62E-3F46-44F1-AAF0-816CD23C2911}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntp-keygen", "ntp-keygen\ntp-keygen.vcxproj", "{C88C1FBF-59D2-447F-BF57-0BCA8889028F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpkeygen", "ntpkeygen\ntpkeygen.vcxproj", "{C88C1FBF-59D2-447F-BF57-0BCA8889028F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpq", "ntpq\ntpq.vcxproj", "{6A92BF14-8931-48B1-A571-DEBE9F190616}"
EndProject
diff --git a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj b/ports/winnt/vs2013/ntpkeygen/ntpkeygen.vcxproj
similarity index 89%
rename from ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj
rename to ports/winnt/vs2013/ntpkeygen/ntpkeygen.vcxproj
index be141be..03a7d66 100644
--- a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj
+++ b/ports/winnt/vs2013/ntpkeygen/ntpkeygen.vcxproj
@@ -28,7 +28,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{C88C1FBF-59D2-447F-BF57-0BCA8889028F}</ProjectGuid>
- <RootNamespace>ntp-keygen</RootNamespace>
+ <RootNamespace>ntpkeygen</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -100,11 +100,11 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
- <TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName>
+ <TypeLibraryName>$(IntDir)ntpkeygen.tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\ntpkeygen;..\..\..\..\ntpkeygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -120,12 +120,12 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">
<Midl>
- <TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName>
+ <TypeLibraryName>$(IntDir)ntpkeygen.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\ntpkeygen;..\..\..\..\ntpkeygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -141,11 +141,11 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
- <TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName>
+ <TypeLibraryName>$(IntDir)ntpkeygen.tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\ntpkeygen;..\..\..\..\ntpkeygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -161,12 +161,12 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">
<Midl>
- <TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName>
+ <TypeLibraryName>$(IntDir)ntpkeygen.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\ntpkeygen;..\..\..\..\ntpkeygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -183,11 +183,11 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName>
+ <TypeLibraryName>$(IntDir)ntpkeygen.tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\ntpkeygen;..\..\..\..\ntpkeygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -204,11 +204,11 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName>
+ <TypeLibraryName>$(IntDir)ntpkeygen.tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\ntpkeygen;..\..\..\..\ntpkeygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -223,8 +223,8 @@
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\util\ntp-keygen-opts.c" />
- <ClCompile Include="..\..\..\..\util\ntp-keygen.c" />
+ <ClCompile Include="..\..\..\..\util\ntpkeygen-opts.c" />
+ <ClCompile Include="..\..\..\..\util\ntpkeygen.c" />
<ClCompile Include="version.c" />
</ItemGroup>
<ItemGroup>
diff --git a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj.filters b/ports/winnt/vs2013/ntpkeygen/ntpkeygen.vcxproj.filters
similarity index 90%
rename from ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj.filters
rename to ports/winnt/vs2013/ntpkeygen/ntpkeygen.vcxproj.filters
index b833f23..8c3e236 100644
--- a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj.filters
+++ b/ports/winnt/vs2013/ntpkeygen/ntpkeygen.vcxproj.filters
@@ -15,10 +15,10 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\util\ntp-keygen-opts.c">
+ <ClCompile Include="..\..\..\..\util\ntpkeygen-opts.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\util\ntp-keygen.c">
+ <ClCompile Include="..\..\..\..\util\ntpkeygen.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="version.c">
diff --git a/scripts/README b/scripts/README
index 3367f3a..449dde5 100644
--- a/scripts/README
+++ b/scripts/README
@@ -11,7 +11,7 @@ lib:: NTP interface package required to query Mode 6 packets
monitoring:: Directory containing perl scripts useful for monitoring
operations
-ntp-wait:: Blocks until ntpd is in state 4 (synchronized).
+ntpwait:: Blocks until ntpd is in state 4 (synchronized).
Useful at boot time, to delay the boot sequence
until after "ntpd -g" has set the time.
diff --git a/scripts/ntp-wait/ntp-wait-man.txt.in b/scripts/ntpwait/ntpwait-man.txt.in
similarity index 83%
rename from scripts/ntp-wait/ntp-wait-man.txt.in
rename to scripts/ntpwait/ntpwait-man.txt.in
index 0424693..0ad2a7e 100644
--- a/scripts/ntp-wait/ntp-wait-man.txt.in
+++ b/scripts/ntpwait/ntpwait-man.txt.in
@@ -1,10 +1,10 @@
-== ntp-wait(8) ==
+== ntpwait(8) ==
:doctype: manpage
== NAME ==
{ntpwait} - Wait for {ntpd} to stabilize the system clock
- at ../../docs/includes/ntp-wait-body.txt@
+ at ../../docs/includes/ntpwait-body.txt@
== EXIT STATUS ==
diff --git a/scripts/ntp-wait/ntp-wait-opts b/scripts/ntpwait/ntpwait-opts
similarity index 87%
rename from scripts/ntp-wait/ntp-wait-opts
rename to scripts/ntpwait/ntpwait-opts
index 4a9bd6c..9e24b75 100644
--- a/scripts/ntp-wait/ntp-wait-opts
+++ b/scripts/ntpwait/ntpwait-opts
@@ -1,7 +1,7 @@
-# EDIT THIS FILE WITH CAUTION (ntp-wait-opts)
+# EDIT THIS FILE WITH CAUTION (ntpwait-opts)
#
# It has been AutoGen-ed June 3, 2015 at 11:53:09 AM by AutoGen 5.18.5
-# From the definitions ntp-wait-opts.def
+# From the definitions ntpwait-opts.def
# and the template file perlopt
use Getopt::Long qw(GetOptionsFromArray);
@@ -40,8 +40,8 @@ sub processOptions {
'help|?', 'more-help'));
$usage = <<'USAGE';
-ntp-wait - Wait for ntpd to stabilize the system clock.
-USAGE: ntp-wait [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
+ntpwait - Wait for ntpd to stabilize the system clock.
+USAGE: ntpwait [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
-n, --tries=num Number of times to check ntpd
-s, --sleep=num How long to sleep between tries
diff --git a/scripts/ntp-wait/ntp-wait.in b/scripts/ntpwait/ntpwait.in
similarity index 100%
rename from scripts/ntp-wait/ntp-wait.in
rename to scripts/ntpwait/ntpwait.in
diff --git a/scripts/rc/rc.d/ntpwait b/scripts/rc/rc.d/ntpwait
index 891d0db..fd7556d 100644
--- a/scripts/rc/rc.d/ntpwait
+++ b/scripts/rc/rc.d/ntpwait
@@ -1,5 +1,5 @@
#!/bin/sh
-# This script, when run, runs ntp-wait if ntpd is enabled.
+# This script, when run, runs ntpwait if ntpd is enabled.
# PROVIDE: ntpwait
@@ -8,7 +8,7 @@
name="ntpwait"
rcvar="ntpwait_enable"
start_cmd="ntpwait_start"
-ntp_wait="/usr/sbin/ntp-wait"
+ntp_wait="/usr/sbin/ntpwait"
load_rc_config "$name"
diff --git a/scripts/t/1_common.t b/scripts/t/1_common.t
index 9cd665c..0f82c71 100644
--- a/scripts/t/1_common.t
+++ b/scripts/t/1_common.t
@@ -5,7 +5,7 @@ use Test::Command;
use List::MoreUtils qw(any);
my @script_list = qw(
- calc_tickadj/calc_tickadj ntp-wait/ntp-wait ntpsweep/ntpsweep
+ calc_tickadj/calc_tickadj ntpwait/ntpwait ntpsweep/ntpsweep
ntptrace/ntptrace summary plot_summary
);
diff --git a/scripts/t/ntp-wait.t b/scripts/t/ntpwait.t
similarity index 98%
rename from scripts/t/ntp-wait.t
rename to scripts/t/ntpwait.t
index 7a01b12..2049d8f 100644
--- a/scripts/t/ntp-wait.t
+++ b/scripts/t/ntpwait.t
@@ -5,7 +5,7 @@ use Test::Command;
use Test::Output;
use Test::Util qw(check_help mock_ntp_util run_mocked override);
-my $script_name = 'ntp-wait/ntp-wait';
+my $script_name = 'ntpwait/ntpwait';
require_ok($script_name);
diff --git a/wscript b/wscript
index 3bf0742..2b1f7b4 100644
--- a/wscript
+++ b/wscript
@@ -103,14 +103,14 @@ def build(ctx):
ctx.recurse("ntpq")
# ctx.recurse("clockstuff") -
# ctx.recurse("kernel")
- ctx.recurse("ntp-keygen")
+ ctx.recurse("ntpkeygen")
ctx.recurse("util")
# ctx.recurse("unity")
# ctx.recurse("tests")
subst_scripts = [
- "scripts/ntp-wait/ntp-wait.in",
+ "scripts/ntpwait/ntpwait.in",
"scripts/ntpsweep/ntpsweep.in",
"scripts/ntptrace/ntptrace.in",
"scripts/update-leap/update-leap.in"
@@ -124,11 +124,11 @@ def build(ctx):
)
subst_files = [
- "ntp-keygen/ntp-keygen-man.txt.in",
+ "ntpkeygen/ntpkeygen-man.txt.in",
"ntpd/complete.conf.in",
"ntpd/ntpd-man.txt.in",
"ntpq/ntpq-man.txt.in",
- "scripts/ntp-wait/ntp-wait-man.txt.in",
+ "scripts/ntpwait/ntpwait-man.txt.in",
"scripts/ntptrace/ntptrace-man.txt.in",
"ntpdig/ntpdig-man.txt.in",
"util/ntptickadj-man.txt.in",
More information about the vc
mailing list