Changeset 560 for trunk/SConstruct
- Timestamp:
- 02/26/07 14:29:12 (2 years ago)
- Files:
-
- trunk (modified) (1 prop)
- trunk/SConstruct (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk
- Property svn:ignore changed from
config.log
.sconf_temp_linux
build.linux
.sconsign.*
sconf.log_*
.sconf_temp*
option.cache.*
to
.sconf_temp*
.sconsign.*
build.*
config.log
option.cache.*
sconf.log_*
*.pyc
- Property svn:ignore changed from
trunk/SConstruct
r555 r560 40 40 from LibraryUtils import * 41 41 from sets import Set 42 from socket import gethostname 42 43 43 44 # If we have pysvn, load it … … 457 458 modifiedStr = "" 458 459 for file in glob.glob("Doc/*"): 459 print file460 460 fileRev, fileMod = self._getSVNInfo(file) 461 461 … … 500 500 SourceSignatures('MD5') 501 501 #SourceSignatures('timestamp') 502 #SConsignFile('.sconsign.'+GetPlatform())503 502 opensg_version_string = file("VERSION").readline().strip() 504 503 … … 516 515 # XXX: Temp hack to get msvs version setting 517 516 if ARGUMENTS.has_key("MSVS_VERSION"): 518 common_env = Environment(MSVS_VERSION=ARGUMENTS["MSVS_VERSION"]) 517 common_env = Environment(MSVS_VERSION=ARGUMENTS["MSVS_VERSION"], 518 tools = ['default', 'doxygen'], 519 toolpath = '.') 519 520 else: 520 common_env = Environment( )521 common_env = Environment(tools = ['default', 'doxygen'], toolpath = '.') 521 522 else: 522 523 if ARGUMENTS.has_key("icc"): … … 527 528 528 529 common_env = Environment(ENV = os.environ, 529 tools=['gnulink', 'intelicc', 'intelicpc'], 530 cxxlib_icc=use_cxxlib_icc) 530 tools=['gnulink', 'intelicc', 'intelicpc', 'doxygen'], 531 cxxlib_icc=use_cxxlib_icc, 532 toolpath = '.') 531 533 else: 532 common_env = Environment(ENV = os.environ) 534 common_env = Environment(ENV = os.environ, 535 toolpath = '.', 536 tools = ['default', 'doxygen']) 533 537 534 538 SConsignFile('.sconsign.'+GetPlatform()+common_env.subst('$CXX')) … … 703 707 "enable_scanparse_regen", "Enable regenerating the scanner/parser files using flex and bison", False); 704 708 709 feature_options["docs_mode"] = sca_opts.EnumOption( 710 "docs_mode", "Select the mode for documentation generation", 711 "NONE", ["NONE", "STANDALONE", "TRAC"]) 712 705 713 if "win32" == platform: 706 714 feature_options["enable_win_localstorage"] = sca_opts.BoolOption( … … 846 854 847 855 # Add lexer to the build 848 addScanParseSkel(common_env) 849 856 addScanParseSkel(common_env) 857 850 858 # -- Common builder settings 851 859 variant_helper.readOptions(common_env) … … 932 940 # Revision tracking 933 941 # For each library, find its Def.cpp file(s) and set the revision to the highest one found 934 # in the source tree. Recommended before building any hting that's distributed (dailybuild, release etc.)942 # in the source tree. Recommended before building anything that's distributed (dailybuild, release etc.) 935 943 # This could go into scons-addons at some point... 936 944 if common_env["enable_revision_tags"]: 937 945 tagWriter = RevisionTagWriter(lib_map) 938 946 tagWriter.run() 947 948 # Documentation 949 if "NONE" != common_env["docs_mode"]: 950 # Todo: 951 # - put output into build dir 952 # - handle different doc levels 953 # - handle different output types 954 955 # Get all used source/header files 956 dox_inp = "" 957 for (name,lib) in lib_map.iteritems(): 958 for i in lib.source_files: 959 dox_inp += "../Source/" + i + " " 960 for i in lib.header_files: 961 dox_inp += "../Source/" + i + " " 962 963 # Need to use my private doxygen version until the parameter macro patch is in 964 if "dream.lite3d.com" == gethostname(): 965 common_env["DOXYGEN"] = "/home/reiners/software/DocumentationTools/doxygen-cvs/doxygen-070225/bin//doxygen" 966 common_env["DOX_INPUT"] = dox_inp 967 common_env["DOX_VERSION"] = opensg_version_string 968 969 if "STANDALONE" == common_env["docs_mode"]: 970 common_env.Doxygen("Doc/standalone.doxy") 971 elif "TRAC" == common_env["docs_mode"]: 972 common_env.Doxygen("Doc/trac.doxy") 973 else: 974 raise "Unknown docs_mode %s" % common_env["docs_mode"] 939 975 940 976 # ---- FOR EACH VARIANT ----- # … … 946 982 947 983 # We tread the first variant type special (auto link from libs here) 948 default_combo_type = variant_helper.variants["type"][0][0] 949 984 try: 985 default_combo_type = variant_helper.variants["type"][0][0] 986 except: 987 default_combo_type = None 988 950 989 for combo in variant_helper.iterate(locals(), base_bldr, common_env): 951 990 #baseEnv = env_bldr.applyToEnvironment(common_env.Copy(), variant=combo,options=opts) … … 971 1010 for d in sub_dirs: 972 1011 SConscript(pj(d, 'SConscript'), build_dir = pj(full_build_dir, d), duplicate = 0) 973 1012 974 1013 # Build -config file based on first set installed 975 1014 if 0 == variant_pass:
