View | Details | Raw Unified | Return to bug 1305
Collapse All | Expand All

(-)a/wscript (-8 / +18 lines)
 Lines 361-366    Link Here 
361
                conf.report_optional_feature("static", "Static build", False,
361
                conf.report_optional_feature("static", "Static build", False,
362
                                             "Link flag -Wl,--whole-archive,-Bstatic does not work")
362
                                             "Link flag -Wl,--whole-archive,-Bstatic does not work")
363
363
364
    # Set this so that the lists won't be printed at the end of this
365
    # configure command.
366
    conf.env['PRINT_BUILT_MODULES_AT_END'] = False
367
364
    conf.env['MODULES_NOT_BUILT'] = []
368
    conf.env['MODULES_NOT_BUILT'] = []
365
369
366
    conf.sub_config('src')
370
    conf.sub_config('src')
 Lines 782-787    Link Here 
782
    # and module test libraries have been set.
786
    # and module test libraries have been set.
783
    bld.add_subdirs('utils')
787
    bld.add_subdirs('utils')
784
788
789
    # Set this so that the lists will be printed at the end of this
790
    # build command.
791
    bld.env['PRINT_BUILT_MODULES_AT_END'] = True
792
785
    if Options.options.run:
793
    if Options.options.run:
786
        # Check that the requested program name is valid
794
        # Check that the requested program name is valid
787
        program_name, dummy_program_argv = wutils.get_run_program(Options.options.run, wutils.get_command_template(env))
795
        program_name, dummy_program_argv = wutils.get_run_program(Options.options.run, wutils.get_command_template(env))
 Lines 806-819    Link Here 
806
        return
814
        return
807
    env = bld.env
815
    env = bld.env
808
816
809
    # Don't print the lists if a program is being run, a Python
817
    # Only print the lists if a build was done.
810
    # program is being run, this a clean, or this is a distribution
818
    if (env['PRINT_BUILT_MODULES_AT_END']):
811
    # clean.
812
    if ((not Options.options.run)
813
        and (not Options.options.pyrun) 
814
        and ('clean' not in Options.commands)
815
        and ('distclean' not in Options.commands)
816
        and ('shell' not in Options.commands)):
817
819
818
        # Print the list of built modules.
820
        # Print the list of built modules.
819
        print
821
        print
 Lines 828-833    Link Here 
828
            print_module_names(env['MODULES_NOT_BUILT'])
830
            print_module_names(env['MODULES_NOT_BUILT'])
829
            print
831
            print
830
832
833
        # Set this so that the lists won't be printed until the next
834
        # build is done.
835
        bld.env['PRINT_BUILT_MODULES_AT_END'] = False
836
831
    # Write the build status file.
837
    # Write the build status file.
832
    build_status_file = os.path.join(bld.out_dir, 'build-status.py')
838
    build_status_file = os.path.join(bld.out_dir, 'build-status.py')
833
    out = open(build_status_file, 'w')
839
    out = open(build_status_file, 'w')
 Lines 973-978    Link Here 
973
	bld.cmd = "build"
979
	bld.cmd = "build"
974
	bld.execute()
980
	bld.execute()
975
981
982
        # Set this so that the lists won't be printed when the user
983
        # exits the shell.
984
        bld.env['PRINT_BUILT_MODULES_AT_END'] = False
985
976
        if sys.platform == 'win32':
986
        if sys.platform == 'win32':
977
            shell = os.environ.get("COMSPEC", "cmd.exe")
987
            shell = os.environ.get("COMSPEC", "cmd.exe")
978
        else:
988
        else:

Return to bug 1305