13 files changed, 229 insertions, 0 deletions
diff --git a/tutorial/chapter-7/app/app.qbs b/tutorial/chapter-7/app/app.qbs
new file mode 100644
index 000000000..84c2430e4
--- /dev/null
+++ b/tutorial/chapter-7/app/app.qbs
@@ -0,0 +1,6 @@
+MyApplication {
+    Depends { name: "mylib" }
+    name: "My Application"
+    targetName: "myapp"
+    files: "main.c"
+}
diff --git a/tutorial/chapter-7/app/main.c b/tutorial/chapter-7/app/main.c
new file mode 100644
index 000000000..a560d1ba1
--- /dev/null
+++ b/tutorial/chapter-7/app/main.c
@@ -0,0 +1,10 @@
+#include <stdio.h>
+
+#include "lib.h"
+
+int main()
+{
+    printf("Hello, world\n");
+    printf("%s\n", get_string());
+    return 0;
+}
diff --git a/tutorial/chapter-7/lib/lib.c b/tutorial/chapter-7/lib/lib.c
new file mode 100644
index 000000000..5dcae0de3
--- /dev/null
+++ b/tutorial/chapter-7/lib/lib.c
@@ -0,0 +1,10 @@
+#include "lib.h"
+
+#ifndef CRUCIAL_DEFINE
+#   error CRUCIAL_DEFINE not defined
+#endif
+
+const char *get_string()
+{
+    return "Hello from library";
+}
diff --git a/tutorial/chapter-7/lib/lib.h b/tutorial/chapter-7/lib/lib.h
new file mode 100644
index 000000000..ef39ca4a1
--- /dev/null
+++ b/tutorial/chapter-7/lib/lib.h
@@ -0,0 +1,8 @@
+#ifndef LIB_H
+#define LIB_H
+
+#include "lib_global.h"
+
+MYLIB_EXPORT const char *get_string();
+
+#endif // LIB_H
diff --git a/tutorial/chapter-7/lib/lib.qbs b/tutorial/chapter-7/lib/lib.qbs
new file mode 100644
index 000000000..eccf6844d
--- /dev/null
+++ b/tutorial/chapter-7/lib/lib.qbs
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of Qbs.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+MyLibrary {
+    name: "mylib"
+    files: [
+        "lib.c",
+        "lib.h",
+    ]
+    Depends { name: 'cpp' }
+    cpp.defines: ['CRUCIAL_DEFINE']
+}
+
diff --git a/tutorial/chapter-7/lib/lib_global.h b/tutorial/chapter-7/lib/lib_global.h
new file mode 100644
index 000000000..76cce8d36
--- /dev/null
+++ b/tutorial/chapter-7/lib/lib_global.h
@@ -0,0 +1,18 @@
+#ifndef LIB_GLOBAL_H
+#define LIB_GLOBAL_H
+
+#if defined(_WIN32) || defined(WIN32)
+#define MYLIB_DECL_EXPORT __declspec(dllexport)
+#define MYLIB_DECL_IMPORT __declspec(dllimport)
+#else
+#define MYLIB_DECL_EXPORT __attribute__((visibility("default")))
+#define MYLIB_DECL_IMPORT __attribute__((visibility("default")))
+#endif
+
+#if defined(MYLIB_LIBRARY)
+#define MYLIB_EXPORT MYLIB_DECL_EXPORT
+#else
+#define MYLIB_EXPORT MYLIB_DECL_IMPORT
+#endif
+
+#endif // LIB_GLOBAL_H
diff --git a/tutorial/chapter-7/myproject.qbs b/tutorial/chapter-7/myproject.qbs
new file mode 100644
index 000000000..aa7ec90bd
--- /dev/null
+++ b/tutorial/chapter-7/myproject.qbs
@@ -0,0 +1,27 @@
+Project {
+    property bool withTests: true
+    property bool installDebugInformation: true
+    property stringList autotestArguments: []
+    property stringList autotestWrapper: []
+
+    name: "My Project"
+    minimumQbsVersion: "2.0"
+    references: [
+        "app/app.qbs",
+        "lib/lib.qbs",
+    ]
+    qbsSearchPaths: "qbs"
+
+    SubProject {
+        filePath: "test/test.qbs"
+        Properties {
+            condition: parent.withTests
+        }
+    }
+
+    AutotestRunner {
+        condition: parent.withTests
+        arguments: parent.autotestArguments
+        wrapper: parent.autotestWrapper
+    }
+}
diff --git a/tutorial/chapter-7/qbs/imports/MyApplication.qbs b/tutorial/chapter-7/qbs/imports/MyApplication.qbs
new file mode 100644
index 000000000..622c3f4be
--- /dev/null
+++ b/tutorial/chapter-7/qbs/imports/MyApplication.qbs
@@ -0,0 +1,13 @@
+//! [0]
+CppApplication {
+    Depends { name: "mybuildconfig" }
+    installDir: mybuildconfig.appInstallDir
+
+    version: "1.0.0"
+    // ...
+//! [0]
+
+    consoleApplication: true
+    install: true
+    installDebugInformation: project.installDebugInformation
+}
diff --git a/tutorial/chapter-7/qbs/imports/MyAutoTest.qbs b/tutorial/chapter-7/qbs/imports/MyAutoTest.qbs
new file mode 100644
index 000000000..1faecdc33
--- /dev/null
+++ b/tutorial/chapter-7/qbs/imports/MyAutoTest.qbs
@@ -0,0 +1,3 @@
+MyApplication {
+    type: ["application", "autotest"]
+}
diff --git a/tutorial/chapter-7/qbs/imports/MyLibrary.qbs b/tutorial/chapter-7/qbs/imports/MyLibrary.qbs
new file mode 100644
index 000000000..7c130ba17
--- /dev/null
+++ b/tutorial/chapter-7/qbs/imports/MyLibrary.qbs
@@ -0,0 +1,25 @@
+DynamicLibrary {
+    version: project.version
+    install: true
+    installDebugInformation: project.installDebugInformation
+//! [0]
+// qbs/imports/MyLibrary.qbs
+    // ...
+    Depends { name: "mybuildconfig" }
+    installDir: mybuildconfig.libInstallDir
+
+    Depends { name: "cpp" }
+    property string libraryMacro: name.replace(" ", "_").toUpperCase() + "_LIBRARY"
+    cpp.defines: [libraryMacro]
+    cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined
+
+    Export {
+    // ...
+//! [0]
+        Depends { name: "cpp" }
+        cpp.includePaths: [exportingProduct.sourceDirectory]
+    }
+
+    Depends { name: 'bundle' }
+    bundle.isBundle: false
+}
diff --git a/tutorial/chapter-7/qbs/modules/mybuildconfig/mybuildconfig.qbs b/tutorial/chapter-7/qbs/modules/mybuildconfig/mybuildconfig.qbs
new file mode 100644
index 000000000..73234bb0f
--- /dev/null
+++ b/tutorial/chapter-7/qbs/modules/mybuildconfig/mybuildconfig.qbs
@@ -0,0 +1,26 @@
+import qbs.FileInfo
+
+//! [1]
+//! [0]
+// qbs/modules/mybuildconfig.qbs
+Module {
+    property string appInstallDir: "bin"
+    property string libDirName: "lib"
+    property string libInstallDir: qbs.targetOS.contains("windows") ? appInstallDir : libDirName
+    //! [0]
+
+    Depends { name: "cpp" }
+
+    property bool enableRPath: true
+    property stringList libRPaths: {
+        if (enableRPath && cpp.rpathOrigin && product.installDir) {
+            return [FileInfo.joinPaths(cpp.rpathOrigin, FileInfo.relativePath(
+                                           FileInfo.joinPaths('/', product.installDir),
+                                           FileInfo.joinPaths('/', libInstallDir)))];
+        }
+        return [];
+    }
+
+    cpp.rpaths: libRPaths
+}
+//! [1]
diff --git a/tutorial/chapter-7/test/test.c b/tutorial/chapter-7/test/test.c
new file mode 100644
index 000000000..1fef24685
--- /dev/null
+++ b/tutorial/chapter-7/test/test.c
@@ -0,0 +1,18 @@
+#include "lib.h"
+
+#include <stdio.h>
+#include <string.h>
+
+int main(int argc, char *argv[])
+{
+    if (argc > 2) {
+        printf("usage: test [value]\n");
+        return 1;
+    }
+    const char *expected = argc == 2 ? argv[1] : "Hello from library";
+    if (strcmp(get_string(), expected) != 0) {
+        printf("text differs\n");
+        return 1;
+    }
+    return 0;
+}
diff --git a/tutorial/chapter-7/test/test.qbs b/tutorial/chapter-7/test/test.qbs
new file mode 100644
index 000000000..1e911da47
--- /dev/null
+++ b/tutorial/chapter-7/test/test.qbs
@@ -0,0 +1,5 @@
+MyAutoTest {
+    Depends { name: "mylib" }
+    name: "mytest"
+    files: "test.c"
+}