diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2015-05-09 01:10:39 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@petroules.com> | 2015-05-11 16:29:15 +0000 |
commit | da45908f33d6ba604df88b31df8aa4916bcc20ad (patch) | |
tree | cc8e010fd766321e2d608376425a996c6a3db67e /share | |
parent | 0b965aa0b64ae1a8b93a27627a19bf8e422739b7 (diff) |
Add support for generating native header files when using Java 1.8+.
Change-Id: Ibcfb9756d5c5edeb0c7e4c0d7d50c10f88172c3d
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'share')
-rw-r--r-- | share/qbs/modules/java/utils.js | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/share/qbs/modules/java/utils.js b/share/qbs/modules/java/utils.js index 133769b36..8b469a013 100644 --- a/share/qbs/modules/java/utils.js +++ b/share/qbs/modules/java/utils.js @@ -42,6 +42,17 @@ function extractPackageName(filePath) return packageName; } +function supportsGeneratedNativeHeaderFiles(product) { + var compilerVersionMajor = ModUtils.moduleProperty(product, "compilerVersionMajor"); + if (compilerVersionMajor === 1) { + if (ModUtils.moduleProperty(product, "compilerVersionMinor") >= 8) { + return true; + } + } + + return compilerVersionMajor > 1; +} + function javacArguments(product, inputs) { var i; var outputDir = ModUtils.moduleProperty(product, "classFilesDir"); @@ -58,6 +69,8 @@ function javacArguments(product, inputs) { "-s", product.buildDirectory, debugArg, "-d", outputDir ]; + if (supportsGeneratedNativeHeaderFiles(product)) + args.push("-h", product.buildDirectory); var runtimeVersion = ModUtils.moduleProperty(product, "runtimeVersion"); if (runtimeVersion) args.push("-target", runtimeVersion); |