1.1 --- a/wscript	Wed Oct 28 18:27:43 2009 +0100
     1.2 +++ b/wscript	Thu Oct 29 11:12:12 2009 +0000
     1.3 @@ -194,8 +194,13 @@
     1.4                     help=('Compile NS-3 statically: works only on linux, without python'),
     1.5                     dest='enable_static', action='store_true',
     1.6                     default=False)
     1.7 +    opt.add_option('--doxygen-no-build',
     1.8 +                   help=('Run doxygen to generate html documentation from source comments, '
     1.9 +                         'but do not wait for ns-3 to finish the full build.'),
    1.10 +                   action="store_true", default=False,
    1.11 +                   dest='doxygen_no_build')
    1.12  
    1.13 -    # options provided in a script in a subdirectory named "src"
    1.14 +    # options provided in subdirectories
    1.15      opt.sub_options('src')
    1.16      opt.sub_options('bindings/python')
    1.17      opt.sub_options('src/internet-stack')
    1.18 @@ -596,6 +601,11 @@
    1.19              raise Utils.WafError("Cannot run regression tests: building the ns-3 examples is not enabled"
    1.20                                   " (regression tests are based on examples)")
    1.21  
    1.22 +
    1.23 +    if Options.options.doxygen_no_build:
    1.24 +        _doxygen(bld)
    1.25 +        raise SystemExit(0)
    1.26 +
    1.27  def shutdown(ctx):
    1.28      bld = wutils.bld
    1.29      if wutils.bld is None:
    1.30 @@ -712,9 +722,7 @@
    1.31      env = wutils.bld.env
    1.32      wutils.run_argv([shell], env, {'NS3_MODULE_PATH': os.pathsep.join(env['NS3_MODULE_PATH'])})
    1.33  
    1.34 -def doxygen(bld):
    1.35 -    """do a full build, generate the introspected doxygen and then the doxygen"""
    1.36 -    Scripting.build(bld)
    1.37 +def _doxygen(bld):
    1.38      env = wutils.bld.env
    1.39      proc_env = wutils.get_proc_env()
    1.40  
    1.41 @@ -736,6 +744,11 @@
    1.42      if subprocess.Popen(['doxygen', doxygen_config]).wait():
    1.43          raise SystemExit(1)
    1.44  
    1.45 +def doxygen(bld):
    1.46 +    """do a full build, generate the introspected doxygen and then the doxygen"""
    1.47 +    Scripting.build(bld)
    1.48 +    _doxygen(bld)
    1.49 +
    1.50  def lcov_report():
    1.51      env = Build.bld.env
    1.52      variant_name = env['NS3_ACTIVE_VARIANT']