feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Adapt qbs project files to new installation approach.

Browse Source 
This need a qbs build >= commit 5cdf94de to work properly.

Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2013-01-16 11:27:26 +01:00
parent ed93b998dd
commit 0cf4f0885b
13 changed files with 76 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
lib/qtcreator/qtcomponents/qtcomponents.qbs
View File

@@ -1,90 +1,16 @@
import qbs.base 1.0 import qbs.base 1.0
Product { Product {
type: ["installed_content"]
name: "QtComponents" name: "QtComponents"
Group { Group {
qbs.install: true
qbs.installDir: "lib/qtcreator/qtcomponents/" qbs.installDir: "lib/qtcreator/qtcomponents/"
fileTags: ["install"]
files: [ files: [
"Button.qml", "*.qml",
"ButtonRow.qml",
"CheckBox.qml",
"ChoiceList.qml",
"ContextMenu.qml",
"Dial.qml",
"Frame.qml",
"GroupBox.qml",
"Menu.qml",
"MenuItem.qml",
"ProgressBar.qml",
"RadioButton.qml",
"ScrollArea.qml",
"ScrollBar.qml",
"Slider.qml",
"SpinBox.qml",
"SplitterRow.qml",
"Switch.qml",
"Tab.qml",
"TabBar.qml",
"TabFrame.qml",
"TableColumn.qml",
"TableView.qml",
"TextArea.qml",
"TextField.qml",
"ToolBar.qml",
"ToolButton.qml",
"qmldir", "qmldir",
] "custom",
} "images"
Group {
qbs.installDir: "lib/qtcreator/qtcomponents/custom"
fileTags: ["install"]
prefix: "custom/"
files: [
"BasicButton.qml",
"Button.qml",
"ButtonColumn.qml",
"ButtonGroup.js",
"ButtonRow.qml",
"CheckBox.qml",
"ChoiceList.qml",
"GroupBox.qml",
"ProgressBar.qml",
"Slider.qml",
"SpinBox.qml",
"SplitterRow.qml",
"TextField.qml",
"components.pro",
"qmldir",
]
}
Group {
qbs.installDir: "lib/qtcreator/qtcomponents/custom/behaviors"
fileTags: ["install"]
files: [
"custom/behaviors/ButtonBehavior.qml",
"custom/behaviors/ModalPopupBehavior.qml",
]
}
Group {
qbs.installDir: "lib/qtcreator/qtcomponents/custom/private"
fileTags: ["install"]
files: [
"custom/private/ChoiceListPopup.qml",
]
}
Group {
qbs.installDir: "lib/qtcreator/qtcomponents/images"
fileTags: ["install"]
files: [
"images/folder_new.png",
] ]
} }
} }

15
qbs/pluginspec/pluginspec.qbs
View File

@@ -9,27 +9,14 @@ Module {
property int ide_version_minor: project.ide_version_minor property int ide_version_minor: project.ide_version_minor
property int ide_version_release: project.ide_version_release property int ide_version_release: project.ide_version_release
property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release
property string destdir: product.destination
property var pluginspecreplacements: product.pluginspecreplacements property var pluginspecreplacements: product.pluginspecreplacements
FileTagger {
pattern: "*.in"
fileTags: ["pluginSpecIn"]
}
Rule { Rule {
inputs: ["pluginSpecIn"] inputs: ["pluginSpecIn"]
Artifact { Artifact {
fileTags: ["pluginSpec"] fileTags: ["pluginSpec"]
fileName: { fileName: input.fileName.replace(/\.[^\.]*$/,'')
var destdir = input.modules.pluginspec.destdir;
if (!destdir.match(/\/$/))
destdir += "/";
return destdir + input.fileName.replace(/\.[^\.]*$/,'');
}
} }
prepare: { prepare: {

15
qtcreator.qbs
View File

@@ -136,10 +136,8 @@ Project {
} }
} }
Product { Application {
name: "qtcreator" name: "qtcreator"
type: ["application", "installed_content"]
destination: "bin"
consoleApplication: qbs.debugInformation consoleApplication: qbs.debugInformation
cpp.rpaths: ["$ORIGIN/../lib/qtcreator"] cpp.rpaths: ["$ORIGIN/../lib/qtcreator"]
@@ -177,7 +175,7 @@ Project {
Group { Group {
condition: qbs.targetOS == "linux" || qbs.targetOS == "macx" condition: qbs.targetOS == "linux" || qbs.targetOS == "macx"
files: "bin/qtcreator.sh" files: "bin/qtcreator.sh"
fileTags: "install" qbs.install: true
qbs.installDir: "bin" qbs.installDir: "bin"
} }
@@ -194,6 +192,11 @@ Project {
"src/shared/qtlockedfile/qtlockedfile_win.cpp" "src/shared/qtlockedfile/qtlockedfile_win.cpp"
] ]
} }
}
}
Group {
fileTagsFilter: product.type
qbs.install: true
qbs.installDir: "bin"
}
}
}

