[Git][NTPsec/ntpsec][master] Repair the build - waf did something 'helful' that turned into a problem.

[Eric S. Raymond]

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


Commits:
9a0979dd by Eric S. Raymond at 2016-06-12T22:04:23-04:00
Repair the build - waf did something 'helful' that turned into a problem.

That is, after "Remove Conrad Parallel Port radio (refclock 35)." I
should have seen build breakage but for mysyterious reasons did not.

- - - - -


5 changed files:

- ntpd/refclock_conf.c
- ports/winnt/vs2008/ntpd/ntpd.vcproj
- ports/winnt/vs2013/ntpd/ntpd.vcxproj
- ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters
- pylib/refclock.py


Changes:

=====================================
ntpd/refclock_conf.c
=====================================
--- a/ntpd/refclock_conf.c
+++ b/ntpd/refclock_conf.c
@@ -211,7 +211,7 @@ struct refclock * const refclock_conf[] = {
 	&refclock_none,		/* 32 was: REFCLK_CHRONOLOG */
 	&refclock_dumbclock,	/* 33 REFCLK_DUMBCLOCK */
 	&refclock_none,		/* 34 was: REFCLOCK_ULINK */
-	&refclock_pcf,		/* 35 REFCLOCK_PCF */
+	&refclock_none,		/* 35 was: REFCLOCK_PCF */
 	&refclock_none,		/* 36 was: REFCLOCK_WWV_AUDIO */
 	&refclock_none,		/* 37 was: REFCLOCK_FG */
 	&refclock_hopfser,	/* 38 REFCLK_HOPF_SERIAL */


=====================================
ports/winnt/vs2008/ntpd/ntpd.vcproj
=====================================
--- a/ports/winnt/vs2008/ntpd/ntpd.vcproj
+++ b/ports/winnt/vs2008/ntpd/ntpd.vcproj
@@ -878,10 +878,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\ntpd\refclock_pcf.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\..\ntpd\refclock_pst.c"
 				>
 			</File>


=====================================
ports/winnt/vs2013/ntpd/ntpd.vcxproj
=====================================
--- a/ports/winnt/vs2013/ntpd/ntpd.vcxproj
+++ b/ports/winnt/vs2013/ntpd/ntpd.vcxproj
@@ -310,7 +310,6 @@
     <ClCompile Include="..\..\..\..\ntpd\refclock_oncore.c" />
     <ClCompile Include="..\..\..\..\ntpd\refclock_palisade.c" />
     <ClCompile Include="..\..\..\..\ntpd\refclock_parse.c" />
-    <ClCompile Include="..\..\..\..\ntpd\refclock_pcf.c" />
     <ClCompile Include="..\..\..\..\ntpd\refclock_pst.c" />
     <ClCompile Include="..\..\..\..\ntpd\refclock_ripencc.c" />
     <ClCompile Include="..\..\..\..\ntpd\refclock_shm.c" />


=====================================
ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters
=====================================
--- a/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters
+++ b/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters
@@ -186,9 +186,6 @@
     <ClCompile Include="..\..\..\..\ntpd\refclock_parse.c">
       <Filter>Reference Clock</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\ntpd\refclock_pcf.c">
-      <Filter>Reference Clock</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\ntpd\refclock_pst.c">
       <Filter>Reference Clock</Filter>
     </ClCompile>


=====================================
pylib/refclock.py
=====================================
--- a/pylib/refclock.py
+++ b/pylib/refclock.py
@@ -130,12 +130,6 @@ refclock_map = {
 		"file":		"dumbclock"
 	},
 
-	35: {
-		"descr":	"Conrad Parallel Port Radio Clock",
-		"define":	"CLOCK_PCF",
-		"file":		"pcf"
-	},
-
 	38: {
 		"descr":	"hopf GPS/DCF77 6021/komp for Serial Line",
 		"define":	"CLOCK_HOPF_SERIAL",



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/9a0979dd9f2587b3a273b2af021d5f30e1bbae55
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160613/c558f375/attachment.html>