--- a/build.py Fri Nov 12 12:48:07 2010 -0800
+++ b/build.py Fri Nov 12 13:45:06 2010 -0800
@@ -74,22 +74,19 @@
elif sys.platform in ['darwin', 'win32']:
print "# Skip NSC (platform not supported)"
else:
- nsc_config_elems = config.getElementsByTagName("nsc")
- if nsc_config_elems:
- nsc_config, = nsc_config_elems
- nsc_dir = nsc_config.getAttribute("dir")
- print "# Build NSC"
- os.chdir(nsc_dir)
- print "Entering directory `%s'" % nsc_dir
+ # XXX This is a temporary workaround until NSC is built
+ # properly using JHBuild and a simple makefile that calls
+ # scons.py.
+ nsc_dir = "nsc"
+ os.chdir(nsc_dir)
+ try:
try:
- try:
- build_nsc()
- except CommandError:
- print "# Build NSC: failure (ignoring NSC)"
- config.documentElement.removeChild(nsc_config)
- finally:
- os.chdir(cwd)
- print "Leaving directory `%s'" % nsc_dir
+ build_nsc()
+ except CommandError:
+ print "# Build NSC: failure (ignoring NSC)"
+ finally:
+ os.chdir(cwd)
+ print "Leaving directory `%s'" % nsc_dir
print "# Build NS-3"