diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/__init__.py | 8 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/ar.py | 16 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/ar.xml | 17 |
4 files changed, 33 insertions, 11 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 9b0154c..3c3ab20 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -722,6 +722,9 @@ RELEASE 0.97 - XXX - Add support for a $INSTALLSTR variable. + - Add support for $RANLIBCOM and $RANLIBCOMSTR variables (which fixes + a bug when setting $ARCOMSTR). + From Craig Scott: - Have the Fortran module emitter look for Fortan modules to be created diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index 528ee4d..77da0c7 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -169,8 +169,12 @@ def createStaticLibBuilder(env): try: static_lib = env['BUILDERS']['StaticLibrary'] except KeyError: - ar_action = SCons.Action.Action("$ARCOM", "$ARCOMSTR") - static_lib = SCons.Builder.Builder(action = ar_action, + action_list = [ SCons.Action.Action("$ARCOM", "$ARCOMSTR") ] + if env.Detect('ranlib'): + ranlib_action = SCons.Action.Action("$RANLIBCOM", "$RANLIBCOMSTR") + action_list.append(ranlib_action) + + static_lib = SCons.Builder.Builder(action = action_list, emitter = '$LIBEMITTER', prefix = '$LIBPREFIX', suffix = '$LIBSUFFIX', diff --git a/src/engine/SCons/Tool/ar.py b/src/engine/SCons/Tool/ar.py index 92cab59..913da5f 100644 --- a/src/engine/SCons/Tool/ar.py +++ b/src/engine/SCons/Tool/ar.py @@ -42,18 +42,16 @@ def generate(env): """Add Builders and construction variables for ar to an Environment.""" SCons.Tool.createStaticLibBuilder(env) - arcom = '$AR $ARFLAGS $TARGET $SOURCES' - ranlib = 'ranlib' - if env.Detect(ranlib): - arcom = arcom + '\n$RANLIB $RANLIBFLAGS $TARGET' - env['AR'] = 'ar' - env['ARFLAGS'] = SCons.Util.CLVar('r') - env['RANLIB'] = ranlib - env['RANLIBFLAGS'] = SCons.Util.CLVar('') - env['ARCOM'] = arcom + env['ARFLAGS'] = SCons.Util.CLVar('rc') + env['ARCOM'] = '$AR $ARFLAGS $TARGET $SOURCES' env['LIBPREFIX'] = 'lib' env['LIBSUFFIX'] = '.a' + if env.Detect('ranlib'): + env['RANLIB'] = 'ranlib' + env['RANLIBFLAGS'] = SCons.Util.CLVar('') + env['RANLIBCOM'] = '$RANLIB $RANLIBFLAGS $TARGET' + def exists(env): return env.Detect('ar') diff --git a/src/engine/SCons/Tool/ar.xml b/src/engine/SCons/Tool/ar.xml index baebd27..24f886b 100644 --- a/src/engine/SCons/Tool/ar.xml +++ b/src/engine/SCons/Tool/ar.xml @@ -46,6 +46,23 @@ The archive indexer. </summary> </cvar> +<cvar name="RANLIBCOM"> +<summary> +The command line used to index a static library archive. +</summary> +</cvar> + +<cvar name="RANLIBCOMSTR"> +<summary> +The string displayed when a static library archive is indexed. +If this is not set, then &cv-RANLIBCOM; (the command line) is displayed. + +<example> +env = Environment(RANLIBCOMSTR = "Indexing $TARGET") +</example> +</summary> +</cvar> + <cvar name="RANLIBFLAGS"> <summary> General options passed to the archive indexer. |