From a8a168ec6ccfa3a8ec4243ebf0ccaaf86a13b2a2 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Fri, 17 Feb 2017 17:11:33 +0100 Subject: Moved smolbote.qbs --- BUILDING.md | 4 +- data/icon.svg | 37 ++++++++++++++++++ data/resources.qrc | 5 +++ qbs/GitRepo.js | 15 +++++++ smolbote.qbs | 104 +++++++++++++++++++++++++++++++++++++++++++++++++ src/GitRepo.js | 15 ------- src/data/icon.svg | 37 ------------------ src/data/resources.qrc | 5 --- src/smolbote.qbs | 104 ------------------------------------------------- 9 files changed, 163 insertions(+), 163 deletions(-) create mode 100644 data/icon.svg create mode 100644 data/resources.qrc create mode 100644 qbs/GitRepo.js create mode 100644 smolbote.qbs delete mode 100644 src/GitRepo.js delete mode 100644 src/data/icon.svg delete mode 100644 src/data/resources.qrc delete mode 100644 src/smolbote.qbs diff --git a/BUILDING.md b/BUILDING.md index 03a95c6..2af8d4b 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -23,11 +23,11 @@ and Managing Qt versions. * Run qbs ``` -[smolbote repo]$ qbs build --build-directory build --file src/smolbote.qbs profile:qt5 release +[smolbote repo]$ qbs build --build-directory build profile:qt5 release ``` Shortened: ``` -[smolbote repo]$ qbs build -d build -f src/smolbote.qbs profile:qt5 release +[smolbote repo]$ qbs build -d build profile:qt5 release ``` This installs the files to build/release/install-root. diff --git a/data/icon.svg b/data/icon.svg new file mode 100644 index 0000000..a2ae055 --- /dev/null +++ b/data/icon.svg @@ -0,0 +1,37 @@ + + + + Vector Toks, the Lanix Penguin + + + + + + image/svg+xml + + Vector Toks, the Lanix Penguin + 2015-08-01 + + + IBPX, originally by reddit.com/u/creed10 + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/resources.qrc b/data/resources.qrc new file mode 100644 index 0000000..c29d7fe --- /dev/null +++ b/data/resources.qrc @@ -0,0 +1,5 @@ + + + icon.svg + + diff --git a/qbs/GitRepo.js b/qbs/GitRepo.js new file mode 100644 index 0000000..d7e19a7 --- /dev/null +++ b/qbs/GitRepo.js @@ -0,0 +1,15 @@ +var Process = loadExtension("qbs.Process") + +function read(workingDirectory) { + var git = new Process(); + git.setWorkingDirectory(workingDirectory); + + var meta = Object.create(null); + git.exec("git", ["describe", "--abbrev=0", "--tag"], true); + meta.version = git.readLine(); + + git.exec("git", ["describe", "--tag"], true); + meta.describe = git.readLine(); + + return meta; +} diff --git a/smolbote.qbs b/smolbote.qbs new file mode 100644 index 0000000..1ef8407 --- /dev/null +++ b/smolbote.qbs @@ -0,0 +1,104 @@ +import qbs +import "qbs/GitRepo.js" as GitRepo + +Project { + id: project + // Qt 5.7 has qbs version 1.6.0 + // Qt 5.8 has qbs version 1.7.0 + minimumQbsVersion: "1.6.0" + + property bool gitVersion: true + + // The following define makes your compiler emit warnings if you use any + // feature of Qt which as been marked as deprecated (the exact warnings + // depend on your compiler). Please consult the documentation of the + // deprecated API in order to know how to port your code away from it. + + // The code also fails to compile if you use APIs deprecated before Qt 5,7. + property bool deprecatedWarnings: true + + CppApplication { + id: poi + name: "poi" + property stringList defines: [] + + Probe { + id: git + property string version: "1.0.0" + property string describe: "1.0.0-0-00000000" + configure: { + if(project.gitVersion) { + var meta = GitRepo.read(project.sourceDirectory); + version = meta.version; + describe = meta.describe; + } + found = true; + } + } + + cpp.includePaths: ['src'] + cpp.defines: { + if(project.deprecatedWarnings) + defines.push("QT_DEPRECATED_WARNINGS", "QT_DISABLE_DEPRECATED_BEFORE=0x050700"); + if(git.found) + defines.push('VERSION="'+git.version+'"'); + return defines; + } + + files: [ + "data/icon.svg", + "data/resources.qrc", + "src/browser.cpp", + "src/browser.h", + "src/forms/blockerdialog.cpp", + "src/forms/blockerdialog.h", + "src/forms/blockerdialog.ui", + "src/forms/bookmarksdialog.cpp", + "src/forms/bookmarksdialog.h", + "src/forms/bookmarksdialog.ui", + "src/forms/downloaddialog.cpp", + "src/forms/downloaddialog.h", + "src/forms/downloaddialog.ui", + "src/forms/profiledialog.cpp", + "src/forms/profiledialog.h", + "src/forms/profiledialog.ui", + "src/main.cpp", + "src/mainwindow.cpp", + "src/mainwindow.h", + "src/mainwindow.ui", + "src/settings.cpp", + "src/settings.h", + "src/webengine/blockerrule.cpp", + "src/webengine/blockerrule.h", + "src/webengine/blockersubscription.cpp", + "src/webengine/blockersubscription.h", + "src/webengine/downloaditemform.cpp", + "src/webengine/downloaditemform.h", + "src/webengine/downloaditemform.ui", + "src/webengine/regexp.cpp", + "src/webengine/regexp.h", + "src/webengine/urlinterceptor.cpp", + "src/webengine/urlinterceptor.h", + "src/webengine/webengineprofile.cpp", + "src/webengine/webengineprofile.h", + "src/webengine/webview.cpp", + "src/webengine/webview.h", + "src/widgets/loadingbar.cpp", + "src/widgets/loadingbar.h", + "src/widgets/urllineedit.cpp", + "src/widgets/urllineedit.h", + "src/widgets/webviewtabbar.cpp", + "src/widgets/webviewtabbar.h", + "src/xbel/xbel.cpp", + "src/xbel/xbel.h", + ] + + Depends { name: "Qt"; submodules: ["core", "widgets", "webengine", "webenginewidgets"] } + + // Properties for the produced executable + Group { + fileTagsFilter: product.type // filter selects produced executable + qbs.install: true // install it + } + } +} diff --git a/src/GitRepo.js b/src/GitRepo.js deleted file mode 100644 index d7e19a7..0000000 --- a/src/GitRepo.js +++ /dev/null @@ -1,15 +0,0 @@ -var Process = loadExtension("qbs.Process") - -function read(workingDirectory) { - var git = new Process(); - git.setWorkingDirectory(workingDirectory); - - var meta = Object.create(null); - git.exec("git", ["describe", "--abbrev=0", "--tag"], true); - meta.version = git.readLine(); - - git.exec("git", ["describe", "--tag"], true); - meta.describe = git.readLine(); - - return meta; -} diff --git a/src/data/icon.svg b/src/data/icon.svg deleted file mode 100644 index a2ae055..0000000 --- a/src/data/icon.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - Vector Toks, the Lanix Penguin - - - - - - image/svg+xml - - Vector Toks, the Lanix Penguin - 2015-08-01 - - - IBPX, originally by reddit.com/u/creed10 - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/data/resources.qrc b/src/data/resources.qrc deleted file mode 100644 index c29d7fe..0000000 --- a/src/data/resources.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - icon.svg - - diff --git a/src/smolbote.qbs b/src/smolbote.qbs deleted file mode 100644 index 439014c..0000000 --- a/src/smolbote.qbs +++ /dev/null @@ -1,104 +0,0 @@ -import qbs -import "GitRepo.js" as GitRepo - -Project { - id: project - // Qt 5.7 has qbs version 1.6.0 - // Qt 5.8 has qbs version 1.7.0 - minimumQbsVersion: "1.6.0" - - property bool gitVersion: true - - // The following define makes your compiler emit warnings if you use any - // feature of Qt which as been marked as deprecated (the exact warnings - // depend on your compiler). Please consult the documentation of the - // deprecated API in order to know how to port your code away from it. - - // The code also fails to compile if you use APIs deprecated before Qt 5,7. - property bool deprecatedWarnings: true - - CppApplication { - id: poi - name: "poi" - property stringList defines: [] - - Probe { - id: git - property string version: "1.0.0" - property string describe: "1.0.0-0-00000000" - configure: { - if(project.gitVersion) { - var meta = GitRepo.read(project.sourceDirectory); - version = meta.version; - describe = meta.describe; - } - found = true; - } - } - - cpp.includePaths: ['.'] - cpp.defines: { - if(project.deprecatedWarnings) - defines.push("QT_DEPRECATED_WARNINGS", "QT_DISABLE_DEPRECATED_BEFORE=0x050700"); - if(git.found) - defines.push('VERSION="'+git.version+'"'); - return defines; - } - - files: [ - "browser.cpp", - "browser.h", - "data/icon.svg", - "data/resources.qrc", - "forms/blockerdialog.cpp", - "forms/blockerdialog.h", - "forms/blockerdialog.ui", - "forms/bookmarksdialog.cpp", - "forms/bookmarksdialog.h", - "forms/bookmarksdialog.ui", - "forms/downloaddialog.cpp", - "forms/downloaddialog.h", - "forms/downloaddialog.ui", - "forms/profiledialog.cpp", - "forms/profiledialog.h", - "forms/profiledialog.ui", - "main.cpp", - "mainwindow.cpp", - "mainwindow.h", - "mainwindow.ui", - "settings.cpp", - "settings.h", - "webengine/blockerrule.cpp", - "webengine/blockerrule.h", - "webengine/blockersubscription.cpp", - "webengine/blockersubscription.h", - "webengine/downloaditemform.cpp", - "webengine/downloaditemform.h", - "webengine/downloaditemform.ui", - "webengine/regexp.cpp", - "webengine/regexp.h", - "webengine/urlinterceptor.cpp", - "webengine/urlinterceptor.h", - "webengine/webengineprofile.cpp", - "webengine/webengineprofile.h", - "webengine/webview.cpp", - "webengine/webview.h", - "widgets/loadingbar.cpp", - "widgets/loadingbar.h", - "widgets/urllineedit.cpp", - "widgets/urllineedit.h", - "widgets/webviewtabbar.cpp", - "widgets/webviewtabbar.h", - "xbel/xbel.cpp", - "xbel/xbel.h", - ] - - Depends { name: "Qt"; submodules: ["core", "widgets", "webengine", "webenginewidgets"] } - - // Properties for the produced executable - Group { - fileTagsFilter: product.type // filter selects produced executable - qbs.install: true // install it - } - } -} -- cgit v1.2.1