7
share/qtcreator/translations/translations.qbs
View File

@@ -4,6 +4,11 @@ Product {
type: "qm" type: "qm"
name: "translations" name: "translations"
Depends { name: "Qt.core" } Depends { name: "Qt.core" }
destination: "share/qtcreator/translations"
files: "*.ts" files: "*.ts"
Group {
fileTagsFilter: product.type
qbs.install: true
qbs.installDir: "share/qtcreator/translations"
}
} }

35
share/share.qbs
View File

@@ -1,31 +1,32 @@
import qbs.base 1.0 import qbs.base 1.0
Product { Product {
type: ["installed_content"]
name: "SharedContent" name: "SharedContent"
Group { Group {
qbs.installDir: "share" qbs.install: true
fileTags: ["install"] qbs.installDir: "share/qtcreator"
files: "qtcreator" prefix: "qtcreator/"
recursive: true files: [
excludeFiles: [ "designer",
"qtcreator/translations", "dumper",
"qtcreator/scripts", "generic-highlighter",
"share.pro", "glsl",
"share.qbs", "qml",
"static.pro", "qmldesigner",
"qmlicons",
"qml-type-descriptions",
"schemes",
"snippets",
"styles",
"templates",
"welcomescreen"
] ]
} }
Group { Group {
fileTags: ["install"] qbs.install: true
files: "qtcreator/scripts/openTerminal.command"
}
Group {
qbs.installDir: "share/qtcreator/externaltools" qbs.installDir: "share/qtcreator/externaltools"
fileTags: ["install"]
prefix: "../src/share/qtcreator/externaltools/" prefix: "../src/share/qtcreator/externaltools/"
files: { files: {
var list = [ var list = [

14
src/libs/QtcLibrary.qbs
View File

@@ -15,15 +15,19 @@ DynamicLibrary {
} }
cpp.includePaths: [ "." ] cpp.includePaths: [ "." ]
destination: { ProductModule {
Depends { name: "cpp" }
cpp.includePaths: [ "." ]
}
Group {
fileTagsFilter: product.type
qbs.install: true
qbs.installDir: {
if (qbs.targetOS == "windows") if (qbs.targetOS == "windows")
return "bin" return "bin"
else else
return "lib/qtcreator" return "lib/qtcreator"
} }
ProductModule {
Depends { name: "cpp" }
cpp.includePaths: [ "." ]
} }
} }

8
src/libs/qtcomponents/styleitem/styleitem.qbs
View File

@@ -3,7 +3,6 @@ import "../../../../qbs/defaults.js" as Defaults
DynamicLibrary { DynamicLibrary {
name: "styleplugin" name: "styleplugin"
destination: "lib/qtcreator/qtcomponents/plugin"
Depends { name: "cpp" } Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["core", "widgets", "declarative", "script"] } Depends { name: "Qt"; submodules: ["core", "widgets", "declarative", "script"] }
@@ -29,5 +28,10 @@ DynamicLibrary {
"qwheelarea.cpp", "qwheelarea.cpp",
"qwheelarea.h", "qwheelarea.h",
] ]
}
Group {
fileTagsFilter: product.type
qbs.install: true
qbs.installDir: "lib/qtcreator/qtcomponents/plugin"
}
}

7
src/plugins/QtcPlugin.qbs
View File

@@ -6,7 +6,6 @@ Product {
type: ["dynamiclibrary", "pluginSpec"] type: ["dynamiclibrary", "pluginSpec"]
property string provider: 'QtProject' property string provider: 'QtProject'
property var pluginspecreplacements property var pluginspecreplacements
destination: "lib/qtcreator/plugins/" + provider
targetName: { targetName: {
// see PluginSpecPrivate::loadLibrary() // see PluginSpecPrivate::loadLibrary()
if (qbs.debugInformation) { if (qbs.debugInformation) {
@@ -40,4 +39,10 @@ Product {
files: [ product.name + ".pluginspec.in" ] files: [ product.name + ".pluginspec.in" ]
fileTags: ["pluginSpecIn"] fileTags: ["pluginSpecIn"]
} }
Group {
fileTagsFilter: product.type
qbs.install: true
qbs.installDir: "lib/qtcreator/plugins/" + provider
}
} }

2
src/plugins/android/android.qbs
View File

@@ -13,7 +13,7 @@ QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] } Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
property bool enable: false property bool enable: false
property var pluginspecreplacements: ({"ANDROID_EXPERIMENTAL_STR": (enable ? "false": "true")}) pluginspecreplacements: ({"ANDROID_EXPERIMENTAL_STR": (enable ? "false": "true")})
cpp.includePaths: base.concat("../../shared") cpp.includePaths: base.concat("../../shared")

17
src/plugins/coreplugin/images/logo/logo.qbs
View File

@@ -2,54 +2,53 @@ import qbs.base 1.0
Product { Product {
condition: qbs.targetOS == "linux" condition: qbs.targetOS == "linux"
type: ["installed_content"]
name: "LogoImages" name: "LogoImages"
Group { Group {
qbs.install: true
qbs.installDir: "share/icons/hicolor/16x16/apps" qbs.installDir: "share/icons/hicolor/16x16/apps"
fileTags: ["install"]
files: ["16/QtProject-qtcreator.png"] files: ["16/QtProject-qtcreator.png"]
} }
Group { Group {
qbs.install: true
qbs.installDir: "share/icons/hicolor/24x24/apps" qbs.installDir: "share/icons/hicolor/24x24/apps"
fileTags: ["install"]
files: ["24/QtProject-qtcreator.png"] files: ["24/QtProject-qtcreator.png"]
} }
Group { Group {
qbs.install: true
qbs.installDir: "share/icons/hicolor/32x32/apps" qbs.installDir: "share/icons/hicolor/32x32/apps"
fileTags: ["install"]
files: ["32/QtProject-qtcreator.png"] files: ["32/QtProject-qtcreator.png"]
} }
Group { Group {
qbs.install: true
qbs.installDir: "share/icons/hicolor/48x48/apps" qbs.installDir: "share/icons/hicolor/48x48/apps"
fileTags: ["install"]
files: ["48/QtProject-qtcreator.png"] files: ["48/QtProject-qtcreator.png"]
} }
Group { Group {
qbs.install: true
qbs.installDir: "share/icons/hicolor/64x64/apps" qbs.installDir: "share/icons/hicolor/64x64/apps"
fileTags: ["install"]
files: ["64/QtProject-qtcreator.png"] files: ["64/QtProject-qtcreator.png"]
} }
Group { Group {
qbs.install: true
qbs.installDir: "share/icons/hicolor/128x128/apps" qbs.installDir: "share/icons/hicolor/128x128/apps"
fileTags: ["install"]
files: ["128/QtProject-qtcreator.png"] files: ["128/QtProject-qtcreator.png"]
} }
Group { Group {
qbs.install: true
qbs.installDir: "share/icons/hicolor/256x256/apps" qbs.installDir: "share/icons/hicolor/256x256/apps"
fileTags: ["install"]
files: ["256/QtProject-qtcreator.png"] files: ["256/QtProject-qtcreator.png"]
} }
Group { Group {
qbs.install: true
qbs.installDir: "share/icons/hicolor/512x512/apps" qbs.installDir: "share/icons/hicolor/512x512/apps"
fileTags: ["install"]
files: ["512/QtProject-qtcreator.png"] files: ["512/QtProject-qtcreator.png"]
} }
} }

3
src/plugins/debugger/debugger.qbs
View File

@@ -5,7 +5,6 @@ import "../../../qbs/defaults.js" as Defaults
QtcPlugin { QtcPlugin {
name: "Debugger" name: "Debugger"
type: base.concat(["installed_content"])
Depends { name: "Qt"; submodules: ["widgets", "network", "script"] } Depends { name: "Qt"; submodules: ["widgets", "network", "script"] }
Depends { name: "Core" } Depends { name: "Core" }
@@ -29,8 +28,8 @@ QtcPlugin {
Group { Group {
condition: Defaults.testsEnabled(qbs) condition: Defaults.testsEnabled(qbs)
qbs.install: true
qbs.installDir: "tests/manual/debugger/simple/" qbs.installDir: "tests/manual/debugger/simple/"
fileTags: ["install"]
files: ["../../../tests/manual/debugger/simple/simple.pro"] files: ["../../../tests/manual/debugger/simple/simple.pro"]
} }

2
src/plugins/updateinfo/updateinfo.qbs
View File

@@ -11,7 +11,7 @@ QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] } Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
property bool enable: false property bool enable: false
property var pluginspecreplacements: ({"UPDATEINFO_EXPERIMENTAL_STR": (enable ? "false": "true")}) pluginspecreplacements: ({"UPDATEINFO_EXPERIMENTAL_STR": (enable ? "false": "true")})
cpp.includePaths: [ cpp.includePaths: [
"..", "..",

6
src/tools/QtcTool.qbs
View File

@@ -9,5 +9,9 @@ Application {
return ["-Wl,-s"] return ["-Wl,-s"]
} }
destination: "bin" Group {
fileTagsFilter: product.type
qbs.install: true
qbs.installDir: "bin"
}
} }