summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-08-20 18:25:22 -0700
committerWilliam Deegan <bill@baddogconsulting.com>2017-08-20 18:25:22 -0700
commit7724d48f05f7a739d7b500c770be6752353a6919 (patch)
treea3e3c488169620fb93a91cb325b1f938040185c0
parentc96277d63f6e917daa5798a41954a88e98352e81 (diff)
downloadscons-7724d48f05f7a739d7b500c770be6752353a6919.tar.gz
Fix Bug #3025 - (Credit to Florian : User flow86 on tigris) - Fix typo JAVACLASSSUFIX should have been JAVACLASSSUFFIX
-rw-r--r--src/CHANGES.txt3
-rw-r--r--src/engine/SCons/Tool/__init__.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index fa427265..c2c8ca87 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -40,6 +40,9 @@ may cause rebuilds. In no case should rebuilds not happen.
- Fixed Bug #2486 - Added SetOption('silent',True) - Previously this value was not allowed to be set.
- Fixed Bug #3040 - Non-unicode character in CHANGES.txt
- Fixed Bug #2622 - AlwaysBuild + MSVC regression.
+ - Fixed Bug #3025 - (Credit to Florian : User flow86 on tigris) - Fix typo JAVACLASSSUFIX should have been
+ JAVACLASSSUFFIX
+
From Ibrahim Esmat:
- Added the capability to build Windows Store Compatible libraries that can be used
diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index 96443876..6ddb9fc7 100644
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -914,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