aboutsummaryrefslogtreecommitdiffstats
path: root/src/libexec
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-06-09 14:57:03 +0200
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-06-11 09:17:06 +0000
commitdc130cbafd7ce135da0a1e59332c428a487dad41 (patch)
treeec12bbf795f946a510534f59b4b19842d70d3118 /src/libexec
parenta9fdd4ddeb79c733773fada38990962f0b86ee54 (diff)
don't build qbs-javac-scan on every incremental build
Change-Id: I5ef6465111a75103f4de2685ca02c5bd3c751d1e Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'src/libexec')
-rw-r--r--src/libexec/qbs-javac-scan/qbs-javac-scan.pro9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libexec/qbs-javac-scan/qbs-javac-scan.pro b/src/libexec/qbs-javac-scan/qbs-javac-scan.pro
index 4739d766d..84738a304 100644
--- a/src/libexec/qbs-javac-scan/qbs-javac-scan.pro
+++ b/src/libexec/qbs-javac-scan/qbs-javac-scan.pro
@@ -22,6 +22,7 @@ JAVAMAINCLASS = io.qt.qbs.tools.JavaCompilerScannerTool
TEMPLATE = lib
CLASS_DIR = .classes
+CLASS_DIR_MARKER = .classes.marker
CONFIG -= qt
@@ -31,12 +32,10 @@ CONFIG -= qt
CONFIG += plugin no_plugin_name_prefix
javac.input = JAVASOURCES
-javac.output = $$CLASS_DIR
+javac.output = $$CLASS_DIR_MARKER
javac.CONFIG += combine
-javac.commands = javac -source 1.6 -target 1.6 -Xlint:unchecked -cp $$shell_quote($$system_path($$join(JAVACLASSPATH, $$DIRLIST_SEPARATOR))) -d $$shell_quote($$CLASS_DIR) ${QMAKE_FILE_IN}
-# Force rebuild every time, because we don't know the paths of the destination files
-# as they depend on the code.
-javac.depends = FORCE
+javac.commands = javac -source 1.6 -target 1.6 -Xlint:unchecked -cp $$shell_quote($$system_path($$join(JAVACLASSPATH, $$DIRLIST_SEPARATOR))) -d $$shell_quote($$CLASS_DIR) ${QMAKE_FILE_IN} $$escape_expand(\\n\\t) \
+ @echo Nothing to see here. Move along. > $$CLASS_DIR_MARKER
QMAKE_EXTRA_COMPILERS += javac
mkpath($$absolute_path($$CLASS_DIR, $$OUT_PWD)) | error("Aborting.")