BodgeMaster
/
NORM-mirror
mirror of https://github.com/USNavalResearchLaboratory/norm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

normCast modified so only basename is conveyed for enqueued file items. Also fix to wscript for Python 3 compatibility

pull/9/head
bebopagogo 2020-01-02 22:15:31 -05:00
parent e0f9b804bd
commit ada15125a1
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/normCast.cpp
View File

@ -331,8 +331,16 @@ bool NormCaster::StageNextTxFile()
} }
else else
{ {
tx_pending_prefix_len = 0; // Adjust the prefix len so only the file basename is conveyed.
// (We use a reverse ProtoTokenator tokenization to get the
// file basename string).
ProtoTokenator tk(tx_pending_path, PROTO_PATH_DELIMITER, true, 1, true);
const char* basename = tk.GetNextItem();
ASSERT(NULL != basename);
unsigned namelen = strlen(basename);
tx_pending_prefix_len = strlen(tx_pending_path) - namelen;
} }
TRACE("next file staged: %s\n", tx_pending_path + tx_pending_prefix_len);
return true; return true;
} }
else else

2
wscript
View File

@ -31,7 +31,7 @@ for line in vfile.readlines():
if "#define" == line[0] and "VERSION" == line[1]: if "#define" == line[0] and "VERSION" == line[1]:
VERSION = line[2].strip('"') VERSION = line[2].strip('"')
if VERSION is None: if VERSION is None:
print "Warning: NORM VERSION not found!?" print ("Warning: NORM VERSION not found!?")
# So you don't need to do ./waf configure if you are just using the defaults # So you don't need to do ./waf configure if you are just using the defaults
waflib.Configure.autoconfig = True waflib.Configure.autoconfig = True