From dc130cbafd7ce135da0a1e59332c428a487dad41 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 9 Jun 2015 14:57:03 +0200 Subject: don't build qbs-javac-scan on every incremental build Change-Id: I5ef6465111a75103f4de2685ca02c5bd3c751d1e Reviewed-by: Jake Petroules --- src/libexec/qbs-javac-scan/qbs-javac-scan.pro | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/libexec') 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.") -- cgit v1.2.3