propagate from branch 'i2p.i2p.zzz.test2' (head 70ae5494bd7255a03f80838a2f3d8e7c0ce86634)

to branch 'i2p.i2p' (head 05a201cc5c1bd841f32e9268b3019b3a3447f4f3)
2016-02-03 20:02:34 +00:00
parent a70a7a7ed5 d4d720524e
commit ebc4ca8698
82 changed files with 3766 additions and 313 deletions
--- a/build.xml
+++ b/build.xml
@@ -883,6 +883,11 @@
                    <not><contains string="${javac.compilerargs}" substring="-bootclasspath"/></not>
                </condition>
            </fail>
+            <fail message="javac.compilerargs7 must contain a -bootclasspath option in override.properties">
+                <condition>
+                    <not><contains string="${javac.compilerargs7}" substring="-bootclasspath"/></not>
+                </condition>
+            </fail>
            <fail message="build.built-by must be set in override.properties">
                <condition>
                    <equals arg1="${build.built-by}" arg2="unknown"/>