Commit 194175cc authored by Daniel Molkentin's avatar Daniel Molkentin

Fixes: make install workd

Details:  Make install works now, we just have to agree on layout
details and check for mac compatibility.

Also, plugins will carry no version in their filename anymore starting with
this commit. Versioning happens in the creators pluginloader using the pluginspec file.
parent a534a1e4
...@@ -21,6 +21,11 @@ qch_docs.commands = $$HELPGENERATOR -o $$QCH_FILE $$QHP_FILE ...@@ -21,6 +21,11 @@ qch_docs.commands = $$HELPGENERATOR -o $$QCH_FILE $$QHP_FILE
qch_docs.depends += html_docs qch_docs.depends += html_docs
qch_docs.files = $$QCH_FILE qch_docs.files = $$QCH_FILE
linux-* {
qch_docs.path = /share/doc/qtcreator
INSTALLS += qch_docs
}
macx { macx {
cp_docs.commands = $${QMAKE_COPY_DIR} $${OUT_PWD}/doc $${OUT_PWD}/bin/QtCreator.app/Contents/Resources cp_docs.commands = $${QMAKE_COPY_DIR} $${OUT_PWD}/doc $${OUT_PWD}/bin/QtCreator.app/Contents/Resources
cp_docs.depends += qch_docs cp_docs.depends += qch_docs
......
...@@ -5,26 +5,12 @@ count(TOO_OLD_LIST, 1) { ...@@ -5,26 +5,12 @@ count(TOO_OLD_LIST, 1) {
error("Use at least Qt 4.5.") error("Use at least Qt 4.5.")
} }
include(doc/doc.pri)
linux-* { include(share/share.pri)
isEmpty( LOCATION ) {
LOCATION = /usr/share
}
documentation.files += doc/qtcreator.qch
documentation.path = $$LOCATION/share/qtcreator/doc/qtcreator
share.files += share/qtcreator/*
share.parth = $$LOCATION/share/qtcreator
INSTALLS += \
documentation \
share
}
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
SUBDIRS = src SUBDIRS = src
include(doc/doc.pri) message($$INSTALLS)
...@@ -16,10 +16,6 @@ linux-* { ...@@ -16,10 +16,6 @@ linux-* {
ISGCC33=$$(GCC33) ISGCC33=$$(GCC33)
!equals(ISGCC33, 1):QT += svg dbus !equals(ISGCC33, 1):QT += svg dbus
isEmpty( LOCATION ) {
error("app.pro: including file must define LOCATION (didn't you run qmake from the root dir?)")
}
binaries.files += bin/qtcreator binaries.files += bin/qtcreator
binaries.path = $$LOCATION/bin binaries.path = $$LOCATION/bin
......
...@@ -6,12 +6,6 @@ isEmpty(TEST):CONFIG(debug, debug|release) { ...@@ -6,12 +6,6 @@ isEmpty(TEST):CONFIG(debug, debug|release) {
} }
} }
linux-* {
isEmpty( LOCATION ) {
error("qworkbench.pri: including file must define LOCATION (didn't you run qmake from the root dir?)")
}
}
equals(TEST, 1) { equals(TEST, 1) {
QT +=testlib QT +=testlib
DEFINES += WITH_TESTS DEFINES += WITH_TESTS
...@@ -21,12 +15,14 @@ isEmpty(IDE_BUILD_TREE) { ...@@ -21,12 +15,14 @@ isEmpty(IDE_BUILD_TREE) {
error("qworkbench.pri: including file must define IDE_BUILD_TREE (probably a relative path)") error("qworkbench.pri: including file must define IDE_BUILD_TREE (probably a relative path)")
} }
macx { macx {
IDE_APP_TARGET = QtCreator IDE_APP_TARGET = QtCreator
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/bin/$${IDE_APP_TARGET}.app/Contents/PlugIns IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/bin/$${IDE_APP_TARGET}.app/Contents/PlugIns
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH
contains(QT_CONFIG, ppc):CONFIG += ppc x86 contains(QT_CONFIG, ppc):CONFIG += ppc x86
} else { } else {
IDE_APP_TARGET = qtcreator IDE_APP_TARGET = qtcreator
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/share/qtcreator/lib IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/share/lib/qtcreator
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins/
} }
IDE_APP_PATH = $$IDE_BUILD_TREE/bin IDE_APP_PATH = $$IDE_BUILD_TREE/bin
win32 { win32 {
......
...@@ -24,4 +24,4 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols ...@@ -24,4 +24,4 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
linux-* { linux-* {
target.path = $$LOCATION/lib/qtcreator target.path = $$LOCATION/lib/qtcreator
INSTALLS += target INSTALLS += target
} }
\ No newline at end of file
...@@ -7,7 +7,7 @@ isEmpty(PROVIDER) { ...@@ -7,7 +7,7 @@ isEmpty(PROVIDER) {
PROVIDER = Nokia PROVIDER = Nokia
} }
DESTDIR = $$IDE_LIBRARY_PATH/$$PROVIDER/ DESTDIR = $$IDE_PLUGIN_PATH/$$PROVIDER/
LIBS += -L$$DESTDIR LIBS += -L$$DESTDIR
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins
DEPENDPATH += $$IDE_SOURCE_TREE/src/plugins DEPENDPATH += $$IDE_SOURCE_TREE/src/plugins
...@@ -49,9 +49,11 @@ macx { ...@@ -49,9 +49,11 @@ macx {
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
CONFIG += plugin
linux-* { linux-* {
target.path = $$LOCATION/lib/qtcreator/plugins target.path = /lib/qtcreator/plugins
INSTALLS += target pluginspec.files += $${TARGET}.pluginspec
pluginspec.path = /lib/qtcreator/plugins
INSTALLS += target pluginspec
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment