build: various updates

* Upgrade waf to 2.0.14
 * Sync default compiler flags with ndn-cxx
 * Simplify compilation of unit-tests

Change-Id: I94865d405240c181dd4cfdd1cb730b756ad5166a

.mailmap

@@ -0,0 +1,2 @@
+<aa@cs.fiu.edu> <alexander.afanasyev@ucla.edu>
+<davidepesa@gmail.com> <davide.pesavento@lip6.fr>

.waf-tools/default-compiler-flags.py

@@ -20,9 +20,9 @@ def configure(conf):
                       'The minimum supported gcc version is 5.3.0.')
         conf.flags = GccFlags()
     elif cxx == 'clang':
-        if ccver < (3, 5, 0):
+        if ccver < (3, 6, 0):
             errmsg = ('The version of clang you are using is too old.\n'
-                      'The minimum supported clang version is 3.5.0.')
+                      'The minimum supported clang version is 3.6.0.')
         conf.flags = ClangFlags()
     else:
         warnmsg = 'Note: %s compiler is unsupported' % cxx
@@ -129,6 +129,10 @@ class GccBasicFlags(CompilerFlags):
     def getGeneralFlags(self, conf):
         flags = super(GccBasicFlags, self).getGeneralFlags(conf)
         flags['CXXFLAGS'] += ['-std=c++14']
+        if Utils.unversioned_sys_platform() == 'linux':
+            flags['LINKFLAGS'] += ['-fuse-ld=gold']
+        elif Utils.unversioned_sys_platform() == 'freebsd':
+            flags['LINKFLAGS'] += ['-fuse-ld=lld']
         return flags
 
     def getDebugFlags(self, conf):
@@ -145,7 +149,7 @@ class GccBasicFlags(CompilerFlags):
                               '-Wno-error=maybe-uninitialized', # Bug #1615
                               '-Wno-unused-parameter',
                               ]
-        flags['LINKFLAGS'] += ['-fuse-ld=gold', '-Wl,-O1']
+        flags['LINKFLAGS'] += ['-Wl,-O1']
         return flags
 
     def getOptimizedFlags(self, conf):
@@ -158,7 +162,7 @@ class GccBasicFlags(CompilerFlags):
                               '-Wnon-virtual-dtor',
                               '-Wno-unused-parameter',
                               ]
-        flags['LINKFLAGS'] += ['-fuse-ld=gold', '-Wl,-O1']
+        flags['LINKFLAGS'] += ['-Wl,-O1']
         return flags
 
 class GccFlags(GccBasicFlags):
@@ -179,6 +183,8 @@ class ClangFlags(GccBasicFlags):
             # Bug #4296
             flags['CXXFLAGS'] += [['-isystem', '/usr/local/include'], # for Homebrew
                                   ['-isystem', '/opt/local/include']] # for MacPorts
+        if Utils.unversioned_sys_platform() == 'freebsd':
+            flags['CXXFLAGS'] += [['-isystem', '/usr/local/include']] # Bug #4790
         return flags
 
     def getDebugFlags(self, conf):
@@ -186,15 +192,13 @@ class ClangFlags(GccBasicFlags):
         flags['CXXFLAGS'] += ['-fcolor-diagnostics',
                               '-Wextra-semi',
                               '-Wundefined-func-template',
-                              '-Wno-error=deprecated-register',
-                              '-Wno-error=infinite-recursion', # Bug #3358
-                              '-Wno-error=keyword-macro', # Bug #3235
-                              '-Wno-error=unneeded-internal-declaration', # Bug #1588
                               '-Wno-unused-local-typedef', # Bugs #2657 and #3209
                               ]
         version = self.getCompilerVersion(conf)
         if version < (3, 9, 0) or (Utils.unversioned_sys_platform() == 'darwin' and version < (8, 1, 0)):
             flags['CXXFLAGS'] += ['-Wno-unknown-pragmas']
+        if version < (6, 0, 0):
+            flags['CXXFLAGS'] += ['-Wno-missing-braces'] # Bug #4721
         return flags
 
     def getOptimizedFlags(self, conf):
@@ -207,4 +211,6 @@ class ClangFlags(GccBasicFlags):
         version = self.getCompilerVersion(conf)
         if version < (3, 9, 0) or (Utils.unversioned_sys_platform() == 'darwin' and version < (8, 1, 0)):
             flags['CXXFLAGS'] += ['-Wno-unknown-pragmas']
+        if version < (6, 0, 0):
+            flags['CXXFLAGS'] += ['-Wno-missing-braces'] # Bug #4721
         return flags

tests/boost-test.hpp

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012-2014 University of California, Los Angeles
+ * Copyright (c) 2012-2019 University of California, Los Angeles
  *
  * This file is part of ChronoSync, synchronization library for distributed realtime
  * applications for NDN.
@@ -24,8 +24,7 @@
 #pragma GCC system_header
 #pragma clang system_header
 
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/concept_check.hpp>
-#include <boost/test/output_test_stream.hpp>
 
 #endif // CHRONOSYNC_TESTS_BOOST_TEST_HPP

tests/main.cpp

@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2017,  Regents of the University of California,
+/*
+ * Copyright (c) 2014-2019,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -24,19 +24,18 @@
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_ALTERNATIVE_INIT_API
+#define BOOST_TEST_MODULE ChronoSync
 
 #include <boost/version.hpp>
 
 #if BOOST_VERSION >= 106200
 // Boost.Test v3.3 (Boost 1.62) natively supports multi-logger output
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 #else
+#define BOOST_TEST_ALTERNATIVE_INIT_API
 #define BOOST_TEST_NO_MAIN
-#include "boost-test.hpp"
-
-#include "boost-multi-log-formatter.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/boost-multi-log-formatter.hpp"
 
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>

tests/unit-tests/bzip2-helper.t.cpp

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012-2018 University of California, Los Angeles
+ * Copyright (c) 2012-2019 University of California, Los Angeles
  *
  * This file is part of ChronoSync, synchronization library for distributed realtime
  * applications for NDN.
@@ -19,13 +19,11 @@
 
 #include "bzip2-helper.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace chronosync {
 namespace test {
 
-using std::tuple;
-
 BOOST_AUTO_TEST_SUITE(TestBzip2Helper)
 
 BOOST_AUTO_TEST_CASE(Basic)

tests/unit-tests/test-diff-state.cpp

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012-2014 University of California, Los Angeles
+ * Copyright (c) 2012-2019 University of California, Los Angeles
  *
  * This file is part of ChronoSync, synchronization library for distributed realtime
  * applications for NDN.
@@ -19,7 +19,8 @@
 
 #include "diff-state.hpp"
 #include "diff-state-container.hpp"
-#include "boost-test.hpp"
+
+#include "tests/boost-test.hpp"
 
 namespace chronosync {
 namespace test {

tests/unit-tests/test-empty.cpp

@@ -1,25 +0,0 @@
-/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
-/*
- * Copyright (c) 2012-2014 University of California, Los Angeles
- *
- * This file is part of ChronoSync, synchronization library for distributed realtime
- * applications for NDN.
- *
- * ChronoSync is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Foundation, either
- * version 3 of the License, or (at your option) any later version.
- *
- * ChronoSync is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "boost-test.hpp"
-
-BOOST_AUTO_TEST_CASE(EmptyTest)
-{
-
-}

tests/unit-tests/test-interest-table.cpp

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012-2017 University of California, Los Angeles
+ * Copyright (c) 2012-2019 University of California, Los Angeles
  *
  * This file is part of ChronoSync, synchronization library for distributed realtime
  * applications for NDN.
@@ -18,8 +18,9 @@
  */
 
 #include "interest-table.hpp"
-#include "boost-test.hpp"
-#include "../unit-test-time-fixture.hpp"
+
+#include "tests/boost-test.hpp"
+#include "tests/unit-test-time-fixture.hpp"
 
 #include <unistd.h>
 

tests/unit-tests/test-leaf.cpp

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012-2017 University of California, Los Angeles
+ * Copyright (c) 2012-2019 University of California, Los Angeles
  *
  * This file is part of ChronoSync, synchronization library for distributed realtime
  * applications for NDN.
@@ -18,9 +18,10 @@
  */
 
 #include "leaf.hpp"
-#include "boost-test.hpp"
 #include "leaf-container.hpp"
 
+#include "tests/boost-test.hpp"
+
 #include <ndn-cxx/encoding/buffer-stream.hpp>
 #include <ndn-cxx/util/string-helper.hpp>
 

tests/unit-tests/test-logic.cpp

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012-2018 University of California, Los Angeles
+ * Copyright (c) 2012-2019 University of California, Los Angeles
  *
  * This file is part of ChronoSync, synchronization library for distributed realtime
  * applications for NDN.
@@ -20,17 +20,15 @@
 #include "logic.hpp"
 #include "bzip2-helper.hpp"
 
-#include "boost-test.hpp"
-#include "../identity-management-fixture.hpp"
-
-#include "dummy-forwarder.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/identity-management-fixture.hpp"
+#include "tests/unit-tests/dummy-forwarder.hpp"
 
 #include <ndn-cxx/util/random.hpp>
 
 namespace chronosync {
 namespace test {
 
-using std::vector;
 using ndn::chronosync::DummyForwarder;
 
 class Handler
@@ -47,7 +45,7 @@ public:
   }
 
   void
-  onUpdate(const vector<MissingDataInfo>& v)
+  onUpdate(const std::vector<MissingDataInfo>& v)
   {
     for (size_t i = 0; i < v.size(); i++) {
       update(v[i].session, v[i].high, v[i].low);
@@ -99,8 +97,8 @@ public:
 
 BOOST_FIXTURE_TEST_SUITE(LogicTests, LogicFixture)
 
-void
-onUpdate(const vector<MissingDataInfo>& v)
+static void
+onUpdate(const std::vector<MissingDataInfo>& v)
 {
 }
 
@@ -443,6 +441,7 @@ public:
       setenv("CHRONOSYNC_MAX_PACKET_SIZE", oldSize->c_str(), 1);
     }
   }
+
 private:
   ndn::optional<std::string> oldSize;
 };

tests/unit-tests/test-multiple-user.cpp

@@ -1,13 +1,29 @@
+/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2012-2019 University of California, Los Angeles
+ *
+ * This file is part of ChronoSync, synchronization library for distributed realtime
+ * applications for NDN.
+ *
+ * ChronoSync is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * ChronoSync is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "logic.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace chronosync {
 namespace test {
 
-using std::vector;
-
-
 class Handler
 {
 public:
@@ -22,9 +38,8 @@ public:
   }
 
   void
-  onUpdate(const vector<MissingDataInfo>& v)
+  onUpdate(const std::vector<MissingDataInfo>& v)
   {
-
   }
 
   void
@@ -45,7 +60,6 @@ public:
     logic.removeUserNode(prefix);
   }
 
-
   Logic logic;
   std::map<Name, SeqNo> map;
 };
@@ -53,7 +67,6 @@ public:
 class MultiUserFixture
 {
 public:
-
   MultiUserFixture()
     : syncPrefix("/ndn/broadcast/sync")
     , scheduler(io)
@@ -93,9 +106,8 @@ BOOST_AUTO_TEST_CASE(ThreeUserNode)
 
   BOOST_CHECK_EQUAL(handler->logic.getSeqNo(), 2);
 
-  BOOST_REQUIRE_THROW(handler->logic.getSeqNo(userPrefix[0]), Logic::Error);
-  BOOST_REQUIRE_THROW(handler->logic.getSessionName(userPrefix[0]), Logic::Error);
-
+  BOOST_CHECK_THROW(handler->logic.getSeqNo(userPrefix[0]), Logic::Error);
+  BOOST_CHECK_THROW(handler->logic.getSessionName(userPrefix[0]), Logic::Error);
 }
 
 BOOST_AUTO_TEST_SUITE_END()

tests/unit-tests/test-socket.cpp

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012-2018 University of California, Los Angeles
+ * Copyright (c) 2012-2019 University of California, Los Angeles
  *
  * This file is part of ChronoSync, synchronization library for distributed realtime
  * applications for NDN.
@@ -19,8 +19,8 @@
 
 #include "socket.hpp"
 
-#include "boost-test.hpp"
-#include "../unit-test-time-fixture.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit-test-time-fixture.hpp"
 
 #include <ndn-cxx/util/dummy-client-face.hpp>
 
@@ -28,8 +28,6 @@ namespace chronosync {
 namespace test {
 
 using std::string;
-using std::vector;
-using std::map;
 using ndn::util::DummyClientFace;
 
 /**
@@ -99,7 +97,7 @@ public:
   }
 
   void
-  fetchAll(const vector<MissingDataInfo>& v)
+  fetchAll(const std::vector<MissingDataInfo>& v)
   {
     // std::cerr << "fetchAll" << std::endl;
     for (size_t i = 0; i < v.size(); i++) {
@@ -112,7 +110,7 @@ public:
   }
 
   void
-  fetchNumbers(const vector<MissingDataInfo>& v)
+  fetchNumbers(const std::vector<MissingDataInfo>& v)
   {
     // std::cerr << "fetchNumbers" << std::endl;
     for (size_t i = 0; i < v.size(); i++) {
@@ -128,7 +126,7 @@ public:
   toString()
   {
     string str = "\n";
-    for (map<Name, string>::iterator it = data.begin(); it != data.end(); ++it) {
+    for (auto it = data.begin(); it != data.end(); ++it) {
       str += "<";
       str += it->first.toUri();
       str += "|";
@@ -141,7 +139,7 @@ public:
   }
 
 public:
-  map<ndn::Name, string> data;
+  std::map<ndn::Name, string> data;
   uint32_t sum;
   Socket socket;
 };
@@ -248,8 +246,6 @@ public:
   size_t readDataOffset[3];
 };
 
-
-
 BOOST_FIXTURE_TEST_SUITE(SocketTests, SocketFixture)
 
 BOOST_AUTO_TEST_CASE(BasicData)

tests/unit-tests/test-state.cpp

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012-2017 University of California, Los Angeles
+ * Copyright (c) 2012-2019 University of California, Los Angeles
  *
  * This file is part of ChronoSync, synchronization library for distributed realtime
  * applications for NDN.
@@ -19,13 +19,11 @@
 
 #include "state.hpp"
 
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
 
 namespace chronosync {
 namespace test {
 
-using std::tuple;
-
 BOOST_AUTO_TEST_SUITE(StateTests)
 
 BOOST_AUTO_TEST_CASE(Basic)
@@ -42,7 +40,7 @@ BOOST_AUTO_TEST_CASE(Basic)
   BOOST_CHECK_NO_THROW(state.reset());
   BOOST_CHECK_EQUAL(state.getLeaves().size(), 0);
 
-  tuple<bool, bool, SeqNo> result;
+  std::tuple<bool, bool, SeqNo> result;
   result = state.update(info, 12);
   BOOST_CHECK_EQUAL(std::get<0>(result), true);
   BOOST_CHECK_EQUAL(std::get<1>(result), false);

tests/wscript

@@ -1,28 +1,10 @@
 # -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-from waflib import Utils
 
 top = '..'
 
 def build(bld):
-    bld.objects(
-        target='tests-main',
-        source='main.cpp',
-        use='ChronoSync',
-        defines=['BOOST_TEST_MODULE=ChronoSync'])
-
-    bld.program(
-        target="../unit-tests",
+    bld.program(target='../unit-tests',
                 name='unit-tests',
-        source=bld.path.ant_glob(['unit-tests/**/*.cpp', 'identity-management-fixture.cpp']),
-        use='ChronoSync tests-main',
-        includes=['.'],
+                source=bld.path.ant_glob('**/*.cpp'),
+                use='ChronoSync',
                 install_path=None)
-
-    # TODO: Re-enable when there integration tests are implemented
-    # bld.program(
-    #     target="../integrated-tests",
-    #     source=bld.path.ant_glob(['integrated-tests/**/*.cpp']),
-    #     use='ChronoSync tests-main',
-    #     includes=['.'],
-    #     install_path=None,
-    #     )

waf

@@ -32,11 +32,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys, inspect
 
-VERSION="2.0.6"
-REVISION="593191f496fe8c66231dfd5df26167ae"
-GIT="459ddf50b622573ecfe36c12c076e0fcc610b01e"
+VERSION="2.0.14"
+REVISION="e67604cd8962dbdaf7c93e0d7470ef5b"
+GIT="353ffefa21e6f8795469d118d8059aa16ef49109"
 INSTALL=''
-C1='#2'
+C1='#('
 C2='#&'
 C3='#%'
 cwd = os.getcwd()
@@ -165,6 +165,6 @@ if __name__ == '__main__':
 	Scripting.waf_entry_point(cwd, VERSION, wafdir)
 
 #==>
-#BZh91AY&SYü¢K°ÿÿ°
ÐÿÿÿÿÿÿÿÿÿÿÿÿE ‚„ 0�#%ˆ(b|wzs*#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%úóJ´¶*«ûÜ=JV;ºîË×v›»ª‹­^\¨IÓ$o£=>í_nÓk!Û®ÖëÓ'›ßO¾X6½³gvÝ”qP{»¯Z´kRÛ]/I±Û1Öï6¡z÷ÎÏ1¶*úwšûè÷yã×¹Z>º{ƆAÝž¾vwÇv]ã}½µ[½7v9­Kmïk€#%#% #%»€À˜gÛ#%<m™vŒ¥Û·#&;›@Ü9Ù£VÀ#%ŽçUÝÓè®’žƒÐP9¬èÔ´ÑT¢µ¯C#%•H*”R‚ÞáÕ	E$C £BT¨(hw¼!»ëo=ÖŸfW}'½»«˜›½êÞn­S3®)PîîZdT§Z·×šèûß]è#%¹äó£^}³í‹Ûky½ìõ×yîôgmíË×¼¾÷;|»í}öÏiÙÒ¹9ï¹ïl°Þ³Ÿ½½÷Þ�¼ø\ôÐè¶ëÎÞ@:AH*ƒÐelkÖ¶Ù»u¬Ý»ÞzÇLWZí±£0îÎl¤Š”ş)è#%*"ˆ h<�ch•=î¹y–cníÝÁ¥7Ð;¾îçÌËìh¢€ 
2=˜[ \`]æìÍ€ß{Ý�h{r®ûïyÐö½¹ßcÜûž÷ßcÒ󯫺»ƒ{�vz%¾¸qzµöòõ7�uÛ3{nâñ›ç¯¼ßw¯z{œõí»s¨Û{Ín’mã‹»k»»Ý«Ù]ÃŽž¾½êï�+±GÝ�HÖë…×^á wÝÂ_Éè×¼`£§¶¯®¾ÞÎ_n_
I/»«DùökÛ»›6Ù«ÝÛ}Ί÷œ˜ûÙ/½ÁÞKë ôs½ïqé4ò݇k­.�9°
tçµçzuß{ﻇݰòÛpJ)@*%	*UBftI¶p;=†�‹k7·c¾Ê·*ö÷¡í‚Ì÷3vÖt<«©³Ø1n“«ÍãÞj©o]åÔhAÝf÷s®Ìð#%·g8€#%¢÷«—#»ÎëÞgºÍ¶g'LŸlóÅ÷6[¾ìsx¹ÝCeôË£Ó§ßw}>\o»u{d7:"õÁsÖ¶Î-óÙÆîg
%@h{{–Ú‹�u½(¹^)èR»ÃM«Ñ³ß^\}ó0ìå­îõÏ+wrñãÜxûÞÝãÞfk³w>-=íÜ»”Æë}î|{FlÁ°l0äÐ;zé<¯§nñ|ÜîƒVÁš«‡ÖôhÙÕÙ{Ùß/«�»Þ´#%ÀU®Ø¸Õ°¹)O­{Í4nÖïwvn.ë…[îÜ·ŽÕÖíÞŸCÐ÷Ìݾ·µ¯»YA}{îuóêû7±ÑÐ ôÂì¶yŽ§užÏíOwváÜ:­0-¶w¼îò{é÷Ø—ˆ4ô#%vböÍ«`î#%(wm{“­ç¶¾øSßs€;°ª#%#2h2{{a]ÝÖí€Fæ{ÆïMÖÔhš±½iuÝÚë�¬·aô÷oUQCºXWNì®—vÝ·KÃwVsvÜmôïL—Œ¯!G3ñ|»¯÷Ÿ|¯Z³Øø'¬Hš“MëîñÛ×]spÈÊãÞå±;­Úu`ÝñÝ÷Îì ¯ƒ›s¨ñVóÒóŽðèï�|}îh€ #%@h
44˜†šbh4§å#%š�Hö¨M6 ÐýSzPJh‚@€	’`!2b“ÔýSôM¤�4H=A h#%#%#%#%‚DA
Ñ &)±	‘ªze<Ñ©š¤x“Ôyi#&¦ja=@dd44#%#%Iꔑ&§¢m“%=•=’žÕz�z�¡¡ê4z€=A¦G¨#%@#%#%$!#%L€	 
#&&L@“ÔÆJf˜ši�Fh#HÈ#%#%#%#%j"@&€ MÉ‘ªŸ…Oõ‰éOÊz†£Ñ¢<¦Ò4Ð#&€Ð#%—ÿÙþÕU®¸‘þô–µ9~åV»¦%1’�ñª×tB2UE¦­'¾ÕmsjÚ¢Õ­ó¤Á>ãï?ø~2ßÀuÒjÌR’ÓYŸŽ]¾%é7Š’›wsRÓŸò‹àºÌþÀ%qDH+Bƒ¯U¢Â»`í™'—æDôðÙ§‹‰ªuN�TÛÍñxyÁ‡ˆ"™¼/p+œb#2‚kg þ\¿¬W}ÆÛMT¶™l§uu«KmEµRU¬ÊÖ’¶Ú-´m¬ˆ#%Ü
"*5#ÑʉAФŒ#%#%ÄT	¢‚ ƒaµ©+ô5n•o-ki«SWt 2¡  "¦b¢Šd,”fj3M‘&0H¤ØÚˆ™š„K#%–R�(¦ÚM†&h“A(Éjj-�ÑšK&šDhšˆD¨Å"jRŒ€F¥�#%i‹*mH¤Ù-Q%,´¦šÑ²Ò4Q–1Z5Q’TSd!%¦2P&4²Ò1�¥£SM„¶•µšÚÐ͉4fdÌ„ÑdÛMm4ÚÔ”l¤©­Œµ6Ù•2Òd“A°kLMJ()‘FÈ‘hDŠ‹4�¢“
¢¢AÅ%LÆiQT¦#Ä!#2	&0-ˆÉ#jBB4±ClÍˆ˜¦!™%4¬°fbD#&%‘ˆ¥’²llhؘT‹Ée!#E¥)‚lII‘FQ&ŒšdÄ‚¤£H”F’@¬‚›$‹DÌ¥¦"™‚lk$3b$Å436	…ˆÚ’À$²°„X$¤ØÔ&£�– ‘(ÐE"‰‚Á€˜ed”Â1e	”JMF¦Th¬&É©"IˆD%¥6@�‰"Él@I‹,Ê)2J&ÌÈ؉›")FlŒÁ2©¦$„YJ,bÈY ÓHXÄF¥d²FŤ&E4“MH•4È4hBI©%”e5LÒ6Š¦š(•¨C, ÒYÅ’“"h&™H•3”)1Pl†R	#2@E&c$Œh"Y!–²L©™¶˜ÆÙMbQ2‘LB‘±e#2ÊhÙ"Š ŠI$Ù#ɳHÔÍ,FRB“31K#+6˜JÄFŠfM52i’#2CDRhŠ›Y©R””ÑHY1“"›HQdŒRŒ¤…"(±¶)$Ä’iMFɨÒ$PÒ6ÄcA3Y¤ÄÚ#&ƒ4„Òe‹DÈY‘$¦ÉLŠQ…“!-fÍ‹Y,HM%“¢¨-ËaH“!�Œ‰”jK�0”M-Ji@¢©†„™”˜¦dÙ”Á"–hÓ,!¨(M&Q‘!¢kjVÖŒPš™£)‘³J)&dDVƒR–À¥š,Å&‘”%–TÙ¢-L¬-”bC؈RˆÊF�”µû­®ˆJš¤D†#6Š1Q[X¨Ù2™¦¢•$Ñ¡¥¤6ÆÂ6I¨ÚÈŒ5#&&2Œ‘e0¤�dA˜™še²m£J[QHZ2i„KY�¡cR#2RÓL™2¤ÔU¤h©²„VÉ–ER©Y…6lf3-lX²#[&™Y¦YM¬•e²”¦™Ù%#j,R²Ä–�ÉKQª‚Õ�Z2TUd¬”mQ´TTš±4DÉbÄTEŠÔXe£kÒdÂÁµ@S
(¤ÆŒ!i’iZklhÚbV1l‘bÚH+UKjÊ*)šš²h’¤bB&›H¢Éµ*ͱŠSi¶YJ™f›TÒ"5´ªY$ÌÕ*F,BÚS)¬±¡²É¬¬²³LD$2£I(‹Ñ�ˆ‘"A¡1ˆRÚ5BP!*(dÕ’i£dɤ¢ÈËŠl¤#&"+,ŒˆFS1(RQ²™ b#2-2B#6›IŠ#cd)„f™¨ÉF†˜HÌÔ#!4LÔQ¢JdR�šP5BTÀF“a)S,�š‹FBŒËQ”£fRIF@Ñ�¤1e+ÃhØƤ£%„h,‘e„(Éh¡ ±Hf$Ѣ̦̤¥”¬Ì•Œ ³E’6!�Hµ£f´fˆ¨h©M&ÃLT±Y”Z�FBL�1�i‰±%IRel¦˜Ù £-’”¨Ôf4–MŒÒhѳ(iFJÌ­dFš3D‰P"DB#&–`ˆcFÙ¤lQ¢³I²S±1II	¢Ñl%F£QF+´fk#&&I4(Y261J �Š6´–l–C2ˆ6*2JY¤©�[EBF±ª5Dš(L²´( “Rj�ƒ&…„cT¥#&XÚ#&)¦Y#2(Ñ$U2-F¨±#)kdT¢¨Ö4˜",š"™”-J)ÉD•6%2­Dm`ÑS*,•FÅšQl™+­&)+)¶BÙ66†‰²JdJ‹#&‹%MDb6ÉŠI�A«2`ÐB£Jl͉ˆ¦±ª*edÖHÒÒMEF(šmI´[)%�“�¤Á’V¤F‹K-C-Dš‹TUŒ¥I["UcRQb‘M	‘LŒÈ˜ÓR"ƒS6IšÑ*’Å´jJ–m¤Ö‰›PljB��Œ‘­ŠeSM´mFŶ1mI˜ÊQ	eebZŒV,Í�¨ÚT¨¥*”f*”˜Ù@Ñ¢ÁTi5�bÌ©"Ô•±dÛ)2Ôh¬CH´RQ£hÖ¶ËUŠDÊ…LIDb¡€D–4TSI6¦É*ÆضŦjÚ1­e¤©¡–¶RÉmMM²Ôi«FQDFŒ�¤”Pl5š“Rfl²¢(¨“I”“"21#2¤¶‹2Û1ü¿ìý›úßèuoöç?'ÃÏ5§#2‹?âÿV•fˆ)¯¶e"ÃvÝ“ù
rÃrÐhÒløÞy·õž–ôæþ¯õzô4Á©Œ�ÿÇ{µSgú~ÂÛGžˆíÿ$ãŒ#&.`Rĸ`¤�jª#2º2‘ìzÿ?ªõ{ký»´ÿ›Ì¼ÿ§ûyÞ¿ò*Æxdç�,$b/›žmíضç' «I°ö�~lGìêeGëgw«�±9;¼ÈŒSRR(j“ƒ5â䱈þúÙ³j“þíÚ�FL€I¥Û"lÆLhƒcôav4ŒŠˆÕÕ¨ÌÕLÒVS(�rÎw,Ë¿¬Îjä6.•#2b„ÑàÍ*�˜ÒæP)R�¤H¡"F(M®Û©Š�Ò2Ö‰M^<îÔ2ø·,ŒÞ›šMƒ0lË•Ì�éUOMÿç¥ò´îášb#2,íoU%0¡‚Ú§®ŠAE,PGÝÿ~²‡kÁéŠÔL¼ÛE0…6…"ÉßÇ%cýnIÆ“ÚÛAZ°YÞ�Ó¹rüc6Qœ]ж(`Ì]]×�îÿNzîm+©½…³•uM¿^ÐÆ°=¾,ZµYÞ{xòòŠ9Ë¢î)•Íºi#&UͺyÜhبŸzëå5¼Z4E‹~^êùÛöÕâûäS+âäkcs¤OånªñÎnŸµ¨KýólÚyeͳ™\Cm´ØF¾Ï:×»z{µW)6Œî¹GŽ&×iÏ&Y0Þ¥Z�m„hmmÂk®WyÝŽQÒ¹s%uÜ""ÓLEO6Ytä?¼«5J&©LR…",0!MîÛtÉÄe«#2üè¤OUM?[�1µ?'¦$2ðA¿ÙE&Ì9é‚Õ@TqPÿR!ôÄ­ŸÌš¨Ix5%Èó¯uÐÙŠO<VÜñýæ§#"^„’X£;•o›#b§‰Q¦½vúìrH È¦oYÂWæcv\~û,ñ>¼)Ä�Z¯oQœ�YÕ4dà&É/�z®¸3,̬^ÞZÞ{¨CÞÊAãU§îéöß©Ï+è`ö§]ÚÝ95ó¨SXÚ@¤‡!dleNÔÝ3£PRhÑ¡J]§D.ªÈ Ö(wÉe³,YL#2NM*m±Gãxû_–*sW)Ÿå˜I
£íËPã#M§’+ìe#2ûÃW£¬,‰±Èj[þv&E�6(àÓﺂ±ˆÅåE4P²1ÐøPX†ù­±+W¢#cÁR…Q4iÑ—ŠE¡UŒrÐ"x³7¶•ƒÉ•¯…v&Jh tl…Exܲj7�«›cÿÖ¬A`÷´d2…xPPÅGí|?’ƒêöëwVæÒ†§ãü>mzm"c”ÔR|;·+½ÝUº]9JNÄîÅ
�5NwYJH¸JV#)×5X¼ïŽzÞ2•dØ{ÝËŠýRÝ{»‹®1¶(MÊ�5Ä´*¨Z)‹"�Y“‹ÚËa¨4–û4Yð__žò¾ß]÷ýù¦Kó8²"4£�n"U�ñˆïà@Æ#\Ö¶jϽ$Â!F£éD•¬E„FEÊ 6vº˜W=ì¼5�š5ðxÛήN]1Ë_;Å—mHµ¥80Ë¡ãGƒ�ÒŠe¤º«JEvï«YøÕÏG#2ÊrrËÓºì²EFœ#2(SfˆZjÒAS¬çXƒ%¡GïŠ4wh�-´´Õ¯µ)wQ4ëEO£#2ãÆÂت+±'›-b#Év0€3Û#îþ.ü�#^pƒ>ËÞ�8ج&×÷|KT;aÇãýÎ{'ˆa̪ƒŒ¸cí!ÍÖq&ý±KZ<ZÓFºÒ�Š¤¤Ì(Ì�)¿s1û=¡Ô5ƒLOýL߬ÇÒ
¾ð#¼Îì0úª©Ù–e(ªe�{@‰Á¥5¯ÅÜýýøƒåLine truncated
+#BZh91AY&SYCU ÂT>ÿÿÿ´Ðÿÿÿÿÿÿÿÿÿÿÿ5 ‚Ä£ 0�™E€(b|s×¾÷ˆ#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%[yõË™JÕ…¬Ã»ì#&´ûnÚv¾ÝÓkh3cÎ5We©‰#&[r}à³O4Ù+±ºwaÚ5<óë¾ûp9—[uÌ=Û{JQ¶Ý—»×…½¹ëݯ@ËÒlvÎuo;ÁëÝ�ß{»®;jTn[÷lwªÜ2{€K)Ùëç½Þøô·Åö¶ÕïznS‘¾·­Þ÷½÷Ž#%#%#%P#(;ììh
Ó€'ÞÊ#%÷Š:eïo0Ù뽤#&›v=]¨Ãc[4¦€-€§¬ímßJ=:#%tô��»d*Š#(P£#%P‘D©R(îàäQ$#%#()è�E”¡ÞÃׂõƒß|ÏyÖ“±ÚŸkT®Ç¹ïW·›¬Ô´ëŠ•Nlºd•Ûw77ÓÔí¥íÝlú#&uÞ>ûªïîïví•yëog®»Ïqõ®½>ìyï}íÙ¾ÝßuöOm±ÖJg¾ç¼M÷;ëÝ·º»Ùï¾ô{îßEç êÛ¬µ…Ö@¤$!ì^ÁÌÝ#(wg¶w™ïvǽ½ïyc£$¡Û]ÇGaä\ÚbR‘ÛΦ h#(’‚H¢)G»ô:oniÑJ]ë�Q!{·z¤}ÀíïióÝï7olQè#&#%úÒÓµµ®îSï4Y`;ìí�€ßužx
§s{ØÜÝßa�w:·§ß=ñéã§Ï=Ü{³ÐÙŸ{‡¾ŽŽ85ͳl¾u¼÷>{‹«íÝbÇv�ɺscu¹Îòîj{77.7rÝÝ{{­¯oxnGu}}ÊÛÓl4ÕfŸw¾ûï¾Ï­wØeð�<šÜXQO+km«ÜålùêR[^ì«Ý8ùöoO»ÛWwu«jößOZÝÄÇÞÓª_{ºõ³íµÈ{²=ÝãÛ3O¸çK£ÎÌ#%;®o/wœkîîîöó©kp(¥#%¨•Tª*ŠA¬ƒ­;­2#(µ­¶ª.í÷»Ôë±ÓÐ7Y¹›µN‡½µî�ÇFª»“SÛǼԪï^ÛÚ†„Ø÷3®æx#%{�v #%kÞêå¹›¼Nû}Ï”•×w6Ù·3FWagÝçwe¬ï»xîwPØúÒí‚Ÿ{¹ë}™:­3j¹ÑwÛŽ¦ñ{c;úŒçs5Ï
%Z±î²ÃÖ%ÚÌÃ{{ÉæªOD»Îºsho1Ï—žÇÏ·pmvêÛ¬Ú]ܽ«ÅÍ‹ßoîÍëÖî¹ñiïnã¹N7kœç …j[b¢÷p(ݺ2–}áß·; Õ°lªsäܯZµ³qÍëzÞûjsçØ€öz8	æÚSÝÞÆF™£¦ó®>Ï=0«Þ™w�¬îî×¼v/s’êÚ×ݬ�½Þû�Óêµ–©l�ºgÐh[µƒ;±Ž)mNçX7í@!Ý£s¬½½Þ]çßk°ÛÈ=
Éf=½wö#%(r8y5íº^û¬÷¹ÀØ•#(hMëÛ½ݭ¶#%›½Ú¼måvÎîêàc0ÞµÚ¹«\íe»
Ûº¤”.]»­i'YM;¶5œ¹˜êfÞ]í’^7gœ½¾Z¯�{ÛÕñ{çÛofÁ—£à„(ž”ɼû¼BöóvŠ×½·³"v²Î­××»rï·ÒûÖÖÙ¨îï·½½Ÿw=7“Àã_¸i¢#%€ 
#% ÈÐÐ&FƒBi¢m)éª='© Ä#%h6 õ7ª~”š „Ð 
44&I„Ȧ`$õ#&2yMÔ
ê#%#%#&#%#%#%	ˆ	¢24
#%Š~“%?)i“D~¥Qê6Qꧩ§© Ð#%#%Ð#%#%
'ªRD#S ¦OTõG¦�ª{T~¨0€=@d#%2††€#%#%#%#%#%D‘#%hÐ&&@ F™=™#&'•?MM&€4€4#%#%I¨ˆ  #%�4M4š§å6…OÅO£ÍSj~©ú5OÔ‡¨ôÚ§© #%#%4#%#%åÿòOôê­w?׋mN¿‡U¥Ñ &LWÆ«]º$	¶Å¦ÖO}UµÊ«TUVû¶I?Iú�Ý?_ííeý²¹«½Íl¸–“M×·¾4á5�ñ#™8—tÍÜã�8|,çû£ûOøé|@²Á@ÌAÎ"Ð Ö¹¦&ɪck(Gã¨Ji:÷ubᑶôÛ# ]ºøÙUƒ"ÂruN¨‡�Þ°ªpäÅ]¥2ëSMRÝ1mgº„!_·�rý"WA„ƒ–Ó6Êåv«MkY6Õ“R�ˆªH*HȈ#&À#%	Q$P�Ã�”-"©™Iˆ
„T	`"T ƒb#(„"{n›kÍZÚ[jjî‹b±W´Ú«mµðÚÖÖ©™2J35#&3M‘&0H¤ØÚˆ™š„K#%š”£J)¶“a‰š$ÐJ2Zš�± ÂÚ3IdÓH�Ñ•¤MJPH
´jXИ²¦Ñ¢)6KFÔE	K-)¦´@Ä,´†ÍÁ”ff1©#Q¨ÚŒ“A¥6C¡-1¤ L4ie¤c)KF¦›"[JÚËmhfÄ–32fBhŠ²m¥¶šmjJ6Rjkc-M¶fÌ´™&b(6#f´ÄÑd¢‚™l‰„H¨³HÚ)0*$°lRTÂ3Jˆ‚¥16!PH‰,@´2#$�©!Xˆ!¶f†DLS	Ì‚–VX31"’ÈÄRɬ›5…H±–R4ZSLbJLŠ2‰4dÐÑ“#(’�"QI²#(lh’,E2–�E3ØÖHfÄIŠhflµ%€Iea°"II±¨"MIE$IQ	"Q ŠEƒ
0Èc$¦„Ê)%&¢ÌØѬ&É©"IˆD%¥6@�‰"Él@I‹,Ê)2J&ÌÈ؉›")FlŒÁ2©¦$„YJ#&š‹
dƒM461©Y,‘±D©	‘M$ÄR%M2�’jIeA�F“4�¢€‚)¦Š&µÀbe”K#!²RdMÓ)£Fa3iB“Á™H$$Rf0"HÆ‚%’a1A$Ê™•f(Û)lJ"fCR)ˆR#6,¡YM$QF¤’M’1±Œ›4�LÑbÄe$)33²2³i„¬D`ˆ¢JM52i™!Œ¢)4EMŠ,Ô©JJh¤6FLdȦÒY#£)!HŠ,U’bI4¦Ñ¤Ôi(ib1 ™Q¦™h4lf²I”b,i!fD›%)ŠQ…šd%¬Ù±µ’Àd�ÒY1�ÕAh$MaH“!�ŒÄƒÊ#&IcQe‘(š0Z”Ò�E©†„™”˜¦dÙ”Á"–hÓ,!¨(M&R"CDÛjVÖŒ(MLÑ”ÈÄÒŠI™ Ô¥°)f‹1I¤e	e•6h‹S-¶Q‰Sb!J#4Œ#HJm~ók¢¦©aˆÍ¢ŒlVÆÖ*6L¦i¨¥I4hiiQ°�’j6²##&CIŒ£$YL©"Ùf&f™l–Ñ™)lmE!hɦ,Mf,hXÔ‚”´Ó&L©5ÆÊ´�6PŠÙ2ȪU+0¦ÍŒÆf­‹DkdÓ+"TË)µ’¬¶R”Ó#[#@d¤mEŠk,Ii”µ¨*£j5hÉPQU’²QµFÑQR%Ñ4DÉbÄZ1bµhÚÆÀZL˜X* 4ÀJ)±£L“JÓX‹cFÓ±‹d‹i Úªšµ–*	”ÍKY4IR1!M¤Qd�­J³lb”ÚU,¥L²ÃjšDF¶•K"e5MM¶„”Êk,hl²[+,…lÓ	¨ÒD…Š"Å�4`b$H†ÐhLb¶�P”JŠ-EdšhÙ2i(² ›,R)²�4lˆ¬²	ÆS1(RQ³LÐ1‹L�ˆÍ¦ÒbˆÆØÙ#(a¦@Ć1£%bHÌÔ#!4LÔQ¢JdR�–P5BTÀhÒcL%*e’QhÈ@Q™µJ6e$”d#&#(CSXˆ¦I¢1©6KÐY"ËQ’ÑCAb�ÌI£E™M™IK)Y†JÆY¢ÉƤZ�Q³Z3DT4T¦“a¦*X¬Ê-F�#!&@˜È4ÄØ’¤©2†6SLl’™l”¦¢°m˜lÒY63I£FÌD¡¥-3ZÈ�4*fˆKHˆA³f†4mšFÅ k4›%14”��Z-ÂTj5b±‹Ff°Òa¤“B…“#c¢Ø£`KAY¦Éd3(ƒb£!²RÊJ™m@F±ª5Dš(L²¨ ±Aš“Tl0Ä,#¥(jÆÐiM2ÈQF‰"©’Z �Qb,FR¶È©EQ¬i0DY4E3(Z”R’‰*lJ"fÚ¢5`ÑS*,•FÅšQl™+Ö“•”Û"[&ÆÐÑ6ILƒ)QaA±±²Q²h’#¶H�ÔRL‚#&Y“‚SflLE5�QS+&³#HSI5EM6¤¬[)%�“�¤Á’V¤F‹K-C-D–‹TUŒ¥I­‘*�±©(±H¦„ȦFdf4ÔˆÄjfÉ3Z#b©,[F¤©eY5¢fÔ-�DlldŠ¨¦U4«Fѱ¶Æ-©3J!,ÖV%¨ÅbÍ*6¢6•*)MiFb¡HFÊ�’£I¶5‹2¤‹RVÅ“l¤ËQ¢±#&"ÑI�FÚÛ-«‰•#(‰‰(ŒT0’Æ�Ši&ÔÃ%XÛØ´Í[F5¬´•42ÖÊY6ÔÔÛ!mFš±4eDhÈÚIEÃY©5&fË*"�#&D˜’L¤™‘ˆÈE²[R,b¬dÿ— ÿ’?ðˆvCýaþ?ÝR_*tÓ#þXt¸ÿ²Ž9hË’�÷‚áÊ�- �MŸ	Ï;oô|ìoNoèC¯Kze5#q’ö/‹U6»ø#mz 3¿ûÓŒJ04P`¸tq�Ká‚’AÉÙ0U#wÃcDãû•HÿǬ3ÿ¿õZÑÿÂI(R×+ˆRÒXHÄ_G=šÅ·8=EZM‡¼íõb8ßwpu-,žë£’fêe»¨ÕrpáòC65%"†É8¡·'%ŒGøëvÍš“…Z�FFcHí.Ùf2cD«Dvrhë²w�Ò×.ôô«Ô¼k–s¹eþƒ¯>ÇYœÕÈ$Øu¨S	«Åš&U;1¥Ì R¥!H‘a"F(MîÛ©Š•Ò2Ö‰M^<ëµ¾-Ë#+ÓsI Ñ`ÄÅâÃ	Š k{—¯ýË,?ÐÀ7p‡Ó(°R;´)L7acƸ¾ÿW)-ˆÆ)?oú=ì¯Âú˜­Díz6"Ša…6…"ÉßË%cü\È›3såÌm46'š©3Æ�Û¹rýQ‡jXœ�ж(D0šV+Ä÷«=››No¹Ê.U!Ù6ý»ÃÀÛâÄÕªÈņ{w�×”cœº.â™\Û¥�ÔUͺyÜhبŸŽëå5¼Z4E‹}ÝÕô¯Ò¯æ[‘L¯‹‘m�ÎCú-Ö¯¹¸|~ž¤BXxxf{Úy2ÄFm˜ôÓ²!�·ÎêŽ\º  Œ‚ƨ¤`Úï9ÜxIoRŒ¬#[aDMuÊï;±¹GJåÌ”e×t’9Ì…ö5·—�µ�w—Áu5JŠAТ¤E†)¡�Ûc.™8ŒµbÁ_U£è†Ÿ±Æ˜ÚŸ“Óx ‰_ô¨¤Ù‡=0Z¬@Gö!€dž%lþ„Õ€¸IK��õöbÐ1Ñøha»$ïè(BI‰
ŠÊ‹|Ù{+âdu²ïæñÅËG³^ýzÞÜC³Uá�Û^?¦Ë<ÏÃ#(q«ƒ-ÑÄe''Vv¦ŒœÙ%ó¯U×e™•‹ÛÏ[Â}|H<j¢”øtú_£žWÐÁíNÍÚÝ95õT)",m S!ÈY©Ú›¦tj#(M4+É1e)Õ–Ód|(*ô¡ã¡e³,YL#(N�*}±ÆyÞ>�Ë:«”‹×Z6LT	>¼]Á¤¤Rm<‘_ƒ(Wá#&^�adMŽCRßó°ôõÛÓçLžëÉŠ_>ºü½tdc¡ð ±#&ó[bV¯DFÆ	‚¥#(¢hÓ£/8‹B«rÐ"cÊ¥^ÚV6V¾Õ0ºR…A@Pe$FËd#(d‡ýo²¬A`÷´d2…xPPÅcôðþ+¹¢) ”È ¬Uç·ö>mzm"c”ÔR|;·+½Ú€J†’R)Ýt‰¢rºÊREÂà”\×5±yßnõêò e*ÉP÷»–5ûÒÝ{»o\clP›éëßáëx§¿wG\ÆÅ£dÛè}öñ�A¤·åtÐ'Ã=.Æ^O~ù¦KæȲ"4£�~$–�ßPåÌ Â#™­lÕŸrI„C>×gÙÖÝ”25“b¾¾ê¾/��I\÷²ðÑ$ZA`°Õ¶K ¤i(bÒC‹i¶¤ZÓ¡—CÕGƒ�ÒŠe¤º«JEvï«YøÕ©á¥.þ”äå—§u–XEFœ#((SfˆZjÒAS¬¾wPJ»*”Ó#(dÛKMZûÒ—ucg¤"üØNýèV›lV'Tžlµˆ�$#&.Ž”Tä…O7ØÇ«ƒ¦ìãˆúÇ0m‹Ña6¹wLine truncated
 #<==
-#-----BEGIN PGP SIGNATURE-----\n\niQIcBAABCgAGBQJaias4AAoJEEm0xnwFJ3qqfmcP/j4ITHGXd3U8tRn4hjvpLLkT\nfTMd9x9hBEwwRqU0EYoAp2+yIoUKvb5JERF0YjGUWoiZqxEmGGp5BFSOJOrYhq0V\nsZIE01wrQQTYMn1jfoXhjywyLVdyMpl9hgb2Z7DnF9GgzUsd5bPWmoNaCMkhZjuD\nSaR13Ff0hAOVIt/fNoJiXYJ2ICDRG5LGKFlkxy0ykXOkrKDmdah4DV6MGVB/tS3n\niBhxgqMc9ILSFQoEQmFAXTid8Ej0OBj+csAk8nvbCEiV+k74BozpQ+QVfR+agX+K\nnf/oMed8F1jKa9uydbvcEn4SXXEBqKztiKvuCGmZIO3xKd+46+5Oh51wKxZYNsyk\nlYBAA/fH8fOZqMzTCRGZM3q6EnKf+zwGyf4lFOHuVzeXHlfcZA62V1Tcr9aQfsq0\n2saI9S9JsxEpFvAa4S+x7oQ+VJ0WM5XLb04KKFgAMjK/kW2Nw6rYQ0eNCdBX6NCc\n6LWnmmrB/TauSNsJSYIfICoKuv+hebjbSIQa5n1/zQeWYt8DKZYS9Lkwl34vMMdx\nDzq/l7QL+I5Z5jDSVkzRS31/K6T6RWiYFzHgabwD/DNBC8cfG4RwTZIEO3C8uLFy\nDo0MG8w5NFkMk7t0KQtBPe+7BK6Nv6Xo5mLTJ+01INvmgHavhgH4bSyg0kD8MbGS\nY4cOEMKnUkHXCpvXsOLz\n=9X3b\n-----END PGP SIGNATURE-----\n
+#-----BEGIN PGP SIGNATURE-----\n\niQIzBAABCgAdFiEEivIt5aBoIuNHTzxwSbTGfAUneqoFAlwfbtMACgkQSbTGfAUn\neqqeSg/9E/RgAhaR7IretWLnTPFE7FvtcwQ3XjAZxyom09Tpu/uWPY9EwmHd2e5c\nduXjen4E1XtJq3FBRSGom41XSKVbpsLxxK3nGdYkYt7nVIR7RcmuYRCu+P3rTyBg\n/2cALYfEDSsGFxkoV0GdSlKbxjKzyMahG07b1fC0cewpFKFdEZJW4iDhekFaIl76\nNGz0uHKF3hfmbB+vUbvwVQZjj2vVAXRZybFqcKNX6lhQZ1tdsgt5PKorPWKdzZzH\nkGsw32M/deiRkq9dBNtJOLhjTMfulZwtMvTNsN6jDWNL9ltcHjAxUJh4TsDuOxH0\nyTxzBSqNa3KmNNURCdET+bdKuq33NceEZEwKf+El4rzfVbEPhvUBq+vObNVvkwWB\nHMTEiJ59zb0qjNKtVS/uFU77OUFLgi65DqLfWwD7KFrcY5tJMvbdSor6YJeVlyW4\nqWWccfl+nvssUL9SlK9dQP0QN6oRa3AEaoEHyPklT1nc7n/Rf0oBg9qx/1tcsEC9\n8GuEV9jWw/SBPtsFq7Pv5gYYC5pt5b1ZzKF+RpbWYTHXiuugQ5/1fV0lVsLQn5+3\nOYkqiEib5ynLW7J73Tj/dfNR6fW3LFf/Rhbcjyj2guSITbtf950y+cF95qEwvmCw\ndS2DOqX2CAU6OnOwMRqsFSEVIZhYySYCdVfRet0hawlRcImLMYw=\n=AByx\n-----END PGP SIGNATURE-----\n

wscript

@@ -14,7 +14,7 @@ def options(opt):
              tooldir=['.waf-tools'])
 
     opt.add_option('--with-tests', action='store_true', default=False,
-                   dest='with_tests', help='''Build unit tests''')
+                   help='Build unit tests')
 
 def configure(conf):
     conf.load(['compiler_c', 'compiler_cxx', 'gnu_dirs',
@@ -48,30 +48,27 @@ def configure(conf):
     conf.write_config_header('config.hpp')
 
 def build(bld):
-    bld.shlib(
-        target='ChronoSync',
-        vnum = VERSION,
-        cnum = VERSION,
-        source =  bld.path.ant_glob(['src/**/*.cpp', 'src/**/*.proto']),
-        use = 'BOOST NDN_CXX',
-        includes = ['src', '.'],
-        export_includes=['src', '.'])
+    bld.shlib(target='ChronoSync',
+              vnum=VERSION,
+              cnum=VERSION,
+              source=bld.path.ant_glob('src/**/*.cpp'),
+              use='NDN_CXX BOOST',
+              includes='src .',
+              export_includes='src .')
 
-    # Unit tests
-    if bld.env["CHRONOSYNC_HAVE_TESTS"]:
+    if bld.env['CHRONOSYNC_HAVE_TESTS']:
         bld.recurse('tests')
 
     bld.install_files(
         dest = '%s/ChronoSync' % bld.env['INCLUDEDIR'],
         files = bld.path.ant_glob(['src/*.hpp', 'common.hpp']),
-        cwd = bld.path.find_dir("src"),
-        relative_trick = False,
-        )
+        cwd = bld.path.find_dir('src'),
+        relative_trick = False)
 
     bld.install_files(
         dest = '%s/ChronoSync' % bld.env['INCLUDEDIR'],
         files = bld.path.get_bld().ant_glob(['src/*.hpp', 'common.hpp', 'config.hpp']),
-        cwd = bld.path.get_bld().find_dir("src"),
+        cwd = bld.path.get_bld().find_dir('src'),
         relative_trick = False)
 
     bld(features = 'subst',