diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-04-02 14:49:16 -0400 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-04-02 14:51:10 -0400 |
| commit | b9f8ff66c9e61daab016cc8e595f388f449ec780 (patch) | |
| tree | aa033dc361e71dd2b074234b5dcce46a620cb842 /nailgun_launcher/NailgunLauncher.java | |
| parent | 81cdf3b38d0b8c89a814328e517b9023a0400549 (diff) | |
| download | cbt-b9f8ff66c9e61daab016cc8e595f388f449ec780.tar.gz cbt-b9f8ff66c9e61daab016cc8e595f388f449ec780.tar.bz2 cbt-b9f8ff66c9e61daab016cc8e595f388f449ec780.zip | |
Properly cache classloader for stage2 and make CbtDependency work correctly.
This fixes the issues with crashes loading stage2 introduces in 57de43907e05d4cd3986e2994e0e3bff93e09b4e. Also should be faster when using nailgun.
Diffstat (limited to 'nailgun_launcher/NailgunLauncher.java')
| -rw-r--r-- | nailgun_launcher/NailgunLauncher.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nailgun_launcher/NailgunLauncher.java b/nailgun_launcher/NailgunLauncher.java index 3290bdb..5337b0a 100644 --- a/nailgun_launcher/NailgunLauncher.java +++ b/nailgun_launcher/NailgunLauncher.java @@ -38,6 +38,7 @@ public class NailgunLauncher{ public static long lastSuccessfullCompile = 0; static ClassLoader stage1classLoader = null; + public static ClassLoader stage2classLoader = null; public static void main(String[] args) throws ClassNotFoundException, NoSuchMethodException, @@ -78,6 +79,7 @@ public class NailgunLauncher{ } if(stage1SourcesChanged || stage1classLoader == null){ + System.err.println("CBT stage1 changed. Re-compiling."); EarlyDependencies earlyDeps = new EarlyDependencies(); int exitCode = zinc(earlyDeps, stage1SourceFiles); if( exitCode == 0 ){ @@ -94,6 +96,7 @@ public class NailgunLauncher{ } stage1classLoader = classLoader(STAGE1+TARGET, nailgunClassLoader); + stage2classLoader = null; } try{ |