build: various cleanups

This commit also updates waf to version 2.0.14

Change-Id: I9334f10451589e8141583f85e6cefcf199f68490
This commit is contained in:
Davide Pesavento committed 2019-01-19 22:02:08 -05:00
1 parent cb903eac38
commit 3347eaad8e
6 files changed
+14 -40

No files matched your search

-1
View File
@@ -29,4 +29,3 @@ def build(bld):
bld(target='chunks-objects',
use='ndncatchunks-objects ndnputchunks-objects')
+2 -29
View File
@@ -1,36 +1,9 @@
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
top = '../..'
ATTRIBUTE_CHECK='''
#include <stdlib.h>
static void foo(void) __attribute__ ((noreturn));
static void
foo(void)
{
exit(1);
}
int
main(int argc, char** argv)
{
foo();
}
'''
def configure(conf):
conf.check(header_name='inttypes.h', mandatory=False)
conf.check(header_name='stdint.h', mandatory=False)
conf.check(header_name='sys/bitypes.h', mandatory=False)
conf.check(fragment=ATTRIBUTE_CHECK, msg='Checking for __attribute__', mandatory=False)
conf.check(header_name=['sys/types.h', 'sys/time.h', 'time.h'],
define='TIME_WITH_SYS_TIME', mandatory=False)
conf.check_cfg(path='pcap-config',
package='libpcap', args=['--libs', '--cflags'],
uselib_store='PCAP', mandatory=True)
conf.check_cfg(package='libpcap', uselib_store='PCAP',
path='pcap-config', args='--libs --cflags')
def build(bld):
bld.objects(
+3 -1
View File
@@ -10,6 +10,7 @@ def build(bld):
bld.program(
target='../../bin/ndnpeek',
name='ndnpeek',
source='ndnpeek/main.cpp',
use='ndnpeek-objects')
@@ -20,10 +21,11 @@ def build(bld):
bld.program(
target='../../bin/ndnpoke',
name='ndnpoke',
source='ndnpoke/main.cpp',
use='ndnpoke-objects')
## (for unit tests)
bld(target='peek-objects',
use=['ndnpeek-objects', 'ndnpoke-objects'])
use='ndnpeek-objects ndnpoke-objects')
+2 -2
View File
@@ -4,7 +4,7 @@ top = '..'
from waflib import Options
def options(opt):
for subdir in opt.path.ant_glob(['*'], dir=True, src=False):
for subdir in opt.path.ant_glob('*', dir=True, src=False):
tool = subdir.path_from(opt.path)
opt.add_option('--enable-%s' % tool,
help='Build tool %s, enabled by default' % tool,
@@ -29,7 +29,7 @@ def configure(conf):
is_disabled = getattr(Options.options, 'disable_%s' % tool)
if is_enabled and is_disabled:
conf.fatal("--enable-%s and --disable-%s cannot be both specified" % (tool, tool))
conf.fatal('--enable-%s and --disable-%s cannot be both specified' % (tool, tool))
if is_enabled:
enabled_tools.add(tool)
Vendored
+6 -6
View File
@@ -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€ #%@h44˜†š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¨¥I4hii Q°�’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›%1 4”��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@P e$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
+1 -1
View File
@@ -54,7 +54,7 @@ def build(bld):
VERSION_BUILD=VERSION)
bld.objects(target='core-objects',
source=bld.path.ant_glob(['core/*.cpp']) + ['core/version.cpp'],
source=bld.path.ant_glob('core/*.cpp') + ['core/version.cpp'],
use='NDN_CXX BOOST',
includes='.',
export_includes='.')