Changeset 470

Show
Ignore:
Timestamp:
01/05/07 16:28:02 (2 years ago)
Author:
allenb
Message:

- Pull in external scons-addons if it is in the user's python path.
- Add comment about stop traversal

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/SConstruct

    r460 r470  
    22# 
    33# SCons build script for OpenSG 
    4  
     4import os, string, sys, re, glob, copy, types, traceback, pprint, tempfile, shutil 
     5pj = os.path.join 
    56 
    67# If we have wingide, try loading the debugging extenstions 
    …… 
    1112   pass 
    1213 
    13 import os, string, sys, re, glob, copy, types, traceback, pprint, tempfile, shutil 
    14 pj = os.path.join 
     14# Extend paths for scons-addons and scons-build if needed 
     15# - this allows a development version of scons-addons to be 
     16#   in the standard python path and used instead. 
     17try: 
     18   import SConsAddons.Util 
     19   print "Using SConsAddons from: ", os.path.dirname(SConsAddons.Util.__file__) 
     20except: 
     21   sys.path.insert(0,pj('Tools','scons-addons','src')) 
     22   print "Using SConsAddons from: Tools/scons-addons/src" 
     23 
     24sys.path.insert(0,pj('Tools','scons-build')) 
    1525 
    1626print "-------------------------------------------------" 
    …… 
    1828print "            - It needs the svn version of scons-addons" 
    1929print "WARNING:" 
    20  
    21 sys.path.insert(0,pj('Tools','scons-addons','src')) 
    22 sys.path.insert(0,pj('Tools','scons-build')) 
    2330 
    2431import SCons.Environment 
    …… 
    242249        Output variables: 
    243250        - library: Name of the library to which the current directory belongs. 
    244         - stop_traversal: If True, subdirectories are not visited. 
     251        - stop_traversal: If True, ignore this directory and everything below it. 
    245252     
    246253        - osg_dep_libs: List of OpenSG library names, this library depends upon (for linking).