diff options
| author | Russel Winder <russel@winder.org.uk> | 2017-08-23 07:06:41 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2017-08-23 07:06:41 (GMT) |
| commit | 19ae63da41fb2779021bd0028a7d7730f41c2021 (patch) | |
| tree | 0763b7f670b3d7b65baf1bd550730f300c32cf2a /src/engine/SCons/Tool | |
| parent | e77ff3a91273d7fa5f7c440049ea76043b9bceb2 (diff) | |
| parent | 939963642474e9f9b01adc6b42e5fda15de3fa89 (diff) | |
| download | SCons-19ae63da41fb2779021bd0028a7d7730f41c2021.zip SCons-19ae63da41fb2779021bd0028a7d7730f41c2021.tar.gz SCons-19ae63da41fb2779021bd0028a7d7730f41c2021.tar.bz2 | |
Merge mainline.
Diffstat (limited to 'src/engine/SCons/Tool')
| -rw-r--r-- | src/engine/SCons/Tool/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index 6408f8b..6ddb9fc 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -319,6 +319,7 @@ def createProgBuilder(env): return program + def createStaticLibBuilder(env): """This is a utility function that creates the StaticLibrary Builder in an Environment if it is not there already. @@ -913,7 +914,7 @@ def CreateJarBuilder(env): jar_com = SCons.Action.Action('$JARCOM', '$JARCOMSTR') java_jar = SCons.Builder.Builder(action = jar_com, suffix = '$JARSUFFIX', - src_suffix = '$JAVACLASSSUFIX', + src_suffix = '$JAVACLASSSUFFIX', src_builder = 'JavaClassFile', source_factory = fs.Entry) env['BUILDERS']['Jar'] = java_jar |