aboutsummaryrefslogtreecommitdiff
path: root/nailgun_launcher
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-04-02 19:59:16 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2016-04-02 20:09:42 -0400
commit107f62303794fa14b05c211d52dddc1f50f14886 (patch)
treeb691ca3ff428ff0d91b973c93aa590fc50431b72 /nailgun_launcher
parentef08ce94aa537c50651f5c18b8cdf1d6313ff208 (diff)
downloadcbt-107f62303794fa14b05c211d52dddc1f50f14886.tar.gz
cbt-107f62303794fa14b05c211d52dddc1f50f14886.tar.bz2
cbt-107f62303794fa14b05c211d52dddc1f50f14886.zip
propagate info if cbt has changed across builds, so they can be re-compiled
Diffstat (limited to 'nailgun_launcher')
-rw-r--r--nailgun_launcher/NailgunLauncher.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/nailgun_launcher/NailgunLauncher.java b/nailgun_launcher/NailgunLauncher.java
index de55821..c94a6d2 100644
--- a/nailgun_launcher/NailgunLauncher.java
+++ b/nailgun_launcher/NailgunLauncher.java
@@ -69,16 +69,16 @@ public class NailgunLauncher{
}
}
- Boolean stage1SourcesChanged = false;
+ Boolean changed = lastSuccessfullCompile == 0;
for( File file: stage1SourceFiles ){
if( file.lastModified() > lastSuccessfullCompile ){
- stage1SourcesChanged = true;
+ changed = true;
//System.err.println("File change: "+file.lastModified());
break;
}
}
- if(stage1SourcesChanged || stage1classLoader == null){
+ if(changed){
EarlyDependencies earlyDeps = new EarlyDependencies();
int exitCode = zinc(earlyDeps, stage1SourceFiles);
if( exitCode == 0 ){
@@ -103,7 +103,7 @@ public class NailgunLauncher{
(Integer) stage1classLoader
.loadClass("cbt.Stage1")
.getMethod("run", String[].class, ClassLoader.class, Boolean.class)
- .invoke( null, (Object) args, stage1classLoader, stage1SourcesChanged);
+ .invoke( null, (Object) args, stage1classLoader, changed);
System.exit(exitCode);
}catch(Exception e){
System.err.println(stage1classLoader);