Skip to content

GitLab

Commit c13d934b authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files
Options

macx: compile doc into the right directory instead of copying it later

parent 0271da5f
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 13 deletions
doc/doc.pri
View file @ c13d934b
...@@ -12,7 +12,7 @@ unix { ...@@ -12,7 +12,7 @@ unix {
} }
QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
QCH_FILE = $$OUT_PWD/share/doc/qtcreator/qtcreator.qch QCH_FILE = $$IDE_DOC_PATH/qtcreator.qch
unix { unix {
html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
...@@ -22,7 +22,7 @@ html_docs.commands = \"$$QDOC $$PWD/qtcreator.qdocconf\" ...@@ -22,7 +22,7 @@ html_docs.commands = \"$$QDOC $$PWD/qtcreator.qdocconf\"
html_docs.depends += $$PWD/qtcreator.qdoc $$PWD/qtcreator.qdocconf html_docs.depends += $$PWD/qtcreator.qdoc $$PWD/qtcreator.qdocconf
html_docs.files = $$QHP_FILE html_docs.files = $$QHP_FILE
qch_docs.commands = $$HELPGENERATOR -o $$QCH_FILE $$QHP_FILE 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
...@@ -32,17 +32,8 @@ unix:!macx { ...@@ -32,17 +32,8 @@ unix:!macx {
INSTALLS += qch_docs INSTALLS += qch_docs
} }
macx { docs.depends = qch_docs
DOC_DIR = "$${OUT_PWD}/bin/Qt Creator.app/Contents/Resources/doc" QMAKE_EXTRA_TARGETS += html_docs qch_docs docs
cp_docs.commands = mkdir -p \"$${DOC_DIR}\" ; $${QMAKE_COPY} \"$${QCH_FILE}\" \"$${DOC_DIR}\"
cp_docs.depends += qch_docs
docs.depends = cp_docs
QMAKE_EXTRA_TARGETS += html_docs qch_docs cp_docs docs
}
!macx {
docs.depends = qch_docs
QMAKE_EXTRA_TARGETS += html_docs qch_docs docs
}
OTHER_FILES = $$PWD/qtcreator.qdoc \ OTHER_FILES = $$PWD/qtcreator.qdoc \
$$PWD/qtcreator.qdocconf $$PWD/qtcreator.qdocconf
......
qtcreator.pri
View file @ c13d934b
...@@ -60,6 +60,7 @@ macx { ...@@ -60,6 +60,7 @@ macx {
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH
IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
IDE_DATA_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources IDE_DATA_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
IDE_DOC_PATH = $$IDE_DATA_PATH/doc
contains(QT_CONFIG, ppc):CONFIG += ppc x86 contains(QT_CONFIG, ppc):CONFIG += ppc x86
copydata = 1 copydata = 1
} else { } else {
...@@ -74,6 +75,7 @@ macx { ...@@ -74,6 +75,7 @@ macx {
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins
IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator
IDE_DOC_PATH = $$IDE_BUILD_TREE/share/doc/qtcreator
!isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1 !isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1
} }
......
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