diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-10-12 01:37:40 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-10-12 01:37:40 (GMT) |
| commit | 23e7e0cedcda42be0f430ff1efcfa20f983d9cc5 (patch) | |
| tree | 06661191389289ffec5f0c8be18aab2afa560cd5 /src/engine | |
| parent | dcddd56ac238f641db90390fc510a787f93150fd (diff) | |
| parent | 5bebdedc5967b9b3fdee9772f72e0e52e8fa7f1d (diff) | |
| download | SCons-23e7e0cedcda42be0f430ff1efcfa20f983d9cc5.zip SCons-23e7e0cedcda42be0f430ff1efcfa20f983d9cc5.tar.gz SCons-23e7e0cedcda42be0f430ff1efcfa20f983d9cc5.tar.bz2 | |
Merge branch 'dmoody256-master'
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Tool/__init__.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index 6ddb9fc..57090bb 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -914,8 +914,6 @@ def CreateJarBuilder(env): jar_com = SCons.Action.Action('$JARCOM', '$JARCOMSTR') java_jar = SCons.Builder.Builder(action = jar_com, suffix = '$JARSUFFIX', - src_suffix = '$JAVACLASSSUFFIX', - src_builder = 'JavaClassFile', source_factory = fs.Entry) env['BUILDERS']['Jar'] = java_jar return java_jar |