commit 8f9d062efb013825c03ef0cae89839edbeb4b4fe
author Davide Pesavento <davide.pesavento@lip6.fr> Tue Nov 27 01:23:37 2018 -0500
committer Davide Pesavento <davide.pesavento@lip6.fr> Tue Nov 27 01:45:53 2018 -0500
tree fdc5e45c84eef2e3d0f74a3ac8f905dfdf0d43c9
parent e41e71e830ba81f8ddcf99285982560a139cc6d5

Update build flags, Jenkins scripts, and Travis configuration

Change-Id: I738e9a9cd21be6c94e1ae3f646c959cdb89ab6f0

wscript

diff --git a/wscript b/wscript
index 2010b7f..708d7d9 100644
--- a/wscript
+++ b/wscript
@@ -5,21 +5,25 @@
 
 VERSION = '0.1.0'
 APPNAME = 'ndn-nac'
-PACKAGE_BUGREPORT = "http://redmine.named-data.net/projects/nac"
-GIT_TAG_PREFIX = "nac-"
+PACKAGE_BUGREPORT = 'https://redmine.named-data.net/projects/nac'
+GIT_TAG_PREFIX = 'nac-'
 
 def options(opt):
-    opt.load(['compiler_c', 'compiler_cxx', 'gnu_dirs'])
-    opt.load(['boost', 'default-compiler-flags', 'sanitizers', 'coverage', 'sphinx_build', 'doxygen'],
+    opt.load(['compiler_cxx', 'gnu_dirs'])
+    opt.load(['default-compiler-flags', 'boost',
+              'coverage', 'sanitizers',
+              'doxygen', 'sphinx_build'],
              tooldir=['.waf-tools'])
 
-    opt = opt.add_option_group("NDN-NAC Options")
+    opt = opt.add_option_group('NDN-NAC Options')
 
-    opt.add_option('--with-tests', action='store_true', default=False, dest='with_tests',
-                   help='''Build unit tests''')
+    opt.add_option('--with-tests', action='store_true', default=False,
+                   help='Build unit tests')
 
 def configure(conf):
-    conf.load(['compiler_c', 'compiler_cxx', 'gnu_dirs', 'boost', 'default-compiler-flags', 'sphinx_build', 'doxygen'])
+    conf.load(['compiler_cxx', 'gnu_dirs',
+               'default-compiler-flags', 'boost',
+               'doxygen', 'sphinx_build'])
 
     conf.env['WITH_TESTS'] = conf.options.with_tests
 
@@ -70,13 +74,13 @@
         VERSION_PATCH=VERSION_SPLIT[2])
 
     bld.shlib(
-        target="ndn-nac",
-        name="libndn-nac",
+        target='ndn-nac',
+        name='libndn-nac',
         vnum=VERSION_BASE,
         cnum=VERSION_BASE,
-        source =  bld.path.ant_glob(['src/**/*.cpp']),
-        use = 'BOOST NDN_CXX',
-        includes = ['src', '.'],
+        source=bld.path.ant_glob('src/**/*.cpp'),
+        use='BOOST NDN_CXX',
+        includes=['src', '.'],
         export_includes=['src', '.'])
 
     # Unit tests
@@ -87,23 +91,23 @@
     bld.recurse('examples')
 
     bld.install_files(
-        dest = "%s/ndn-nac" % bld.env['INCLUDEDIR'],
+        dest = '%s/ndn-nac' % bld.env['INCLUDEDIR'],
         files = bld.path.ant_glob(['src/**/*.hpp', 'src/**/*.h', 'common.hpp']),
-        cwd = bld.path.find_dir("src"),
+        cwd = bld.path.find_dir('src'),
         relative_trick = True)
 
     bld.install_files(
-        dest = "%s/ndn-nac" % bld.env['INCLUDEDIR'],
+        dest = '%s/ndn-nac' % bld.env['INCLUDEDIR'],
         files = bld.path.get_bld().ant_glob(['src/**/*.hpp', 'common.hpp', 'config.hpp']),
-        cwd = bld.path.get_bld().find_dir("src"),
-        relative_trick = False )
+        cwd = bld.path.get_bld().find_dir('src'),
+        relative_trick = False)
 
-    bld(features = "subst",
+    bld(features='subst',
         source='libndn-nac.pc.in',
         target='libndn-nac.pc',
         install_path = '${LIBDIR}/pkgconfig',
         PREFIX       = bld.env['PREFIX'],
-        INCLUDEDIR   = "%s/ndn-nac" % bld.env['INCLUDEDIR'],
+        INCLUDEDIR   = '%s/ndn-nac' % bld.env['INCLUDEDIR'],
         VERSION      = VERSION)
 
 def docs(bld):