Commit Graph

101 Commits

Author SHA1 Message Date
Eike Ziller
75efa76ed0 Packaging: Use x86 instead of i386 for file names.
Change-Id: I56cb84c45e2c9e9410f59a8c8602286242731a19
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-12-19 16:33:49 +01:00
Eike Ziller
89dc3eebd0 Fix deployment of designer plugins.
Task-number: QTCREATORBUG-8256

Change-Id: I9b03debf9c4c918968fcdfd49078218b54a3b09f
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-12-10 13:53:02 +01:00
Eike Ziller
a9186a845d Mac: Allow specifying additional flags for code signing
Change-Id: I74d90b34e9a962cb918e5c93558f2ca2dc058f8d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-28 10:28:34 +01:00
Eike Ziller
8665421a3b Deploy Qt translations on Mac.
Task-number: QTCREATORBUG-8244

Change-Id: I39bd64bb7a3e75b54f3f0b9297a27b460b603cc9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-11-28 09:47:03 +01:00
Eike Ziller
69f8e48de4 Rename the (un)installers.
Windows has a problem with "install" in the name. Use .bin on Linux like
before.

Change-Id: I4f887a8c0442cd9f0a17425f68a36a371ae9f6b7
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2012-10-16 14:04:05 +02:00
Orgad Shaneh
fb89728901 Include qbs files in qmake project tree
Change-Id: I864b1b500d385c91e3cac6725202ad7f48f11b17
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-10-16 12:07:53 +02:00
Eike Ziller
b02e954eff Fix command line arguments for installer generation.
Change-Id: I5b204936fbfc6073f32769ac0bf2196c26b40483
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-09-28 12:50:59 +02:00
Eike Ziller
154f6c859e Add installer target.
Requires Qt Installer Framwork (IFW)

Change-Id: Id78c05f86cc104d29d4ed3ba02baefa20d49fe4f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-09-28 09:35:08 +02:00
Eike Ziller
14a2ff598a Consolidate the bindist make target setup
Change-Id: Ic6928f2eab43930dc1920bd774798e899a76cabd
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-09-27 19:11:45 +02:00
Daniel Molkentin
745cb4b7ec 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: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-09-25 10:14:51 +02:00
Eike Ziller
b56b1c7d59 Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)."
It depends on and mixes in changes made in another change on gerrit
that is not merged, so it breaks the package build.

This reverts commit c29bf6f652.

Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-07 10:02:40 +02:00
Daniel Molkentin
c29bf6f652 Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).
Reason: $INSTALL_ROOT is only meant to be used by packagers
to temporarily put the contents into a different location,
which is needed for fakeroot packaging.

QTC_PREFIX is not a qmake variable, and defaults to
/usr/local. On Windows the default prefix is "QtCreator",
since "make install" is expected to be used in
a packaging context only where either INSTALL_ROOT
should be used or QTC_PREFIX should be set to the
absolute destination path where e.g. an installer
generator will pick it up.

Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-05 16:37:42 +02:00
Eike Ziller
e518cdd44b Mac: Add make target for code signing.
Use like this:
SIGNING_IDENTITY="My ID" make codesign

Change-Id: Id71547a7e5926c34b6dad22017b5005791419cf0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-03 15:45:32 +02:00
Oswald Buddenhagen
e5e6cdd11e bump qt dependency to 4.8
Change-Id: I5aa424bacf9f66761d335f5b53734453ee864b80
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-29 08:23:43 +02:00
Eike Ziller
04bc18eaa5 Win: Don't require interaction with "make deployartifacts"
Change-Id: Ieacef53be501fdddc16c10e9facbb3937cbd37b4
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-08-28 15:13:27 +02:00
Daniel Molkentin
3fe2113a2b Fixes for bindist target.
Change-Id: Iab025ed796e807aab0315a583a04ed8865fc0d44
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-01-30 15:15:43 +01:00
Daniel Molkentin
c03b9b0c86 Add deployartifacts command
Deploys prebuilt artifacts from remote repository.
Currently only used on Windows, includes
the 64 bit debugging helper and a stable version
of jom, taken from an external repository.

Change-Id: I9f034f184f94bf4e0b088338cde6d8e0d6c7d419
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-01-30 14:06:53 +01:00
Eike Ziller
d8a3b3a1e9 Mac/deployqt: Give qmlpuppet the correct qt.conf
Change-Id: I73162205f8ed9978eeaca2a91e331d2e323b15ef
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-01-24 17:21:13 +01:00
Daniel Molkentin
ab079b86cf Add platform names and versions
Also introduce $INSTALL_EDITION env var which acts as infix.
(possible values: opensource, commercial, etc)

Change-Id: I86f58444b21853ae4bcb8509e491610c76c414da
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-18 15:53:50 +01:00
Daniel Molkentin
ccb0a1bf9e Add make dmg target
Change-Id: I643d571afbb7b16f860092c885e3574268f91ddf
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-17 09:53:10 +01:00
Daniel Molkentin
de26dad959 Add bindist and deployqt targets
Change-Id: Ide9a41d34e73e99959fca18053e06978f724b5aa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-12 19:24:30 +01:00
Orgad Shaneh
25e8590dfe Include dist/changes-* in OTHER_FILES
Change-Id: Ib71ba41407309bcea82fecc668bb965eed42f3c7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-12-12 08:29:46 +01:00
Eike Ziller
b0efd44d20 Merge remote-tracking branch 'origin/2.3'
Conflicts:
	qtcreator.pri
	qtcreator.pro
	share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
	src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
	src/plugins/remotelinux/remotelinuxruncontrol.cpp

Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
2011-09-15 11:50:29 +02:00
Kai Koehne
e66a19806e Add changes-2.4.0 file
Change-Id: Ic6b59e9a40134b1e37e64170bcf12388c535014a
Reviewed-on: http://codereview.qt-project.org/4794
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-09-13 16:46:06 +02:00
Kai Koehne
f4e59af18d List new changes-2.3.1 file in qtcreator.pro
Change-Id: I611935b4c993d70a566fe1cbc6bcf5eb362339c2
Reviewed-on: http://codereview.qt.nokia.com/4349
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-09-07 13:31:13 +02:00
Oswald Buddenhagen
4078fba4ec re-add LD_LIBRARY_PATH script
we need to override RUNPATHs from possible plugins.

due to d7d23226, this should not re-introduce QTCREATORBUG-1646.

unlike in the previous incarnation, we don't replace the binary with the
script, but give the script an extension. this is nicer for packagers
and less confusing in creator's own run configurations. the .desktop
files created by our installers need to be adjusted for that.

Task-number: QTCREATORBUG-5565
Change-Id: Icd2fa55456754a05257376b8288e8bdf423c62db
Reviewed-on: http://codereview.qt.nokia.com/3180
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2011-08-18 15:40:11 +02:00
Daniel Molkentin
9743b43663 Make Components installable. Fix Shadow Build.
Task-Number: QTCREATORBUG-5672
Done-with: Oswald Buddenhagen
Change-Id: I61f8a83205bc338ba12e43b7471eaa957da2b004
Reviewed-on: http://codereview.qt.nokia.com/2451
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-08-03 16:12:35 +02:00
Eike Ziller
1a63d5e625 Update Qt requirement.
Change-Id: I8d3eb57a3cb41c4bfd01defc3f5c512a46a7a428
Reviewed-on: http://codereview.qt.nokia.com/1652
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-07-14 11:19:17 +02:00
Eike Ziller
b37fda1aa7 Add dist files to OTHER_FILES
Change-Id: I32f525a2478d4442041c52f22f972202ca61f0b8
Reviewed-on: http://codereview.qt.nokia.com/1231
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-07-06 13:32:33 +02:00
Bill King
2e12b0f079 Remove tests from the root project to clean up tree/targets in creator. 2010-07-19 10:59:01 +10:00
ck
44d45df34f Fix unintended change. 2010-07-07 17:04:30 +02:00
ck
608fcf3123 Maemo: Correctly deploy subdirs projects.
Task-number: QTCREATORBUG-1614, QTCREATORBUG-1810
Reviewed-by: kh1
2010-07-07 14:51:46 +02:00
Bill King
c9710052bb Fix autotests so that they're compiling again. 2010-07-06 14:37:45 +10:00
dt
2bd2373b38 Remove LD_LIBRARY_PATH script.
Christian Kamm convinced me that it should not have any effect.

Reviewed-By: ckamm

Task-Nr: QTCREATORBUG-1646
2010-06-22 12:47:04 +02:00
Oswald Buddenhagen
0b52a873bd escape backslashes (or don't use them at all, resp.) 2010-05-26 19:35:21 +02:00
Robert Loehning
83db17bac9 Increased needed Qt version to 4.7
Reviewed-by: con
2010-03-02 19:19:10 +01:00
Thorbjørn Lindeijer
881f62e965 Fixed printing of the current Qt version number
The final dot was confusing qmake, apparently considered part of the
variable name.
2009-11-16 13:08:04 +01:00
con
147131f777 Check for Qt 4.6 when building Qt Creator 2009-09-02 10:27:35 +02:00
Oswald Buddenhagen
e47689449d fix shadow build detection 2009-05-06 20:25:20 +02:00
Oswald Buddenhagen
5562f71df6 simplify version check 2009-05-06 20:25:20 +02:00
Oswald Buddenhagen
c38cb83d05 revamp the build system regarding translations 2009-04-20 16:51:10 +02:00
Oswald Buddenhagen
13f04d8430 revamp build system
now bin and share are not pegged to linking the executable any more,
but are proper subdirs targets of their own.
unforturnately, qmake is a bit tenacious, so we hack around a bit. :)

more or less in passing by, i removed some superfluous trailing slashes
and added path normalization as well.
2009-04-20 16:51:10 +02:00
Oswald Buddenhagen
382ec11ef5 add ts and qm build targets
this is based on patches from axasia, which are in turn an almost
literal copy from qt.
2009-02-27 21:13:41 +01:00
con
cc65b3949a Fixes: - Resources (templates etc) on Mac 2009-01-27 12:42:28 +01:00
Daniel Molkentin
b18fe47043 Fixes: make install works on linux
Details:  Creator on Linux works now in two modes:
          1) out of the build dir (shadow builds to be tested)
          2) make INSTALL_ROOT=/prefix install
2009-01-21 09:14:22 +01:00
Daniel Molkentin
194175cce7 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.
2009-01-21 08:52:19 +01:00
Daniel Molkentin
a534a1e4d7 More work toward make install on Linux. 2009-01-21 08:52:19 +01:00
dt
dfa436ef3b Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-08 13:04:00 +01:00
con
4501ee9ed5 Fixes: - Mac build (docs) and toplevel "make docs" target
RevBy:    - bjørn
2009-01-07 15:48:44 +01:00
dt
f9a917eb2a Fixes: Move qt version check to qtcreator.pro
RevBy:    con
2008-12-18 16:19:50 +01:00