commit 3d85090003bd3918b0c0263636847c8840e4cfe1
author Varun Patil <varunpatil@ucla.edu> Mon Nov 23 12:19:14 2020 +0530
committer Varun Patil <varunpatil@ucla.edu> Mon Nov 23 12:23:16 2020 +0530
tree 3960f65eec8f6eb600906c7acb36310759cdf57a
parent 9c7e3f9ae0251d3c4af398e1ed35b25ebc6d668e

build: reanimate the dead

Fix build with ndn-cxx 0.7.1 and ChronoSync 0.5.3

* Adapt to new API
* Upgrade to Qt5
* Several other bugs

Refs: #4563, #4087
Change-Id: Ic55d687caade08f557f9b9ec3e9569bc96798710

wscript

diff --git a/wscript b/wscript
index ab4a0c8..e65a6ba 100644
--- a/wscript
+++ b/wscript
@@ -7,10 +7,10 @@
 
 def options(opt):
 
-    opt.load(['compiler_c', 'compiler_cxx', 'qt4', 'gnu_dirs'])
+    opt.load(['compiler_c', 'compiler_cxx', 'qt5', 'gnu_dirs'])
 
     opt.load(['default-compiler-flags', 'boost', 'protoc',
-              'doxygen', 'sphinx_build'],
+              'doxygen', 'sphinx_build', 'qt5', 'cryptopp'],
               tooldir=['waf-tools'])
 
     opt = opt.add_option_group('ChronotChat Options')
@@ -22,9 +22,9 @@
                    help='''Enable log4cxx''')
 
 def configure(conf):
-    conf.load(['compiler_c', 'compiler_cxx', 'qt4',
+    conf.load(['compiler_c', 'compiler_cxx', 'qt5',
                'default-compiler-flags', 'boost', 'protoc', 'gnu_dirs',
-               'doxygen', 'sphinx_build'])
+               'doxygen', 'sphinx_build', 'cryptopp'])
 
     conf.check_cfg(package='libndn-cxx', args=['--cflags', '--libs'],
                    uselib_store='NDN_CXX', mandatory=True)
@@ -50,10 +50,11 @@
                    " (http://redmine.named-data.net/projects/nfd/wiki/Boost_FAQ)")
         return
 
+    conf.check_cryptopp()
     conf.write_config_header('src/config.h')
 
 def build (bld):
-    feature_list = 'qt4 cxx'
+    feature_list = 'qt5 cxx'
     if bld.env["WITH_TESTS"]:
         feature_list += ' cxxstlib'
     else:
@@ -65,7 +66,7 @@
         defines = "WAF=1",
         source = bld.path.ant_glob(['src/*.cpp', 'src/*.ui', '*.qrc', 'logging.cc', 'src/*.proto']),
         includes = "src .",
-        use = "QTCORE QTGUI QTWIDGETS QTSQL NDN_CXX BOOST LOG4CXX SYNC",
+        use = "QT5CORE QT5GUI QT5WIDGETS QT5SQL NDN_CXX BOOST LOG4CXX SYNC CRYPTOPP",
         )
 
     # Unit tests
@@ -77,7 +78,6 @@
           use = 'BOOST ChronoChat',
           includes = "src .",
           install_path = None,
-          defines = 'TEST_CERT_PATH=\"%s/cert-test\"' %(bld.bldnode),
           )
 
     # Debug tools