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 | |
| 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')
| -rw-r--r-- | src/CHANGES.txt | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/__init__.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 7d0f8d8..cbb9cff 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -11,6 +11,10 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Whatever John Doe did. + From Daniel Moody: + - Updated the Jar Builder tool in Tool/__init.py so that is doesn't force class files as + sources, allowing directories to be passed, which was causing test/Java/JAR.py to fail. + From William Deegan: - Fix issue where code in utility routine to_String_for_subst() had code whose result was never properly returned. 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 |