From aec1e26228f7514db0170bfb02e057f8c0343b86 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Thu, 22 Jan 2009 10:14:09 +0100
Subject: [PATCH] Fixes: Document rpath, fix resource targets on mac and
linux
---
share/share.pri | 81 +++++++++++++++++++++++++++++++++++++++++++++++++
src/rpath.pri | 2 +-
2 files changed, 82 insertions(+), 1 deletion(-)
create mode 100644 share/share.pri
diff --git a/share/share.pri b/share/share.pri
new file mode 100644
index 00000000000..50fa37a71a0
--- /dev/null
+++ b/share/share.pri
@@ -0,0 +1,81 @@
+macx {
+ SNIPPETS.path = Contents/Resources
+ SNIPPETS.files = $$PWD/qtcreator/snippets
+ TEMPLATES.path = Contents/Resources
+ TEMPLATES.files = $$PWD/qtcreator/templates
+ DESIGNER.path = Contents/Resources
+ DESIGNER.files = $$PWD/qtcreator/designer
+ SCHEMES.path = Contents/Resources
+ SCHEMES.files = $$PWD/qtcreator/schemes
+ GDBDEBUGGER.path = Contents/Resources
+ GDBDEBUGGER.files = $$PWD/qtcreator/gdbmacros
+ LICENSE.path = Contents/Resources
+ LICENSE.files = $$PWD/qtcreator/license.txt
+ RUNINTERMINAL.path = Contents/Resources
+ RUNINTERMINAL.files = $$PWD/qtcreator/runInTerminal.command
+ QMAKE_BUNDLE_DATA += SNIPPETS TEMPLATES DESIGNER SCHEMES GDBDEBUGGER LICENSE RUNINTERMINAL
+ QMAKE_INFO_PLIST = $$PWD/qtcreator/info.plist
+}
+
+win32 {
+ # make sure the resources are in place
+ !exists($$OUT_PWD/app.pro) {
+ unix:SEPARATOR = ;
+ win32:SEPARATOR = &
+ # we are shadow build
+ COPYSRC = snippets \
+ templates \
+ designer \
+ schemes \
+ gdbmacros
+ COPYDEST = $${OUT_PWD}/../../bin
+ win32:COPYDEST ~= s|/+|\|
+ for(tmp,COPYSRC) {
+ REALSRC = $$PWD/$$tmp
+ REALDEST = $$COPYDEST/$$tmp
+ win32:tmp ~= s|/+|\|
+ win32:REALSRC ~= s|/+|\|
+ win32:REALDEST ~= s|/+|\|
+ QMAKE_POST_LINK += $${QMAKE_COPY_DIR} $${REALSRC} $${REALDEST} $$SEPARATOR
+ }
+ }
+}
+
+linux-* {
+ licenses.files += $$PWD/qtcreator/license.txt
+ licenses.path = /share/qtcreator
+
+ keymaps.files += $$PWD/qtcreator/schemes/MS_Visual_C++.kms
+ keymaps.files += $$PWD/qtcreator/schemes/Xcode.kms
+ keymaps.path = /share/qtcreator/schemes
+
+ gdbsupport.files += $$PWD/qtcreator/gdbmacros/GPL_EXCEPTION.TXT
+ gdbsupport.files += $$PWD/qtcreator/gdbmacros/gdbmacros.cpp
+ gdbsupport.files += $$PWD/qtcreator/gdbmacros/gdbmacros.pro
+ gdbsupport.path = /share/qtcreator/gdbmacros
+
+ designertemplates.files += $$PWD/qtcreator/designer/templates.xml
+ designertemplates.files += $$PWD/qtcreator/designer/templates/*
+ designertemplates.path = /share/qtcreator/designer/templates
+
+ snippets.files += $$PWD/qtcreator/snippets/*.snp
+ snippets.path = /share/qtcreator/snippets
+
+ projecttemplates.files += $$PWD/qtcreator/templates/qt4project/mywidget_form.h
+ projecttemplates.files += $$PWD/qtcreator/templates/qt4project/main.cpp
+ projecttemplates.files += $$PWD/qtcreator/templates/qt4project/mywidget.cpp
+ projecttemplates.files += $$PWD/qtcreator/templates/qt4project/mywidget.h
+ projecttemplates.files += $$PWD/qtcreator/templates/qt4project/widget.ui
+ projecttemplates.files += $$PWD/qtcreator/templates/qt4project/mywidget_form.cpp
+ projecttemplates.path = /share/qtcreator/templates/qt4project
+
+ INSTALLS += \
+ licenses \
+ keymaps \
+ gdbsupport \
+ designertemplates \
+ snippets \
+ projecttemplates
+
+}
+
diff --git a/src/rpath.pri b/src/rpath.pri
index bcf009be468..e6812dbc23a 100644
--- a/src/rpath.pri
+++ b/src/rpath.pri
@@ -1,8 +1,8 @@
macx {
- # this is needed for the binary itself?
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/
} else:linux-* {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
+ # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
QMAKE_RPATHDIR += \$\$ORIGIN/../lib/qtcreator
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
--
GitLab