diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 13:30:08 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 13:30:08 +0200 |
| commit | 9c04223086bf606eaac6dc2848af80518210d823 (patch) | |
| tree | e455703d75ac36f88d95cb712f5ea3bc4fc0d96e /engine/SCons/Tool/rmic.py | |
| parent | 19712e5025e3cf6a33fccd0738f04e018d55025f (diff) | |
New upstream version 3.1.0upstream/3.1.0
Diffstat (limited to 'engine/SCons/Tool/rmic.py')
| -rw-r--r-- | engine/SCons/Tool/rmic.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engine/SCons/Tool/rmic.py b/engine/SCons/Tool/rmic.py index b2df405..d6f7b2b 100644 --- a/engine/SCons/Tool/rmic.py +++ b/engine/SCons/Tool/rmic.py @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/rmic.py a56bbd8c09fb219ab8a9673330ffcd55279219d0 2019-03-26 23:16:31 bdeegan" +__revision__ = "src/engine/SCons/Tool/rmic.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan" import os.path @@ -110,11 +110,9 @@ def generate(env): if env['PLATFORM'] == 'win32': version = env.get('JAVAVERSION', None) - default_paths=get_java_install_dirs(env['PLATFORM'], version=version) - # Ensure that we have a proper path for rmic - rmic = SCons.Tool.find_program_path(env, 'rmic', default_paths=default_paths) - + paths = get_java_install_dirs('win32', version=version) + rmic = SCons.Tool.find_program_path(env, 'rmic', default_paths=paths) # print("RMIC: %s"%rmic) if rmic: rmic_bin_dir = os.path.dirname(rmic) |