[Git][NTPsec/ntpsec][master] pylib -> wafhelpers, so that a new pylib directory can parallel perllib...
Eric S. Raymond
gitlab at mg.gitlab.com
Thu Aug 11 11:25:51 UTC 2016
Eric S. Raymond pushed to branch master at NTPsec / ntpsec
Commits:
caa9268d by Eric S. Raymond at 2016-08-11T07:22:42-04:00
pylib -> wafhelpers, so that a new pylib directory can parallel perllib...
...as a home for installable Python libraries.
- - - - -
27 changed files:
- README
- pylib/__init__.py → wafhelpers/__init__.py
- pylib/asciidoc.py → wafhelpers/asciidoc.py
- pylib/bin_test.py → wafhelpers/bin_test.py
- pylib/check_cap.py → wafhelpers/check_cap.py
- pylib/check_fortify.py → wafhelpers/check_fortify.py
- pylib/check_libevent2.py → wafhelpers/check_libevent2.py
- pylib/check_mdns.py → wafhelpers/check_mdns.py
- pylib/check_openssl.py → wafhelpers/check_openssl.py
- pylib/check_pthread.py → wafhelpers/check_pthread.py
- pylib/check_seccomp.py → wafhelpers/check_seccomp.py
- pylib/check_sizeof.py → wafhelpers/check_sizeof.py
- pylib/check_sockaddr.py → wafhelpers/check_sockaddr.py
- pylib/check_structfield.py → wafhelpers/check_structfield.py
- pylib/check_type.py → wafhelpers/check_type.py
- pylib/compiler.py → wafhelpers/compiler.py
- pylib/configure.py → wafhelpers/configure.py
- pylib/dist.py → wafhelpers/dist.py
- pylib/options.py → wafhelpers/options.py
- pylib/probes.py → wafhelpers/probes.py
- pylib/refclock.py → wafhelpers/refclock.py
- pylib/rtems_trace.py → wafhelpers/rtems_trace.py
- pylib/test.py → wafhelpers/test.py
- pylib/tool.py → wafhelpers/tool.py
- pylib/util.py → wafhelpers/util.py
- pylib/waf.py → wafhelpers/waf.py
- wscript
Changes:
=====================================
README
=====================================
--- a/README
+++ b/README
@@ -93,8 +93,6 @@ perllib/:: NTP interface package required to query Mode 6 packets
ports/:: Subdirectories of this contain code for non-Unix operating
systems. At present there is just one, for Windows.
-pylib/:: A library of Python procedures used by the build sytem.
-
tests/:: Self-test code.
util/:: Directory containing sources for various utility and testing
@@ -106,6 +104,8 @@ util/:: Directory containing sources for various utility and testing
waf:: A copy of the waf builder. This is the engine used to configure
and build the codebase.
+wafhelpers/:: A library of Python procedures used by the waf build system.
+
wscript:: NTP-specific waf rules.
// end
=====================================
pylib/__init__.py → wafhelpers/__init__.py
=====================================
--- a/pylib/__init__.py
+++ b/wafhelpers/__init__.py
=====================================
pylib/asciidoc.py → wafhelpers/asciidoc.py
=====================================
--- a/pylib/asciidoc.py
+++ b/wafhelpers/asciidoc.py
=====================================
pylib/bin_test.py → wafhelpers/bin_test.py
=====================================
--- a/pylib/bin_test.py
+++ b/wafhelpers/bin_test.py
=====================================
pylib/check_cap.py → wafhelpers/check_cap.py
=====================================
--- a/pylib/check_cap.py
+++ b/wafhelpers/check_cap.py
=====================================
pylib/check_fortify.py → wafhelpers/check_fortify.py
=====================================
--- a/pylib/check_fortify.py
+++ b/wafhelpers/check_fortify.py
=====================================
pylib/check_libevent2.py → wafhelpers/check_libevent2.py
=====================================
--- a/pylib/check_libevent2.py
+++ b/wafhelpers/check_libevent2.py
=====================================
pylib/check_mdns.py → wafhelpers/check_mdns.py
=====================================
--- a/pylib/check_mdns.py
+++ b/wafhelpers/check_mdns.py
=====================================
pylib/check_openssl.py → wafhelpers/check_openssl.py
=====================================
--- a/pylib/check_openssl.py
+++ b/wafhelpers/check_openssl.py
=====================================
pylib/check_pthread.py → wafhelpers/check_pthread.py
=====================================
--- a/pylib/check_pthread.py
+++ b/wafhelpers/check_pthread.py
=====================================
pylib/check_seccomp.py → wafhelpers/check_seccomp.py
=====================================
--- a/pylib/check_seccomp.py
+++ b/wafhelpers/check_seccomp.py
=====================================
pylib/check_sizeof.py → wafhelpers/check_sizeof.py
=====================================
--- a/pylib/check_sizeof.py
+++ b/wafhelpers/check_sizeof.py
=====================================
pylib/check_sockaddr.py → wafhelpers/check_sockaddr.py
=====================================
--- a/pylib/check_sockaddr.py
+++ b/wafhelpers/check_sockaddr.py
=====================================
pylib/check_structfield.py → wafhelpers/check_structfield.py
=====================================
--- a/pylib/check_structfield.py
+++ b/wafhelpers/check_structfield.py
=====================================
pylib/check_type.py → wafhelpers/check_type.py
=====================================
--- a/pylib/check_type.py
+++ b/wafhelpers/check_type.py
=====================================
pylib/compiler.py → wafhelpers/compiler.py
=====================================
--- a/pylib/compiler.py
+++ b/wafhelpers/compiler.py
=====================================
pylib/configure.py → wafhelpers/configure.py
=====================================
--- a/pylib/configure.py
+++ b/wafhelpers/configure.py
@@ -8,10 +8,10 @@ def cmd_configure(ctx, config):
srcnode = ctx.srcnode.abspath()
bldnode = ctx.bldnode.abspath()
- ctx.load('waf', tooldir='pylib/')
+ ctx.load('waf', tooldir='wafhelpers/')
ctx.load('waf_unit_test')
- from pylib.util import parse_version
+ from wafhelpers.util import parse_version
parse_version(config)
ctx.env.NTPS_RELEASE = config["NTPS_RELEASE"]
@@ -487,34 +487,34 @@ def cmd_configure(ctx, config):
# Header/library checks
- from pylib.check_cap import check_cap
+ from wafhelpers.check_cap import check_cap
check_cap(ctx)
- from pylib.check_seccomp import check_seccomp
+ from wafhelpers.check_seccomp import check_seccomp
check_seccomp(ctx)
- from pylib.check_libevent2 import check_libevent2_header
+ from wafhelpers.check_libevent2 import check_libevent2_header
check_libevent2_header(ctx)
- from pylib.check_pthread import check_pthread_header_lib
+ from wafhelpers.check_pthread import check_pthread_header_lib
check_pthread_header_lib(ctx)
if not ctx.options.disable_mdns_registration:
- from pylib.check_mdns import check_mdns_header
+ from wafhelpers.check_mdns import check_mdns_header
check_mdns_header(ctx)
# Run checks
- from pylib.check_libevent2 import check_libevent2_run
+ from wafhelpers.check_libevent2 import check_libevent2_run
check_libevent2_run(ctx)
if not ctx.options.disable_dns_retry:
- from pylib.check_pthread import check_pthread_run
+ from wafhelpers.check_pthread import check_pthread_run
check_pthread_run(ctx)
if not ctx.options.disable_mdns_registration:
- from pylib.check_mdns import check_mdns_run
+ from wafhelpers.check_mdns import check_mdns_run
check_mdns_run(ctx)
if ctx.options.enable_classic_mode:
=====================================
pylib/dist.py → wafhelpers/dist.py
=====================================
--- a/pylib/dist.py
+++ b/wafhelpers/dist.py
=====================================
pylib/options.py → wafhelpers/options.py
=====================================
--- a/pylib/options.py
+++ b/wafhelpers/options.py
=====================================
pylib/probes.py → wafhelpers/probes.py
=====================================
--- a/pylib/probes.py
+++ b/wafhelpers/probes.py
=====================================
pylib/refclock.py → wafhelpers/refclock.py
=====================================
--- a/pylib/refclock.py
+++ b/wafhelpers/refclock.py
=====================================
pylib/rtems_trace.py → wafhelpers/rtems_trace.py
=====================================
--- a/pylib/rtems_trace.py
+++ b/wafhelpers/rtems_trace.py
=====================================
pylib/test.py → wafhelpers/test.py
=====================================
--- a/pylib/test.py
+++ b/wafhelpers/test.py
=====================================
pylib/tool.py → wafhelpers/tool.py
=====================================
--- a/pylib/tool.py
+++ b/wafhelpers/tool.py
=====================================
pylib/util.py → wafhelpers/util.py
=====================================
--- a/pylib/util.py
+++ b/wafhelpers/util.py
=====================================
pylib/waf.py → wafhelpers/waf.py
=====================================
--- a/pylib/waf.py
+++ b/wafhelpers/waf.py
=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -8,10 +8,10 @@ pprint.__doc__ = None
out="build"
-from pylib.configure import cmd_configure
+from wafhelpers.configure import cmd_configure
from waflib.Tools import waf_unit_test
-from pylib.test import test_write_log, test_print_log
-from pylib.options import options_cmd
+from wafhelpers.test import test_write_log, test_print_log
+from wafhelpers.options import options_cmd
config = {
"NTPS_RELEASE": False,
@@ -31,7 +31,7 @@ config = {
def dist(ctx):
- from pylib.dist import dist_cmd
+ from wafhelpers.dist import dist_cmd
dist_cmd(ctx, config)
@@ -39,7 +39,7 @@ def options(ctx):
options_cmd(ctx, config)
def configure(ctx):
- from pylib.configure import cmd_configure
+ from wafhelpers.configure import cmd_configure
cmd_configure(ctx, config)
@@ -49,7 +49,7 @@ class check(BuildContext):
variant = "main"
def bin_test(ctx):
- from pylib.bin_test import cmd_bin_test
+ from wafhelpers.bin_test import cmd_bin_test
cmd_bin_test(ctx, config)
bin_test.__doc__ = "Run binary check, use after tests."
@@ -113,10 +113,10 @@ for command, func, descr in commands:
def build(ctx):
- ctx.load('waf', tooldir='pylib/')
+ ctx.load('waf', tooldir='wafhelpers/')
ctx.load('bison')
- ctx.load('asciidoc', tooldir='pylib/')
- ctx.load('rtems_trace', tooldir='pylib/')
+ ctx.load('asciidoc', tooldir='wafhelpers/')
+ ctx.load('rtems_trace', tooldir='wafhelpers/')
if ctx.env.ENABLE_DOC_USER:
if ctx.variant != "main":
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/caa9268daa4144ba258ce989e45265782b01ba1e
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160811/955d6131/attachment.html>
More information about the vc
mailing list