diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-05-29 16:38:03 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-06-01 08:51:08 +0000 |
| commit | 35fbe45131308928873349e92612b479d83e8742 (patch) | |
| tree | eabe7ff75700a99bdf6cee619c5c19ecbb366444 | |
| parent | f45c3a055cea5ecde33f391e831a92a4675647b5 (diff) | |
Make libexec path properly configurable.
Change-Id: I7f9c3935f46446d117fd42081c3885fc3f80da5a
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| -rw-r--r-- | qbs.qbs | 3 | ||||
| -rw-r--r-- | src/libexec/libexec.pri | 6 | ||||
| -rw-r--r-- | src/libexec/qbs-javac-scan/qbs-javac-scan.pro | 8 | ||||
| -rw-r--r-- | src/libexec/qbs-javac-scan/qbs-javac-scan.qbs | 4 |
4 files changed, 12 insertions, 9 deletions
@@ -12,7 +12,8 @@ Project { property string libDirName: "lib" property string appInstallDir: "bin" property string libInstallDir: qbs.targetOS.contains("windows") ? "bin" : libDirName - property string relativeLibexecPath: "../libexec" + property string libexecInstallDir: "libexec" + property string relativeLibexecPath: "../" + libexecInstallDir property string relativePluginsPath: "../" + libDirName property string relativeSearchPath: ".." property stringList libRPaths: { diff --git a/src/libexec/libexec.pri b/src/libexec/libexec.pri new file mode 100644 index 000000000..439f30f1f --- /dev/null +++ b/src/libexec/libexec.pri @@ -0,0 +1,6 @@ +!isEmpty(QBS_LIBEXEC_DESTDIR):DESTDIR=$${QBS_LIBEXEC_DESTDIR} +else:DESTDIR = ../../../libexec + +!isEmpty(QBS_LIBEXEC_INSTALL_DIR):target.path = $${QBS_LIBEXEC_INSTALL_DIR} +else:target.path = $${QBS_INSTALL_PREFIX}/libexec +INSTALLS += target diff --git a/src/libexec/qbs-javac-scan/qbs-javac-scan.pro b/src/libexec/qbs-javac-scan/qbs-javac-scan.pro index faf7a3d64..4739d766d 100644 --- a/src/libexec/qbs-javac-scan/qbs-javac-scan.pro +++ b/src/libexec/qbs-javac-scan/qbs-javac-scan.pro @@ -1,6 +1,6 @@ -TARGET = qbs-javac-scan +include(../libexec.pri) -DESTDIR = ../../../libexec +TARGET = qbs-javac-scan PATHPREFIX = $$PWD/io/qt/qbs/ @@ -18,10 +18,6 @@ JAVASOURCES += \ JAVAMAINCLASS = io.qt.qbs.tools.JavaCompilerScannerTool -# install -target.path = $${QBS_INSTALL_PREFIX}/libexec -INSTALLS += target - # from mkspecs/features/java.prf TEMPLATE = lib diff --git a/src/libexec/qbs-javac-scan/qbs-javac-scan.qbs b/src/libexec/qbs-javac-scan/qbs-javac-scan.qbs index 05fbe3c18..dc9aab8f4 100644 --- a/src/libexec/qbs-javac-scan/qbs-javac-scan.qbs +++ b/src/libexec/qbs-javac-scan/qbs-javac-scan.qbs @@ -5,12 +5,12 @@ JavaJarFile { property string entryPoint: "io.qt.qbs.tools.JavaCompilerScannerTool" - destinationDirectory: "libexec" + destinationDirectory: project.libexecInstallDir Group { fileTagsFilter: ["java.jar"] qbs.install: true - qbs.installDir: "libexec" + qbs.installDir: project.libexecInstallDir } files: [ |