[Git][NTPsec/ntpsec][master] 11 commits: attic/wscript: pep8 nits
Gary E. Miller
gitlab at mg.gitlab.com
Mon Feb 6 23:46:00 UTC 2017
Gary E. Miller pushed to branch master at NTPsec / ntpsec
Commits:
01a87871 by Gary E. Miller at 2017-02-06T15:16:27-08:00
attic/wscript: pep8 nits
- - - - -
21cfb213 by Gary E. Miller at 2017-02-06T15:21:54-08:00
tests/wscript: pep8 nits
- - - - -
fbdd8215 by Gary E. Miller at 2017-02-06T15:24:52-08:00
pylib/wcript: pep8 nits
- - - - -
b0ff95de by Gary E. Miller at 2017-02-06T15:26:16-08:00
ntptime/wscript: pep8 nits
- - - - -
0730c7b0 by Gary E. Miller at 2017-02-06T15:28:22-08:00
ntpfrob/wscript: pep8 nits
- - - - -
c71cc780 by Gary E. Miller at 2017-02-06T15:37:28-08:00
ntpd/wscript: pep8 nits
- - - - -
c24f425b by Gary E. Miller at 2017-02-06T15:38:32-08:00
libparse/wscript: pep8 nits
- - - - -
8d22947d by Gary E. Miller at 2017-02-06T15:40:14-08:00
libntp:wscript: pep8 nits
- - - - -
be22306d by Gary E. Miller at 2017-02-06T15:41:22-08:00
libisc/wscript: pep8 nits
- - - - -
5eca9100 by Gary E. Miller at 2017-02-06T15:44:13-08:00
docs/wscript: pep8 nits
- - - - -
b9104b2f by Gary E. Miller at 2017-02-06T15:45:01-08:00
docs/wscript: fix my typo
- - - - -
10 changed files:
- attic/wscript
- docs/wscript
- libisc/wscript
- libntp/wscript
- libparse/wscript
- ntpd/wscript
- ntpfrob/wscript
- ntptime/wscript
- pylib/wscript
- tests/wscript
Changes:
=====================================
attic/wscript
=====================================
--- a/attic/wscript
+++ b/attic/wscript
@@ -1,16 +1,14 @@
def build(ctx):
- bldnode = ctx.bldnode.abspath()
+ bldnode = ctx.bldnode.abspath()
- util = ['sht']
+ util = ['sht']
- for name in util:
- ctx(
- target = name,
- features = "c cprogram bld_include src_include libisc_include",
- source = [name + ".c"],
- includes = [
- "%s/%s/" % (bldnode, name)
- ],
- use = "ntp isc M SSL CRYPTO RT THR PTHREAD",
- install_path = None,
- )
+ for name in util:
+ ctx(
+ target=name,
+ features="c cprogram bld_include src_include libisc_include",
+ source=[name + ".c"],
+ includes=["%s/%s/" % (bldnode, name)],
+ use="ntp isc M SSL CRYPTO RT THR PTHREAD",
+ install_path=None,
+ )
=====================================
docs/wscript
=====================================
--- a/docs/wscript
+++ b/docs/wscript
@@ -1,43 +1,45 @@
def build(ctx):
- doc_source = ctx.path.ant_glob("*.txt", excl='*-body.txt')
-
- ctx(
- target = "doc",
- source = doc_source
- )
-
- image_source = []
- ctx.path.get_bld().make_node("hints").mkdir() # create 'hints' directory
- for dir in ["icons", "pic"]:
-
- files = ctx.path.ant_glob('%s/*' % dir) # Find images
- ctx.path.get_bld().make_node(dir).mkdir() # create 'pic' directory
- image_source += files
-
- # Copy images
- ctx(
- features = "subst",
- is_copy = True,
- source = files,
- target = [ctx.path.find_node(dir).get_bld().make_node(x.name) for x in files]
- )
-
- extra = ["asciidoc.js", "asciidoc.css"]
-
- # Copy extra files
- ctx(
- features = "subst",
- is_copy = True,
- source = extra,
- target = extra
- )
-
- # Install HTML
- if ctx.env.HTMLDIR:
- install_prefix = ctx.env.HTMLDIR
- else:
- install_prefix = "%s/share/ntpsec/docs/" % ctx.env.PREFIX
-
- ctx.install_files(install_prefix, extra + [x.change_ext(".html").name for x in doc_source])
- ctx.install_files(install_prefix, image_source, relative_trick=True)
+ doc_source = ctx.path.ant_glob("*.txt", excl='*-body.txt')
+
+ ctx(
+ source=doc_source,
+ target="doc",
+ )
+
+ image_source = []
+ ctx.path.get_bld().make_node("hints").mkdir() # create 'hints' directory
+ for dir in ["icons", "pic"]:
+
+ files = ctx.path.ant_glob('%s/*' % dir) # Find images
+ ctx.path.get_bld().make_node(dir).mkdir() # create 'pic' directory
+ image_source += files
+
+ # Copy images
+ ctx(
+ features="subst",
+ is_copy=True,
+ source=files,
+ target=[ctx.path.find_node(dir).get_bld().make_node(x.name)
+ for x in files]
+ )
+
+ extra = ["asciidoc.js", "asciidoc.css"]
+
+ # Copy extra files
+ ctx(
+ features="subst",
+ is_copy=True,
+ source=extra,
+ target=extra
+ )
+
+ # Install HTML
+ if ctx.env.HTMLDIR:
+ install_prefix = ctx.env.HTMLDIR
+ else:
+ install_prefix = "%s/share/ntpsec/docs/" % ctx.env.PREFIX
+
+ ctx.install_files(install_prefix, extra
+ + [x.change_ext(".html").name for x in doc_source])
+ ctx.install_files(install_prefix, image_source, relative_trick=True)
=====================================
libisc/wscript
=====================================
--- a/libisc/wscript
+++ b/libisc/wscript
@@ -1,29 +1,28 @@
def build(ctx):
- libisc_source = [
- "assertions.c",
- "backtrace-emptytbl.c",
- "backtrace.c",
- "error.c",
- "netaddr.c",
- "errno2result.c",
- "interfaceiter.c",
- "net.c"
- ]
+ libisc_source = [
+ "assertions.c",
+ "backtrace-emptytbl.c",
+ "backtrace.c",
+ "error.c",
+ "netaddr.c",
+ "errno2result.c",
+ "interfaceiter.c",
+ "net.c"
+ ]
- ctx(
- target = "libisc_obj",
- features = "c bld_include src_include",
- source = libisc_source,
- includes = [
- "%s/libisc/include/" % ctx.srcnode.abspath(),
- ],
+ ctx(
+ features="c bld_include src_include",
+ includes=[
+ "%s/libisc/include/" % ctx.srcnode.abspath(),
+ ],
+ source=libisc_source,
+ target="libisc_obj",
+ )
- )
-
- ctx(
- target = "isc",
- features = "c cstlib bld_include src_include",
- use = "libisc_obj"
- )
+ ctx(
+ target="isc",
+ features="c cstlib bld_include src_include",
+ use="libisc_obj"
+ )
=====================================
libntp/wscript
=====================================
--- a/libntp/wscript
+++ b/libntp/wscript
@@ -1,69 +1,69 @@
def build(ctx):
- srcnode = ctx.srcnode.abspath()
+ srcnode = ctx.srcnode.abspath()
- libntp_source = [
- "atolfp.c",
- "authkeys.c",
- "authreadkeys.c",
- "clocktime.c",
- "decodenetnum.c",
- "dofptoa.c",
- "dolfptoa.c",
- "getopt.c",
- "initnetwork.c",
- "macencrypt.c",
- "mstolfp.c",
- "netof.c",
- "ntp_endian.c",
- "ntp_intres.c",
- "ntp_random.c",
- "ntp_worker.c",
- "numtoa.c",
- "recvbuff.c",
- "refidsmear.c",
- "socket.c",
- "socktoa.c",
- "ssl_init.c",
- "syssignal.c",
- "work_thread.c",
- "ymd2yd.c",
- ]
+ libntp_source = [
+ "atolfp.c",
+ "authkeys.c",
+ "authreadkeys.c",
+ "clocktime.c",
+ "decodenetnum.c",
+ "dofptoa.c",
+ "dolfptoa.c",
+ "getopt.c",
+ "initnetwork.c",
+ "macencrypt.c",
+ "mstolfp.c",
+ "netof.c",
+ "ntp_endian.c",
+ "ntp_intres.c",
+ "ntp_random.c",
+ "ntp_worker.c",
+ "numtoa.c",
+ "recvbuff.c",
+ "refidsmear.c",
+ "socket.c",
+ "socktoa.c",
+ "ssl_init.c",
+ "syssignal.c",
+ "work_thread.c",
+ "ymd2yd.c",
+ ]
- libntp_source_sharable = [
- "clockwork.c",
- "emalloc.c",
- "hextolfp.c",
- "humandate.c",
- "lib_strbuf.c",
- "msyslog.c",
- "ntp_calendar.c",
- "prettydate.c",
- "statestr.c",
- "systime.c",
- "timetoa.c",
- ]
+ libntp_source_sharable = [
+ "clockwork.c",
+ "emalloc.c",
+ "hextolfp.c",
+ "humandate.c",
+ "lib_strbuf.c",
+ "msyslog.c",
+ "ntp_calendar.c",
+ "prettydate.c",
+ "statestr.c",
+ "systime.c",
+ "timetoa.c",
+ ]
- if not ctx.env.HAVE_STRLCAT or not ctx.env.HAVE_STRLCPY:
- libntp_source_sharable += ["strl_obsd.c"]
+ if not ctx.env.HAVE_STRLCAT or not ctx.env.HAVE_STRLCPY:
+ libntp_source_sharable += ["strl_obsd.c"]
- includes = [
- "%s/libisc/include/" % srcnode,
- ] + ctx.env.PLATFORM_INCLUDES
+ includes = [
+ "%s/libisc/include/" % srcnode,
+ ] + ctx.env.PLATFORM_INCLUDES
- # C library
- ctx(
- target = "ntp",
- features = "c cstlib bld_include src_include",
- source = libntp_source + libntp_source_sharable,
- includes = includes,
- )
+ # C library
+ ctx(
+ features="c cstlib bld_include src_include",
+ includes=includes,
+ source=libntp_source + libntp_source_sharable,
+ target="ntp",
+ )
- # Loadable Python extension
- ctx(
- target = "ntpc",
- features = "c cshlib bld_include src_include pyext",
- source = ["pymodule.c"] + libntp_source_sharable,
- install_path = '${PYTHONDIR}/ntp',
- use = "M RT CRYPTO",
- includes = includes,
- )
+ # Loadable Python extension
+ ctx(
+ features="c cshlib bld_include src_include pyext",
+ install_path='${PYTHONDIR}/ntp',
+ includes=includes,
+ source=["pymodule.c"] + libntp_source_sharable,
+ target="ntpc",
+ use="M RT CRYPTO",
+ )
=====================================
libparse/wscript
=====================================
--- a/libparse/wscript
+++ b/libparse/wscript
@@ -1,29 +1,29 @@
def build(ctx):
- libparse_source = [
- "binio.c",
- "clk_computime.c",
- "clk_dcf7000.c",
- "clk_hopf6021.c",
- "clk_meinberg.c",
- "clk_rawdcf.c",
- "clk_rcc8000.c",
- "clk_schmid.c",
- "clk_sel240x.c",
- "clk_trimtaip.c",
- "clk_trimtsip.c",
- "clk_varitext.c",
- "clk_wharton.c",
- "data_mbg.c",
- "gpstolfp.c",
- "ieee754io.c",
- "info_trimble.c",
- "parse.c",
- "parse_conf.c",
- "trim_info.c",
- ]
+ libparse_source = [
+ "binio.c",
+ "clk_computime.c",
+ "clk_dcf7000.c",
+ "clk_hopf6021.c",
+ "clk_meinberg.c",
+ "clk_rawdcf.c",
+ "clk_rcc8000.c",
+ "clk_schmid.c",
+ "clk_sel240x.c",
+ "clk_trimtaip.c",
+ "clk_trimtsip.c",
+ "clk_varitext.c",
+ "clk_wharton.c",
+ "data_mbg.c",
+ "gpstolfp.c",
+ "ieee754io.c",
+ "info_trimble.c",
+ "parse.c",
+ "parse_conf.c",
+ "trim_info.c",
+ ]
- ctx(
- target = "parse",
- features = "c cstlib bld_include src_include libisc_include",
- source = libparse_source,
- )
+ ctx(
+ target="parse",
+ features="c cstlib bld_include src_include libisc_include",
+ source=libparse_source,
+ )
=====================================
ntpd/wscript
=====================================
--- a/ntpd/wscript
+++ b/ntpd/wscript
@@ -1,146 +1,145 @@
def build(ctx):
- srcnode = ctx.srcnode.abspath()
- bldnode = ctx.bldnode.abspath()
- target3 = ctx.srcnode.make_node('ntpd/version.h')
- target4 = ctx.srcnode.make_node('wafhelpers/.autorevision-cache')
-
- if ctx.variant == "host":
- bison_source = [
- "ntp_parser.y"
- ]
-
- ctx(
- target = "bison_obj",
- features = "c src_include bld_include libisc_include",
- source = bison_source,
- includes = [
- "%s/ntpd/" % srcnode,
- "%s/" % ctx.bldnode.parent.abspath()
- ]
- )
-
- ctx(
- cwd = srcnode,
- rule = 'VCS_EXTRA=`cat ${SRC[0]}` wafhelpers/autorevision.sh -o ${TGT[1].abspath()} -e VERSION -t h >${TGT[0].abspath()}',
- source = ["../VERSION", '../wafhelpers/autorevision.sh'],
- target = [target3, target4],
- )
-
- ctx.add_group() # Generate Bison and version.h files first.
-
- keyword_gen_source = [
- "keyword-gen.c",
- ]
-
- ctx(
- target = "keyword-gen",
- features = "c cprogram bld_include src_include libisc_include",
- source = keyword_gen_source,
- includes = [
- "%s/ntpd/" % bldnode,
- "%s/" % ctx.bldnode.parent.abspath()
- ],
- install_path= None,
- )
-
- # XXX: needs a dependency to rebuild ntp_keyword.h when keyword-gen is rebuilt
-
- ctx.add_group() # Make sure keyword-gen is created next.
-
- ctx(
- rule = "%s/ntpd/keyword-gen ${SRC} > ${TGT}" % bldnode,
- features = "c bld_include src_include",
- source = "ntp_parser.tab.h",
- target = "ntp_keyword.h"
- )
-
- ctx.add_group() # Make sure ntp_keyword.h is created last.
-
- return
-
- libntpd_source = [
- "ntp_control.c",
- "ntp_filegen.c",
- "ntp_leapsec.c",
- "ntp_monitor.c", # Needed by the restrict code
- "ntp_restrict.c",
- "ntp_util.c",
- ]
-
- ctx(
- features = "c bld_include src_include libisc_include",
- includes = ctx.env.PLATFORM_INCLUDES,
- source = libntpd_source,
- target = "libntpd_obj",
- )
-
- ctx(
- target = "ntpd_lib",
- features = "c cstlib",
- use = "libntpd_obj",
-# use = "libntpd_obj bison_obj",
- )
-
- use_refclock = "" #XXX: there must be a better way to do this
- if ctx.env.REFCLOCK_ENABLE:
-
- refclock_source = [
- "ntp_refclock.c",
- "refclock_conf.c"
- ]
-
- ctx(
- target = "refclock",
- features = "c bld_include src_include libisc_include",
- source = refclock_source,
- )
- use_refclock += "refclock"
-
- for file, define in ctx.env.REFCLOCK_SOURCE:
- ctx(
- target = "refclock_%s" % file,
- features = "c bld_include src_include libisc_include",
- source = "refclock_%s.c" % file,
- # XXX: These need to go into config.h rather than the command line for the individual drivers
- defines = ["%s=1" % define],
- )
- use_refclock += " refclock_%s" % file
-
- ntpd_source = [
- "ntp_config.c",
- "ntp_io.c",
- "ntp_loopfilter.c",
- "ntp_packetstamp.c",
- "ntp_peer.c",
- "ntp_proto.c",
- "ntp_sandbox.c",
- "ntp_scanner.c",
- "ntp_signd.c",
- "ntp_timer.c",
- "ntpd.c",
- ctx.bldnode.parent.find_node("host/ntpd/ntp_parser.tab.c")
- ]
-
- if ctx.env.SBINDIR:
- ntpd_install_path = ctx.env.SBINDIR
- else:
- ntpd_install_path = "${PREFIX}/sbin/"
- if not ntpd_install_path.endswith("/"):
- ntpd_install_path += "/"
-
- ctx(
- target = "ntpd",
- features = "c rtems_trace cprogram bld_include src_include libisc_include libisc_pthread_include",
- source = ntpd_source,
- use = "libntpd_obj isc ntp M parse RT CAP SECCOMP PTHREAD CRYPTO DNS_SD DNS_SD_INCLUDES %s SOCKET NSL SCF" % use_refclock,
- includes = [
- "%s/host/ntpd/" % ctx.bldnode.parent.abspath(),
- "%s/ntpd/" % srcnode,
- ] + ctx.env.PLATFORM_INCLUDES,
- install_path = ntpd_install_path,
- )
-
- ctx.manpage(8, "ntpd-man.txt")
- ctx.manpage(5, "ntp.conf-man.txt")
- ctx.manpage(5, "ntp.keys-man.txt")
+ srcnode = ctx.srcnode.abspath()
+ bldnode = ctx.bldnode.abspath()
+ target3 = ctx.srcnode.make_node('ntpd/version.h')
+ target4 = ctx.srcnode.make_node('wafhelpers/.autorevision-cache')
+
+ if ctx.variant == "host":
+ bison_source = ["ntp_parser.y"]
+
+ ctx(
+ features="c src_include bld_include libisc_include",
+ includes=["%s/ntpd/" % srcnode,
+ "%s/" % ctx.bldnode.parent.abspath()
+ ],
+ source=bison_source,
+ target="bison_obj",
+ )
+
+ ctx(
+ cwd=srcnode,
+ rule='VCS_EXTRA=`cat ${SRC[0]}` wafhelpers/autorevision.sh -o ${TGT[1].abspath()} -e VERSION -t h >${TGT[0].abspath()}',
+ source=["../VERSION", '../wafhelpers/autorevision.sh'],
+ target=[target3, target4],
+ )
+
+ # Generate Bison and version.h files first.
+ ctx.add_group()
+
+ keyword_gen_source = ["keyword-gen.c", ]
+
+ ctx(
+ features="c cprogram bld_include src_include libisc_include",
+ includes=["%s/ntpd/" % bldnode,
+ "%s/" % ctx.bldnode.parent.abspath()
+ ],
+ install_path=None,
+ source=keyword_gen_source,
+ target="keyword-gen",
+ )
+
+ # XXX: needs a dependency to rebuild ntp_keyword.h
+ # when keyword-gen is rebuilt
+
+ # Make sure keyword-gen is created next.
+ ctx.add_group()
+
+ ctx(
+ features="c bld_include src_include",
+ rule="%s/ntpd/keyword-gen ${SRC} > ${TGT}" % bldnode,
+ source="ntp_parser.tab.h",
+ target="ntp_keyword.h"
+ )
+
+ # Make sure ntp_keyword.h is created last.
+ ctx.add_group()
+
+ return
+
+ libntpd_source = [
+ "ntp_control.c",
+ "ntp_filegen.c",
+ "ntp_leapsec.c",
+ "ntp_monitor.c", # Needed by the restrict code
+ "ntp_restrict.c",
+ "ntp_util.c",
+ ]
+
+ ctx(
+ features="c bld_include src_include libisc_include",
+ includes=ctx.env.PLATFORM_INCLUDES,
+ source=libntpd_source,
+ target="libntpd_obj",
+ )
+
+ ctx(
+ target="ntpd_lib",
+ features="c cstlib",
+ use="libntpd_obj",
+ # use="libntpd_obj bison_obj",
+ )
+
+ use_refclock = "" # XXX: there must be a better way to do this
+ if ctx.env.REFCLOCK_ENABLE:
+
+ refclock_source = ["ntp_refclock.c",
+ "refclock_conf.c"
+ ]
+
+ ctx(
+ target="refclock",
+ features="c bld_include src_include libisc_include",
+ source=refclock_source,
+ )
+ use_refclock += "refclock"
+
+ for file, define in ctx.env.REFCLOCK_SOURCE:
+ ctx(
+ defines=["%s=1" % define],
+ features="c bld_include src_include libisc_include",
+ # XXX: These need to go into config.h
+ # rather than the command line for the individual drivers
+ source="refclock_%s.c" % file,
+ target="refclock_%s" % file,
+ )
+ use_refclock += " refclock_%s" % file
+
+ ntpd_source = [
+ "ntp_config.c",
+ "ntp_io.c",
+ "ntp_loopfilter.c",
+ "ntp_packetstamp.c",
+ "ntp_peer.c",
+ "ntp_proto.c",
+ "ntp_sandbox.c",
+ "ntp_scanner.c",
+ "ntp_signd.c",
+ "ntp_timer.c",
+ "ntpd.c",
+ ctx.bldnode.parent.find_node("host/ntpd/ntp_parser.tab.c")
+ ]
+
+ if ctx.env.SBINDIR:
+ ntpd_install_path = ctx.env.SBINDIR
+ else:
+ ntpd_install_path = "${PREFIX}/sbin/"
+ if not ntpd_install_path.endswith("/"):
+ ntpd_install_path += "/"
+
+ ctx(
+ features="c rtems_trace cprogram bld_include src_include "
+ "libisc_include libisc_pthread_include",
+ includes=["%s/host/ntpd/" % ctx.bldnode.parent.abspath(),
+ "%s/ntpd/" % srcnode,
+ ] + ctx.env.PLATFORM_INCLUDES,
+ install_path=ntpd_install_path,
+ source=ntpd_source,
+ target="ntpd",
+ use="libntpd_obj isc ntp M parse RT CAP SECCOMP PTHREAD "
+ "CRYPTO DNS_SD DNS_SD_INCLUDES %s SOCKET NSL SCF" % use_refclock,
+ )
+
+ ctx.manpage(8, "ntpd-man.txt")
+ ctx.manpage(5, "ntp.conf-man.txt")
+ ctx.manpage(5, "ntp.keys-man.txt")
=====================================
ntpfrob/wscript
=====================================
--- a/ntpfrob/wscript
+++ b/ntpfrob/wscript
@@ -1,18 +1,16 @@
def build(ctx):
- bldnode = ctx.bldnode.abspath()
+ bldnode = ctx.bldnode.abspath()
- frob_sources = ['main.c', 'bumpclock.c', 'jitter.c', 'precision.c',
- 'pps-api.c', 'tickadj.c']
+ frob_sources = ['main.c', 'bumpclock.c', 'jitter.c', 'precision.c',
+ 'pps-api.c', 'tickadj.c']
- ctx(
- target = "ntpfrob",
- features = "c cprogram bld_include src_include libisc_include",
- source = frob_sources,
- includes = [
- "%s/ntpfrob/" % bldnode
- ],
- use = "M RT",
- install_path = "${PREFIX}/bin/"
- )
+ ctx(
+ features="c cprogram bld_include src_include libisc_include",
+ includes=["%s/ntpfrob/" % bldnode],
+ install_path="${PREFIX}/bin/",
+ source=frob_sources,
+ target="ntpfrob",
+ use="M RT",
+ )
- ctx.manpage(8, "ntpfrob-man.txt")
+ ctx.manpage(8, "ntpfrob-man.txt")
=====================================
ntptime/wscript
=====================================
--- a/ntptime/wscript
+++ b/ntptime/wscript
@@ -1,20 +1,19 @@
def build(ctx):
- if ctx.env.HEADER_SYS_TIMEX_H:
- srcnode = ctx.srcnode.abspath()
- bldnode = ctx.bldnode.abspath()
+ if ctx.env.HEADER_SYS_TIMEX_H:
+ srcnode = ctx.srcnode.abspath()
+ bldnode = ctx.bldnode.abspath()
- ctx(
- target = "ntptime",
- features = "c cprogram bld_include src_include libisc_include",
- source = ["ntptime.c"],
- includes = [
- "%s/ntptime/" % bldnode,
- "%s/ntptime/" % srcnode,
- ],
- use = "ntp isc M RT",
- install_path = "${PREFIX}/bin/"
- )
+ ctx(
+ target="ntptime",
+ features="c cprogram bld_include src_include libisc_include",
+ source=["ntptime.c"],
+ includes=["%s/ntptime/" % bldnode,
+ "%s/ntptime/" % srcnode,
+ ],
+ use="ntp isc M RT",
+ install_path="${PREFIX}/bin/"
+ )
- ctx.manpage(8, "ntptime-man.txt")
+ ctx.manpage(8, "ntptime-man.txt")
# end
=====================================
pylib/wscript
=====================================
--- a/pylib/wscript
+++ b/pylib/wscript
@@ -10,41 +10,42 @@ def configure(conf):
def build(ctx):
srcnode = ctx.srcnode.make_node('pylib')
- #bldnode = ctx.bldnode.make_node('pylib')
+ # bldnode = ctx.bldnode.make_node('pylib')
target1 = ctx.srcnode.make_node('pylib/control.py')
target2 = ctx.srcnode.make_node('pylib/magic.py')
target3 = ctx.srcnode.make_node('pylib/version.py')
target4 = ctx.srcnode.make_node('wafhelpers/.autorevision-cache')
ctx(
- before = ['pyc', 'pyo'],
- cwd = srcnode,
- rule = '${SRC} >${TGT}',
- source = ["../wafhelpers/pythonize-header", "../include/ntp_control.h"],
- target = target1,
- )
+ before=['pyc', 'pyo'],
+ cwd=srcnode,
+ rule='${SRC} >${TGT}',
+ source=["../wafhelpers/pythonize-header", "../include/ntp_control.h"],
+ target=target1,
+ )
ctx(
- before = ['pyc', 'pyo'],
- cwd = srcnode,
- rule = '${SRC} >${TGT}',
- source = ["../wafhelpers/pythonize-header", "../include/ntp.h"],
- target = target2,
- )
+ before=['pyc', 'pyo'],
+ cwd=srcnode,
+ rule='${SRC} >${TGT}',
+ source=["../wafhelpers/pythonize-header", "../include/ntp.h"],
+ target=target2,
+ )
ctx(
- before = ['pyc', 'pyo'],
- cwd = srcnode,
- rule = 'VCS_EXTRA=`cat ${SRC[0]}` ../wafhelpers/autorevision.sh -o ${TGT[1].abspath()} -e VERSION -t python >${TGT[0].name}',
- source = ["../VERSION", '../wafhelpers/autorevision.sh'],
- target = [target3, target4],
- )
+ before=['pyc', 'pyo'],
+ cwd=srcnode,
+ rule='VCS_EXTRA=`cat ${SRC[0]}` ../wafhelpers/autorevision.sh -o ${TGT[1].abspath()} -e VERSION -t python >${TGT[0].name}',
+ source=["../VERSION", '../wafhelpers/autorevision.sh'],
+ target=[target3, target4],
+ )
- ctx.add_group() # Force early creation of generated files
+ # Force early creation of generated files
+ ctx.add_group()
ctx(
- features ='py',
- source = ctx.path.ant_glob('*.py'),
- install_from = '.',
- install_path ='${PYTHONDIR}/ntp'
- )
+ features='py',
+ source=ctx.path.ant_glob('*.py'),
+ install_from='.',
+ install_path='${PYTHONDIR}/ntp'
+ )
=====================================
tests/wscript
=====================================
--- a/tests/wscript
+++ b/tests/wscript
@@ -1,86 +1,85 @@
def build(ctx):
- srcnode = ctx.srcnode.abspath()
+ srcnode = ctx.srcnode.abspath()
- # Unity source
- unity_source = [
- "unity/unity.c",
- "unity/unity_fixture.c",
- ]
+ # Unity source
+ unity_source = [
+ "unity/unity.c",
+ "unity/unity_fixture.c",
+ ]
- unity_config = ["UNITY_INCLUDE_DOUBLE"]
+ unity_config = ["UNITY_INCLUDE_DOUBLE"]
- ctx(
- defines = unity_config,
- features = "c",
- target = "unity",
- source = unity_source
- )
+ ctx(
+ defines=unity_config,
+ features="c",
+ target="unity",
+ source=unity_source
+ )
- # Test main.
- common_source = [
- "common/tests_main.c",
- "common/caltime.c",
- "common/sockaddrtest.c",
- "common/file_handling.c"
- ]
+ # Test main.
+ common_source = [
+ "common/tests_main.c",
+ "common/caltime.c",
+ "common/sockaddrtest.c",
+ "common/file_handling.c"
+ ]
- # libntp/
- libntp_source = [
- "libntp/authkeys.c",
- "libntp/calendar.c",
- "libntp/clocktime.c",
- "libntp/decodenetnum.c",
- "libntp/hextolfp.c",
- "libntp/humandate.c",
- "libntp/lfpfunc.c",
- "libntp/lfptostr.c",
- "libntp/macencrypt.c",
- "libntp/msyslog.c",
- "libntp/netof.c",
- "libntp/numtoa.c",
- "libntp/prettydate.c",
- "libntp/recvbuff.c",
- "libntp/refidsmear.c",
- "libntp/sfptostr.c",
- "libntp/socktoa.c",
- "libntp/statestr.c",
- "libntp/strtolfp.c",
- "libntp/timespecops.c",
- "libntp/vi64ops.c",
- "libntp/ymd2yd.c"
- ] + common_source
+ # libntp/
+ libntp_source = [
+ "libntp/authkeys.c",
+ "libntp/calendar.c",
+ "libntp/clocktime.c",
+ "libntp/decodenetnum.c",
+ "libntp/hextolfp.c",
+ "libntp/humandate.c",
+ "libntp/lfpfunc.c",
+ "libntp/lfptostr.c",
+ "libntp/macencrypt.c",
+ "libntp/msyslog.c",
+ "libntp/netof.c",
+ "libntp/numtoa.c",
+ "libntp/prettydate.c",
+ "libntp/recvbuff.c",
+ "libntp/refidsmear.c",
+ "libntp/sfptostr.c",
+ "libntp/socktoa.c",
+ "libntp/statestr.c",
+ "libntp/strtolfp.c",
+ "libntp/timespecops.c",
+ "libntp/vi64ops.c",
+ "libntp/ymd2yd.c"
+ ] + common_source
- ctx.ntp_test(
- features = "c cprogram bld_include src_include libisc_include test",
- target = "test_libntp",
- install_path = None,
- defines = unity_config + ["TEST_LIBNTP=1"],
- includes = [
- "%s/tests/unity/" % srcnode,
- "%s/tests/libntp/" % srcnode,
- "%s/tests/ntpdig/" % srcnode,
- "%s/tests/common/" % srcnode
- ] + ctx.env.PLATFORM_INCLUDES,
- use = "unity ntp isc M PTHREAD CRYPTO RT SOCKET NSL",
- source = libntp_source,
- )
+ ctx.ntp_test(
+ features="c cprogram bld_include src_include libisc_include test",
+ target="test_libntp",
+ install_path=None,
+ defines=unity_config + ["TEST_LIBNTP=1"],
+ includes=["%s/tests/unity/" % srcnode,
+ "%s/tests/libntp/" % srcnode,
+ "%s/tests/ntpdig/" % srcnode,
+ "%s/tests/common/" % srcnode
+ ] + ctx.env.PLATFORM_INCLUDES,
+ use="unity ntp isc M PTHREAD CRYPTO RT SOCKET NSL",
+ source=libntp_source,
+ )
- ntpd_source = [
- "ntpd/leapsec.c",
- "ntpd/restrict.c",
- ] + common_source
+ ntpd_source = [
+ "ntpd/leapsec.c",
+ "ntpd/restrict.c",
+ ] + common_source
- ctx.ntp_test(
- features = "c cprogram bld_include src_include libisc_include test",
- target = "test_ntpd",
- install_path = None,
- defines = unity_config + ["TEST_NTPD=1"],
- includes = [
- "%s/tests/unity/" % srcnode,
- "%s/ntpd/" % srcnode,
- "%s/tests/libntp/" % srcnode,
- "%s/tests/common/" % srcnode
- ],
- use = "ntpd_lib libntpd_obj unity ntp isc M PTHREAD CRYPTO RT SOCKET NSL",
- source = ntpd_source,
- )
+ ctx.ntp_test(
+ defines=unity_config + ["TEST_NTPD=1"],
+ features="c cprogram bld_include src_include libisc_include test",
+ includes=["%s/tests/unity/" % srcnode,
+ "%s/ntpd/" % srcnode,
+ "%s/tests/libntp/" % srcnode,
+ "%s/tests/common/" % srcnode
+ ],
+ install_path=None,
+ source=ntpd_source,
+ target="test_ntpd",
+ use="ntpd_lib libntpd_obj unity ntp isc "
+ "M PTHREAD CRYPTO RT SOCKET NSL",
+ )
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/ad8a012bbb8fff174e9cc2335f709b2ed681b82d...b9104b2f8b04c94c9f8b08218cd24a13533b5643
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170206/c93afac1/attachment.html>
More information about the vc
mailing list