Skip to content

Commit

Permalink
Improved qbs build support
Browse files Browse the repository at this point in the history
  • Loading branch information
@andibacher
andibacher committed Jan 13, 2018
1 parent a5643ff commit d050984
Show file tree
Hide file tree
Showing 3 changed files with 146 additions and 136 deletions.
18 changes: 9 additions & 9 deletions examples/basic/basic.qbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ Product {
type: "application"
consoleApplication: true
name : "basic"
files :
[ "main.cpp",
"loggerobject.cpp",
"loggerobject.h",
"loggerobjectprio.cpp",
"loggerobjectprio.h",
"loggerstatic.cpp",
"loggerstatic.h"
]
files :
[ "main.cpp",
"loggerobject.cpp",
"loggerobject.h",
"loggerobjectprio.cpp",
"loggerobjectprio.h",
"loggerstatic.cpp",
"loggerstatic.h"
]
destinationDirectory: "../bin"
Depends { name: "cpp" }
Depends { name: "log4qt" }
Expand Down
4 changes: 2 additions & 2 deletions log4qt.qbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import qbs
Project {
minimumQbsVersion: "1.9.0"
references: [
"src/log4qt/log4qt.qbs",
"examples/examples.qbs",
"others.qbs",
"src/log4qt/log4qt.qbs",
"tests/tests.qbs",
"others.qbs"
]
}

260 changes: 135 additions & 125 deletions src/log4qt/log4qt.qbs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import qbs
import qbs.FileInfo

import "../../log4qtlib.qbs" as ProductLibrary

ProductLibrary {
Expand All @@ -24,146 +26,152 @@ ProductLibrary {

Export {
Depends { name: "cpp" }
cpp.includePaths: product.sourceDirectory
cpp.includePaths: FileInfo.cleanPath(product.sourceDirectory + "/..")
}

files:["appender.h",
"appenderskeleton.h",
"asyncappender.h",
"basicconfigurator.h",
"binaryfileappender.h",
"binarylayout.h",
"binarylogger.h",
"binaryloggingevent.h",
"binarylogstream.h",
"binarytotextlayout.h",
"binarywriterappender.h",
"colorconsoleappender.h",
"consoleappender.h",
"dailyfileappender.h",
"dailyrollingfileappender.h",
"fileappender.h",
"hierarchy.h",
"layout.h",
"level.h",
"log4qt.h",
"log4qtshared.h",
"log4qtsharedptr.h",
"logger.h",
"loggerrepository.h",
"loggingevent.h",
"logmanager.h",
"logstream.h",
"mainthreadappender.h",
"mdc.h",
"ndc.h",
"patternlayout.h",
"propertyconfigurator.h",
"qmllogger.h",
"rollingbinaryfileappender.h",
"rollingfileappender.h",
"signalappender.h",
"simplelayout.h",
"simpletimelayout.h",
"systemlogappender.h",
"ttcclayout.h",
"writerappender.h",
"xmllayout.h",
"appender.cpp",
"appenderskeleton.cpp",
"basicconfigurator.cpp",
"colorconsoleappender.cpp",
"consoleappender.cpp",
"dailyrollingfileappender.cpp",
"asyncappender.cpp",
"dailyfileappender.cpp",
"mainthreadappender.cpp",
"fileappender.cpp",
"hierarchy.cpp",
"layout.cpp",
"level.cpp",
"logger.cpp",
"loggerrepository.cpp",
"loggingevent.cpp",
"logmanager.cpp",
"mdc.cpp",
"ndc.cpp",
"patternlayout.cpp",
"propertyconfigurator.cpp",
"rollingfileappender.cpp",
"signalappender.cpp",
"simplelayout.cpp",
"simpletimelayout.cpp",
"ttcclayout.cpp",
"writerappender.cpp",
"systemlogappender.cpp",
"logstream.cpp",
"binaryloggingevent.cpp",
"binarylogger.cpp",
"binarytotextlayout.cpp",
"binarywriterappender.cpp",
"binaryfileappender.cpp",
"binarylogstream.cpp",
"rollingbinaryfileappender.cpp",
"binarylayout.cpp",
"xmllayout.cpp",
"qmllogger.cpp"]
files: [
"appender.cpp",
"appender.h",
"appenderskeleton.cpp",
"appenderskeleton.h",
"asyncappender.cpp",
"asyncappender.h",
"basicconfigurator.cpp",
"basicconfigurator.h",
"binaryfileappender.cpp",
"binaryfileappender.h",
"binarylayout.cpp",
"binarylayout.h",
"binarylogger.cpp",
"binarylogger.h",
"binaryloggingevent.cpp",
"binaryloggingevent.h",
"binarylogstream.cpp",
"binarylogstream.h",
"binarytotextlayout.cpp",
"binarytotextlayout.h",
"binarywriterappender.cpp",
"binarywriterappender.h",
"colorconsoleappender.cpp",
"colorconsoleappender.h",
"consoleappender.cpp",
"consoleappender.h",
"dailyfileappender.cpp",
"dailyfileappender.h",
"dailyrollingfileappender.cpp",
"dailyrollingfileappender.h",
"fileappender.cpp",
"fileappender.h",
"hierarchy.cpp",
"hierarchy.h",
"layout.cpp",
"layout.h",
"level.cpp",
"level.h",
"log4qt.h",
"log4qtshared.h",
"log4qtsharedptr.h",
"logger.cpp",
"logger.h",
"loggerrepository.cpp",
"loggerrepository.h",
"loggingevent.cpp",
"loggingevent.h",
"logmanager.cpp",
"logmanager.h",
"logstream.cpp",
"logstream.h",
"mainthreadappender.cpp",
"mainthreadappender.h",
"mdc.cpp",
"mdc.h",
"ndc.cpp",
"ndc.h",
"patternlayout.cpp",
"patternlayout.h",
"propertyconfigurator.cpp",
"propertyconfigurator.h",
"qmllogger.cpp",
"qmllogger.h",
"rollingbinaryfileappender.cpp",
"rollingbinaryfileappender.h",
"rollingfileappender.cpp",
"rollingfileappender.h",
"signalappender.cpp",
"signalappender.h",
"simplelayout.cpp",
"simplelayout.h",
"simpletimelayout.cpp",
"simpletimelayout.h",
"systemlogappender.cpp",
"systemlogappender.h",
"ttcclayout.cpp",
"ttcclayout.h",
"writerappender.cpp",
"writerappender.h",
"xmllayout.cpp",
"xmllayout.h",
]

Group {
name: "helpers"
prefix: "helpers/"
files:[ "appenderattachable.h",
"binaryclasslogger.h",
"classlogger.h",
"configuratorhelper.h",
"datetime.h",
"dispatcher.h",
"factory.h",
"initialisationhelper.h",
"logerror.h",
"optionconverter.h",
"patternformatter.h",
"properties.h",
"binaryclasslogger.cpp",
"classlogger.cpp",
"appenderattachable.cpp",
"configuratorhelper.cpp",
"datetime.cpp",
"factory.cpp",
"initialisationhelper.cpp",
"logerror.cpp",
"optionconverter.cpp",
"patternformatter.cpp",
"properties.cpp",
"dispatcher.cpp" ]
files: [
"appenderattachable.cpp",
"appenderattachable.h",
"binaryclasslogger.cpp",
"binaryclasslogger.h",
"classlogger.cpp",
"classlogger.h",
"configuratorhelper.cpp",
"configuratorhelper.h",
"datetime.cpp",
"datetime.h",
"dispatcher.cpp",
"dispatcher.h",
"factory.cpp",
"factory.h",
"initialisationhelper.cpp",
"initialisationhelper.h",
"logerror.cpp",
"logerror.h",
"optionconverter.cpp",
"optionconverter.h",
"patternformatter.cpp",
"patternformatter.h",
"properties.cpp",
"properties.h",
]
}

Group {
name: "spi"
prefix: "spi/"
files:[ "filter.h",
"filter.cpp"]
"filter.cpp" ]
}

Group {
name: "varia"
prefix: "varia/"
files:[ "binaryeventfilter.h",
"debugappender.h",
"denyallfilter.h",
"levelmatchfilter.h",
"levelrangefilter.h",
"listappender.h",
"nullappender.h",
"stringmatchfilter.h",
"binaryeventfilter.cpp",
"debugappender.cpp",
"denyallfilter.cpp",
"levelmatchfilter.cpp",
"levelrangefilter.cpp",
"listappender.cpp",
"nullappender.cpp",
"stringmatchfilter.cpp" ]
files: [
"binaryeventfilter.cpp",
"binaryeventfilter.h",
"debugappender.cpp",
"debugappender.h",
"denyallfilter.cpp",
"denyallfilter.h",
"levelmatchfilter.cpp",
"levelmatchfilter.h",
"levelrangefilter.cpp",
"levelrangefilter.h",
"listappender.cpp",
"listappender.h",
"nullappender.cpp",
"nullappender.h",
"stringmatchfilter.cpp",
"stringmatchfilter.h",
]
}

Group {
Expand All @@ -179,7 +187,8 @@ ProductLibrary {
condition: Qt.network.present
files: [
"telnetappender.h",
"telnetappender.cpp" ]
"telnetappender.cpp"
]
}

Group {
Expand All @@ -189,6 +198,7 @@ ProductLibrary {
"databaseappender.h",
"databaselayout.h",
"databaseappender.cpp",
"databaselayout.cpp" ]
"databaselayout.cpp"
]
}
}

0 comments on commit d050984

Please sign in to comment.