[Git][NTPsec/ntpsec][master] 2 commits: move gpstolfp.c back into libparse

[Gary E. Miller]

Gary E. Miller pushed to branch master at NTPsec / ntpsec


Commits:
3d610723 by Trevor N at 2017-06-07T21:56:04-04:00
move gpstolfp.c back into libparse

related to issue #320 and mailing list comment https://lists.ntpsec.org/pipermail/devel/2017-May/004519.html
this patch makes the Trimble refclock depend on libparse

- - - - -
9e940cf1 by Trevor N at 2017-06-08T17:10:59-07:00
Merge branch 'trv-n/ntpsec-master', MR477, Issue #320

Sorry for the delay, this should fix issue #320

Signed-off-by: Gary E. Miller <gem at rellim.com>

- - - - -


7 changed files:

- libntp/wscript
- libntp/gpstolfp.c → libparse/gpstolfp.c
- libparse/wscript
- tests/common/tests_main.c
- tests/libntp/gpstolfp.c → tests/libparse/gpstolfp.c
- tests/wscript
- wscript


Changes:

=====================================
libntp/wscript
=====================================
--- a/libntp/wscript
+++ b/libntp/wscript
@@ -8,7 +8,6 @@ def build(ctx):
         "decodenetnum.c",
         "dolfptoa.c",
         "getopt.c",
-        "gpstolfp.c",
         "initnetwork.c",
         "isc_error.c",
         "isc_interfaceiter.c",


=====================================
libntp/gpstolfp.c → libparse/gpstolfp.c
=====================================


=====================================
libparse/wscript
=====================================
--- a/libparse/wscript
+++ b/libparse/wscript
@@ -14,6 +14,7 @@ def build(ctx):
         "clk_varitext.c",
         "clk_wharton.c",
         "data_mbg.c",
+        "gpstolfp.c",
         "ieee754io.c",
         "info_trimble.c",
         "parse.c",


=====================================
tests/common/tests_main.c
=====================================
--- a/tests/common/tests_main.c
+++ b/tests/common/tests_main.c
@@ -43,7 +43,6 @@ static void RunAllTests(void)
 	RUN_TEST_GROUP(calendar);
 	RUN_TEST_GROUP(clocktime);
 	RUN_TEST_GROUP(decodenetnum);
-	RUN_TEST_GROUP(gpstolfp);
 	RUN_TEST_GROUP(hextolfp);
 	RUN_TEST_GROUP(humandate);
 	RUN_TEST_GROUP(lfpfunc);
@@ -65,6 +64,7 @@ static void RunAllTests(void)
 
 #ifdef TEST_LIBPARSE
 	RUN_TEST_GROUP(binio);
+	RUN_TEST_GROUP(gpstolfp);
 	RUN_TEST_GROUP(ieee754io);
 #endif
 


=====================================
tests/libntp/gpstolfp.c → tests/libparse/gpstolfp.c
=====================================
--- a/tests/libntp/gpstolfp.c
+++ b/tests/libparse/gpstolfp.c
@@ -50,4 +50,4 @@ TEST(gpstolfp, check) {
 
 TEST_GROUP_RUNNER(gpstolfp) {
 	RUN_TEST_CASE(gpstolfp, check);
-}
\ No newline at end of file
+}


=====================================
tests/wscript
=====================================
--- a/tests/wscript
+++ b/tests/wscript
@@ -30,7 +30,6 @@ def build(ctx):
         "libntp/calendar.c",
         "libntp/clocktime.c",
         "libntp/decodenetnum.c",
-        "libntp/gpstolfp.c",
         "libntp/hextolfp.c",
         "libntp/humandate.c",
         "libntp/lfpfunc.c",
@@ -64,12 +63,13 @@ def build(ctx):
         source=libntp_source,
     )
 
-    if ctx.env.REFCLOCK_GENERIC:
-        # libparse only available/required wth generic refclock
+    if ctx.env.REFCLOCK_GENERIC or ctx.env.REFCLOCK_TRIMBLE:
+        # libparse available/required wth generic and Trimble refclocks
 
         # libparse/
         libparse_source = [
             "libparse/binio.c",
+            "libparse/gpstolfp.c",
             "libparse/ieee754io.c",
         ] + common_source
 


=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -1049,8 +1049,8 @@ def build(ctx):
         ctx.recurse("ntpd")
         return
 
-    if ctx.env.REFCLOCK_GENERIC:
-        # Only required by the generic refclock
+    if ctx.env.REFCLOCK_GENERIC or ctx.env.REFCLOCK_TRIMBLE:
+        # required by the generic and Trimble refclocks
         ctx.recurse("libparse")
     ctx.recurse("libntp")
     ctx.recurse("ntpd")



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/f86603f6c70632a78e196709fce4c0c6a09ba3cc...9e940cf11ec43879a337a08dd3423b519846588f

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/f86603f6c70632a78e196709fce4c0c6a09ba3cc...9e940cf11ec43879a337a08dd3423b519846588f
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170609/15bbe5a2/attachment.html>