Changes for issue #2730:

 - temporarily disabling the detect routine for the Tools 'jar' and 'rmic'
 - added a simple testcase for each
 - changes to Announce.txt (typos) and CHANGES.txt

6 files changed, 193 insertions, 4 deletions

diff --git a/src/Announce.txt b/src/Announce.txt
index bb12398ad..28290efb3 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -44,7 +44,7 @@ RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
 
     --  NEW FEATURE
 
-    --  Support for Latex bubunits package has been added along with 
+    --  Support for Latex bibunits package has been added along with 
         support for tex files generated by other builders.
 
 
@@ -90,7 +90,7 @@ RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
         1.3.  By default, it should now use the latest installed
         Visual Studio version on your machine, and compile for 32 or
         64 bits according to whether your OS is 32 or 64 bits (32/64
-        bit python makes no difference).
+        bit Python makes no difference).
 
 	Two new variables control Visual Studio: MSVC_VERSION and
 	TARGET_ARCH.  These variables ONLY take effect when passed to
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 277dcfd9c..931a04631 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -142,6 +142,8 @@ RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
   From Dirk Baechle:
 
     - XML fixes in User's Guide.
+    - Fixed the detection of 'jar' and 'rmic' during
+      the initialization of the respective Tools (#2730).
 
   From Joe Zuntz:
 
diff --git a/src/engine/SCons/Tool/jar.py b/src/engine/SCons/Tool/jar.py
index 05cac49f2..9bae729ee 100644
--- a/src/engine/SCons/Tool/jar.py
+++ b/src/engine/SCons/Tool/jar.py
@@ -101,7 +101,13 @@ def generate(env):
     env['JARSUFFIX']  = '.jar'
 
 def exists(env):
-    return env.Detect('jar')
+    # As reported by Jan Nijtmans in issue #2730, the simple
+    #    return env.Detect('jar')
+    # doesn't always work during initialization. For now, we
+    # stop trying to detect an executable (analogous to the
+    # javac Builder).
+    # TODO: Come up with a proper detect() routine...and enable it.
+    return 1
 
 # Local Variables:
 # tab-width:4
diff --git a/src/engine/SCons/Tool/rmic.py b/src/engine/SCons/Tool/rmic.py
index 750967218..4d1bd281a 100644
--- a/src/engine/SCons/Tool/rmic.py
+++ b/src/engine/SCons/Tool/rmic.py
@@ -111,7 +111,13 @@ def generate(env):
     env['JAVACLASSSUFFIX']  = '.class'
 
 def exists(env):
-    return env.Detect('rmic')
+    # As reported by Jan Nijtmans in issue #2730, the simple
+    #    return env.Detect('rmic')
+    # doesn't always work during initialization. For now, we
+    # stop trying to detect an executable (analogous to the
+    # javac Builder).
+    # TODO: Come up with a proper detect() routine...and enable it.
+    return 1
 
 # Local Variables:
 # tab-width:4
diff --git a/test/Java/jar_not_in_PATH.py b/test/Java/jar_not_in_PATH.py
new file mode 100644
index 000000000..9a716c50b
--- /dev/null
+++ b/test/Java/jar_not_in_PATH.py
@@ -0,0 +1,85 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Ensures that the Tool gets initialized, even when jar is not directly
+found via the PATH variable (issue #2730).
+"""
+
+import os
+
+import TestSCons
+
+_python_ = TestSCons._python_
+
+test = TestSCons.TestSCons()
+
+test.write('myjar.py', r"""
+import sys
+args = sys.argv[1:]
+while args:
+    a = args[0]
+    if a == 'cf':
+        out = args[1]
+        args = args[1:]
+    else:
+        break
+    args = args[1:]
+outfile = open(out, 'wb')
+for file in args:
+    infile = open(file, 'rb')
+    for l in infile.readlines():
+        if l[:7] != '/*jar*/':
+            outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+import os
+oldpath = os.environ.get('PATH','')
+env = Environment(ENV = {'PATH' : ['.']})
+env['ENV']['PATH'] = oldpath
+env['JAR'] = r'%(_python_)s ./myjar.py'
+env.Jar(target = 'test1.jar', source = 'test1.class')
+""" % locals())
+
+test.write('test1.class', """\
+test1.class
+/*jar*/
+line 3
+""")
+
+test.run(arguments = '.', stderr = None)
+
+test.must_exist('test1.jar')
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Java/rmic_not_in_PATH.py b/test/Java/rmic_not_in_PATH.py
new file mode 100644
index 000000000..9c7030cc6
--- /dev/null
+++ b/test/Java/rmic_not_in_PATH.py
@@ -0,0 +1,90 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Ensures that the Tool gets initialized, even when rmic is not directly
+found via the PATH variable (issue #2730).
+"""
+
+import os
+
+import TestSCons
+
+_python_ = TestSCons._python_
+
+test = TestSCons.TestSCons()
+
+test.write('myrmic.py', r"""
+import os
+import sys
+args = sys.argv[1:]
+while args:
+    a = args[0]
+    if a == '-d':
+        outdir = args[1]
+        args = args[1:]
+    elif a == '-classpath':
+        args = args[1:]
+    elif a == '-sourcepath':
+        args = args[1:]
+    else:
+        break
+    args = args[1:]
+for file in args:
+    infile = open(file, 'rb')
+    outfile = open(os.path.join(outdir, file[:-5] + '.class'), 'wb')
+    for l in infile.readlines():
+        if l[:8] != '/*rmic*/':
+            outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+import os
+oldpath = os.environ.get('PATH','')
+env = Environment(ENV = {'PATH' : ['.']})
+env['ENV']['PATH'] = oldpath
+env['RMIC'] = r'%(_python_)s myrmic.py'
+env.RMIC(target = 'outdir', source = 'test1.java')
+""" % locals())
+
+test.write('test1.java', """\
+test1.java
+/*rmic*/
+line 3
+""")
+
+test.run(arguments = '.', stderr = None)
+
+test.must_exist(os.path.join('outdir','test1.class'))
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: