EmaMaker
/
tc-homework2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make WAF scripts modify PATH in environment to allow child processes to find the ns-3 DLLs, instead of using --rpath, which doesn't work on win32. This way at least waf check is able to run the unit tests now.

Gustavo J. A. M. Carneiro 2007-05-17 17:34:19 +01:00
parent b3b7a98b8e
commit 78f81de607
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wscript
View File

@ -1,5 +1,7 @@
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
import os
import sys
import Params import Params
all_modules = [ all_modules = [
@ -37,7 +39,10 @@ def build(bld):
if not env['DISABLE_RPATH']: if not env['DISABLE_RPATH']:
for module in all_modules: for module in all_modules:
node = bld.m_curdirnode.find_dir(module) node = bld.m_curdirnode.find_dir(module)
env.append_value('RPATH', '-Wl,--rpath=%s' % (node.abspath(env),)) if sys.platform == 'win32':
os.environ["PATH"] = ';'.join([os.environ["PATH"], node.abspath(env)])
else:
env.append_value('RPATH', '-Wl,--rpath=%s' % (node.abspath(env),))
bld.add_subdirs(all_modules) bld.add_subdirs(all_modules)