[Git][NTPsec/ntpsec][buildtest] Attempted fix for path issue

[Ian Bruene]

Ian Bruene pushed to branch buildtest at NTPsec / ntpsec


Commits:
8044e47b by Ian Bruene at 2017-11-29T12:50:47-06:00
Attempted fix for path issue

- - - - -


1 changed file:

- wscript


Changes:

=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -1025,19 +1025,6 @@ def afterparty(ctx):
     if ctx.cmd in ('uninstall', 'install'):
         # Make sure libs are removed from the old location
         FixConfig.cleanup_python_libs(ctx, ctx.cmd)
-    for x in ("ntpclients", "tests/pylib",):
-        # List used to be longer...
-        path_build = ctx.bldnode.make_node("pylib")
-        path_source = ctx.bldnode.make_node(x + "/ntp")
-        relpath = ("../" * (x.count("/")+1)) + path_build.path_from(ctx.bldnode)
-        if ctx.cmd in ('install', 'build'):
-            if ((not path_source.exists() or
-                    os.readlink(path_source.abspath()) != relpath)):
-                try:
-                    os.remove(path_source.abspath())
-                except OSError:
-                    pass
-                os.symlink(relpath, path_source.abspath())
 
 
 python_scripts = [
@@ -1115,6 +1102,22 @@ def build(ctx):
     ctx.manpage(8, "ntpclients/ntpleapfetch-man.txt")
     ctx.manpage(8, "ntpclients/ntpwait-man.txt")
 
+    # formerly part of afterparty(), these need to be in place for tests
+    for x in ("ntpclients", "tests/pylib",):
+        # List used to be longer...
+        path_build = ctx.bldnode.make_node("pylib")
+        path_source = ctx.bldnode.make_node(x + "/ntp")
+        relpath = ("../" * (x.count("/")+1)) + path_build.path_from(ctx.bldnode)
+        if ctx.cmd in ('install', 'build'):
+            if ((not path_source.exists() or
+                    os.readlink(path_source.abspath()) != relpath)):
+                try:
+                    os.remove(path_source.abspath())
+                except OSError:
+                    pass
+                os.symlink(relpath, path_source.abspath())
+
+
     # Skip running unit tests on a cross compile build
     if not ctx.env.ENABLE_CROSS:
         # Force re-running of tests.  Same as 'waf --alltests'



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/8044e47bb672d8f42649b3b11b88c41b76e13ab5

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/8044e47bb672d8f42649b3b11b88c41b76e13ab5
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/20171129/9b0a5f10/attachment.html>