Commit 745cb4b7 authored by Daniel Molkentin's avatar Daniel Molkentin Committed by Eike Ziller

Introduce $$QTC_PREFIX

'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/...

This is used for giving the contents of the 7zips an additional prefix.
(previously done by doing an additional copying step in bindistHelper).
QTC_PREFIX can also be used to give Qt Creator a different install path
at qmake time, and defaults to /usr/local on Linux.
On Windows and Mac there is no default for QTC_PREFIX.

Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make &&
INSTALL_ROOT=/tmp/creator-dist make install

Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
parent 4e4580d4
......@@ -9,7 +9,7 @@ QMAKE_STRIP =
QMAKE_CLEAN = qtcreator.sh
target.path = /bin
target.path = $$QTC_PREFIX/bin
INSTALLS += target
OTHER_FILES = $$PWD/qtcreator.sh
......@@ -78,12 +78,12 @@ dev_qch_docs.depends += dev_html_docs
!macx {
inst_qch_docs.files = $$QCH_FILE
inst_qch_docs.path = /share/doc/qtcreator
inst_qch_docs.path = $$QTC_PREFIX/share/doc/qtcreator
inst_qch_docs.CONFIG += no_check_exist no_default_install
INSTALLS += inst_qch_docs
inst_dev_qch_docs.files = $$DEV_QCH_FILE
inst_dev_qch_docs.path = /share/doc/qtcreator
inst_dev_qch_docs.path = $$QTC_PREFIX/share/doc/qtcreator
inst_dev_qch_docs.CONFIG += no_check_exist no_default_install
INSTALLS += inst_dev_qch_docs
......
......@@ -52,6 +52,6 @@ DATA_FILE_PATTERNS = \
!macx {
qmlfiles.files = $$PWD/*.qml $$PWD/qmldir $$PWD/images $$PWD/custom
qmlfiles.path = /$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents
qmlfiles.path = $$QTC_PREFIX/$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents
INSTALLS += qmlfiles
}
......@@ -3,6 +3,10 @@ QTCREATOR_PRI_INCLUDED = 1
QTCREATOR_VERSION = 2.5.83
isEmpty(QTC_PREFIX) {
unix:!macx: QTC_PREFIX = /usr/local
}
isEqual(QT_MAJOR_VERSION, 5) {
defineReplace(cleanPath) {
......
......@@ -26,19 +26,23 @@ macx {
dmg.depends = deployqt
QMAKE_EXTRA_TARGETS += codesign dmg
} else {
deployqt.commands = $$PWD/scripts/deployqt.py -i $(INSTALL_ROOT)
deployqt.commands = $$PWD/scripts/deployqt.py -i \"$(INSTALL_ROOT)$$QTC_PREFIX\"
deployqt.depends = install
win32 {
bindist.commands ~= s,/,\\\\,g
deployqt.commands ~= s,/,\\\\,g
deployartifacts.depends = install
PLATFORM="windows"
deployartifacts.commands = git clone "git://gitorious.org/qt-creator/binary-artifacts.git"&& xcopy /s /q /y /i "binary-artifacts\\win32" $(INSTALL_ROOT)&& rmdir /s /q binary-artifacts
deployartifacts.commands = git clone "git://gitorious.org/qt-creator/binary-artifacts.git"&& xcopy /s /q /y /i "binary-artifacts\\win32" \"$(INSTALL_ROOT)$$QTC_PREFIX\"&& rmdir /s /q binary-artifacts
QMAKE_EXTRA_TARGETS += deployartifacts
}
else:linux-*:PLATFORM="linux-$${QT_ARCH}"
else:PLATFORM="unknown"
bindist.commands = $$PWD/scripts/bindistHelper.py "$(INSTALL_ROOT)" "$${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX)"
else:linux-*: PLATFORM = "linux-$${QT_ARCH}"
else:PLATFORM = "unknown"
PATTERN = $${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX)
bindist.commands = 7z a -mx9 qt-creator-$${PATTERN}.7z \"$(INSTALL_ROOT)$$QTC_PREFIX\"
win32 {
bindist.commands ~= s,/,\\\\,g
}
}
bindist.depends = deployqt
QMAKE_EXTRA_TARGETS += deployqt bindist
#!/usr/bin/env python
################################################################################
# Copyright (c) 2011 Nokia Corporation
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# * Neither the name of Nokia Corporation, nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
################################################################################
import os
import sys
import getopt
import subprocess
import tempfile
import re
import shutil
def usage():
print "Usage: %s <creator_install_dir> <pattern>" % os.path.basename(sys.argv[0])
def main():
try:
opts, args = getopt.gnu_getopt(sys.argv[1:], 'h', ['help'])
except:
usage()
sys.exit(2)
for o, a in opts:
if o in ('-h', '--help'):
usage()
sys.exit(0)
if len(args) < 2:
usage()
sys.exit(2)
sourcedir=args[0]
pattern=args[1]
try:
temp_dir = tempfile.mkdtemp()
except:
print "Failed to create a temporary directory!"
sys.exit(2)
try:
formatted_dirname = "qt-creator-%s" % pattern
temp_fullpath = os.path.join(temp_dir, formatted_dirname)
print "Copying files to temporary directory '%s' for packaging..." % temp_fullpath
shutil.copytree(sourcedir, temp_fullpath, symlinks=True)
print "7-zipping temporary directory..."
output = subprocess.check_output(['7z', 'a', '-mx9', formatted_dirname+'.7z', temp_fullpath])
print output
except:
print "Error occured, cleaning up..."
shutil.rmtree(temp_dir)
sys.exit(2)
print "Cleaning up..."
shutil.rmtree(temp_dir)
print "Done."
if __name__ == "__main__":
if sys.platform == 'darwin':
print "Mac OS does not require this script!"
sys.exit(2)
else:
main()
......@@ -36,6 +36,6 @@ macx {
info.output = $$DESTDIR/$${TARGET}.app/Contents/Info.plist
QMAKE_SUBSTITUTES += info
} else {
target.path = /bin
target.path = $$QTC_PREFIX/bin
INSTALLS += target
}
......@@ -21,6 +21,6 @@ macx {
info.output = $$DESTDIR/$${TARGET}.app/Contents/Info.plist
QMAKE_SUBSTITUTES += info
} else {
target.path = /bin
target.path = $$QTC_PREFIX/bin
INSTALLS += target
}
......@@ -63,7 +63,7 @@ OTHER_FILES += $$FILES
!macx {
for(data_dir, DATA_DIRS) {
eval($${data_dir}.files = $$quote($$PWD/$$data_dir))
eval($${data_dir}.path = /share/qtcreator)
eval($${data_dir}.path = $$QTC_PREFIX/share/qtcreator)
INSTALLS += $$data_dir
}
} else {
......@@ -116,7 +116,7 @@ QMAKE_EXTRA_COMPILERS += unconditionalCopy2build
!macx {
for(data_dir, DATA_DIRS) {
eval($${data_dir}.files = $$IDE_DATA_PATH/$$data_dir)
eval($${data_dir}.path = /share/qtcreator)
eval($${data_dir}.path = $$QTC_PREFIX/share/qtcreator)
eval($${data_dir}.CONFIG += no_check_exist)
INSTALLS += $$data_dir
}
......
......@@ -120,6 +120,6 @@ isEmpty(vcproj) {
}
qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/qtcreator_,.qm)
qmfiles.path = /share/qtcreator/translations
qmfiles.path = $$QTC_PREFIX/share/qtcreator/translations
qmfiles.CONFIG += no_check_exist
INSTALLS += qmfiles
......@@ -17,7 +17,7 @@ QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
}
win32 {
RC_FILE = qtcreator.rc
target.path = /bin
target.path = $$QTC_PREFIX/bin
INSTALLS += target
} else:macx {
LIBS += -framework CoreFoundation
......@@ -29,7 +29,7 @@ win32 {
info.output = $$IDE_BIN_PATH/../Info.plist
QMAKE_SUBSTITUTES = info
} else {
target.path = /bin
target.path = $$QTC_PREFIX/bin
INSTALLS += target
}
......
......@@ -33,6 +33,6 @@ SOURCES += qtmenu.cpp \
qwheelarea.cpp
!macx {
target.path = /$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents/plugin
target.path = $$QTC_PREFIX/$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents/plugin
INSTALLS += target
}
......@@ -82,6 +82,6 @@ HEADERS += extensioncontext.h \
knowntype.h \
symbolgroupnode.h
target.path = /lib/$${DIRNAME}
target.path = $$QTC_PREFIX/lib/$${DIRNAME}
INSTALLS += target
......@@ -17,5 +17,5 @@ build_all:!build_pass {
CONFIG += release
}
target.path = /bin # FIXME: libexec, more or less
target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less
INSTALLS += target
......@@ -20,5 +20,5 @@ unix {
LIBS += -lshell32
}
target.path = /bin # FIXME: libexec, more or less
target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less
INSTALLS += target
......@@ -237,7 +237,7 @@ else:unix {
for(imagesize, IMAGE_SIZE_LIST) {
eval(image$${imagesize}.files = images/logo/$${imagesize}/qtcreator.png)
eval(image$${imagesize}.path = /share/icons/hicolor/$${imagesize}x$${imagesize}/apps)
eval(image$${imagesize}.path = $$QTC_PREFIX/share/icons/hicolor/$${imagesize}x$${imagesize}/apps)
INSTALLS += image$${imagesize}
}
}
......
......@@ -2,6 +2,6 @@ macx {
DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner
} else {
DESTDIR = $$IDE_LIBRARY_PATH/qmldesigner
target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/qmldesigner
target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/qmldesigner
INSTALLS += target
}
......@@ -19,9 +19,9 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
!macx {
win32 {
target.path = /bin
target.path = $$QTC_PREFIX/bin
} else {
target.path = /$$IDE_LIBRARY_BASENAME/qtcreator
target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator
}
INSTALLS += target
}
......@@ -109,9 +109,9 @@ CONFIG += plugin plugin_with_soname
linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
!macx {
target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
pluginspec.files += $${TARGET}.pluginspec
pluginspec.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
pluginspec.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
INSTALLS += target pluginspec
}
......
......@@ -6,7 +6,7 @@ SOURCES += main.cpp
DESTDIR=../../../bin
target.path=/bin
target.path=$$QTC_PREFIX/bin
INSTALLS+=target
include(../../../qtcreator.pri)
......
......@@ -11,5 +11,5 @@ CONFIG -= app_bundle
SOURCES += main.cpp
target.path = /bin # FIXME: libexec, more or less
target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less
INSTALLS += target
......@@ -26,5 +26,5 @@ build_all:!build_pass {
CONFIG += release
}
target.path = /bin # FIXME: libexec, more or less
target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less
INSTALLS += target
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