Merged in managan/scons_newglossary-fix (pull request #170), fixes newglossary to work with VariantDir

3 files changed, 31 insertions, 0 deletions

diff --git a/.hgignore b/.hgignore
index 053e916e..27c728a1 100644
--- a/.hgignore
+++ b/.hgignore
@@ -9,3 +9,10 @@ syntax:glob
 *~
 *.xcodeproj
 *.orig
+
+doc/user/scons-user
+doc/user/scons_db.xml
+doc/user/scons_ex.xml
+doc/user/scons_exi.xml
+doc/user/scons_xi.xml
+doc/user/index.html
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index c8c1fbf7..8f01cf62 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -6,6 +6,9 @@
 
 RELEASE 2.3.2.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
 
+  From Kendrick Boyd and Rob Managan:
+    - Fixed the newglossary action to work with VariantDir (LaTeX).
+
   From Manuel Francisco Naranjo:
     - Added a default for the BUILDERS environment variable,
       to prevent not defined exception on a Clone().
diff --git a/test/Repository/RMIC.py b/test/Repository/RMIC.py
index b214b4bd..886ccdbc 100644
--- a/test/Repository/RMIC.py
+++ b/test/Repository/RMIC.py
@@ -35,6 +35,27 @@ python = TestSCons.python
 test = TestSCons.TestSCons()
 
 where_javac, java_version = test.java_where_javac()
+
+# Try to get the major/minor Java version 
+curver = (1, 0)
+if java_version.count('.') == 1:
+    # Check Java version
+    major, minor = java_version.split('.')
+    try:
+        curver = (int(major), int(minor))
+    except:
+        pass
+
+# Check the version of the found Java compiler.
+# If it's 1.8 or higher, we skip the further RMIC test
+# because we'll get warnings about the deprecated API...
+# it's just not state-of-the-art anymore.
+# Note, how we allow simple version strings like "5" and
+# "6" to successfully pass this test.
+if curver >= (1, 8):
+    test.skip_test('The found version of javac is higher than 1.7, skipping test.\n')
+
+
 where_java = test.java_where_java()
 where_rmic = test.java_where_rmic()