summaryrefslogtreecommitdiffstats
path: root/configure.bat
Commit message (Collapse)AuthorAgeFilesLines
* Configure: simplify logicYuhang Zhao2019-03-141-4/+1
| | | | | | | | Replace hard-coded win32-msvc20XX mkspec names with a variable substitution expression. Change-Id: I4911cb3e169cd7603453d7c8a67a2a291d15c796 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Configure: add missing "clang.exe"Yuhang Zhao2019-03-141-1/+1
| | | | | | | This amends commit 16b7afc. Change-Id: I6c0e4b476035e4733e828724109b950d5b3a8dd6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix win32-clang-g++ buildYuhang Zhao2019-03-131-1/+3
| | | | | | Change-Id: Ide803de12736d545807a4ae650ff8f8bce5dccd8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: Prefer cl.exe over clang-cl.exeOrgad Shaneh2018-01-041-2/+2
| | | | | | | | This is a remake of 8e4c8be0b9821ee2f3dbdda3ebbe16126d334959 that was undone by mistake in 8f49da6c18a2a86576f06deb9a6ff1deef748837. Change-Id: I9596b860dea90b042baa8b2b95b1e3b050e9b835 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* configure: balk at any of {{,X}QMAKESPEC,QMAKE{PATH,FEATURES}} being setOswald Buddenhagen2017-04-211-0/+13
| | | | | | | | | | | these variables have no legitimate use when building qt itself, but have great potential to wreak havoc. Task-number: QTBUG-60016 Change-Id: I161837463443af82d48145e75952fa529212fe75 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* reduce nesting in configure.batOswald Buddenhagen2017-01-101-7/+6
| | | | | | | | | | | | for some inexplicable reason, configure.bat went into an endless loop on win 8.1+ while attempting to parse the command line; this is clearly a bug in cmd, so work around it. amends 7af6e9bb. Task-number: QTBUG-58019 Change-Id: I698a2a51891a4e7af75836c075888f70df865409 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* complain about various invalid configuration attemptsOswald Buddenhagen2017-01-061-0/+5
| | | | | | | Task-number: QTBUG-56049 Change-Id: Id5eeb014c2b88195d2d14566a62dcb9185206b37 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* print help from all modules in top-level buildsOswald Buddenhagen2016-12-301-0/+10
| | | | | | | | | this is rather hacky. a proper solution would auto-generate help from the command line argument definitions, at the cost of needing to bootstrap qmake first. Change-Id: Iada6e25d5b31d7db0595309887f2d13295bbc1e3 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* ... and so configureapp.exe disappearethOswald Buddenhagen2016-12-231-59/+190
| | | | | Change-Id: I3fd9f2b0d4cf05a625484fce21532da8563cd62c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* rename configure.exe => configureapp.exeOswald Buddenhagen2016-10-041-1/+1
| | | | | | | | | | now that the bat file is responsible for displaying the help in addition to bootstrapping configure, the exe file should not shadow it any more. amends c027cffbe. Change-Id: I5c8a52f59ff455575e646fae55cd214db98a3736 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* don't rely on configure.exe being in source packages any moreOswald Buddenhagen2016-08-261-4/+0
| | | | | | | | | now that configure.bat takes care of printing the help screen itself, there is no compelling reason to ship configure.exe in the source packages any more. consequently, always bootstrap it. Change-Id: I5bf0946549e3c426c1a4a94b1c22f6c0f4b4993c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* make the windows configure also use config_help.txtOswald Buddenhagen2016-08-181-2/+23
| | | | | | | | | | | specifically, make configure.bat dump the text file (which got some windows-specific adjustments). incidentally, this change removes the need for including a pre-built configure.exe into our source packages. Change-Id: Ib3515c113f3602767554fe1493df226551a7bf10 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Don't compile configure.exe with clang-cl.exe if cl.exe is availableThiago Macieira2016-07-211-6/+6
| | | | | | | | | | | | | | | | | | | | | Sometimes clang-cl.exe is on PATH and would get picked up by the build. That is often by mistake, but it will inreasingly happen as clang-cl becomes more popular. Unfortunately, configure.bat is too early to detect which MSVC version it's set to compile against, so the -fms-compatibility-version option will often be wrong. One such case is when trying to build for MSVC 2013. Microsoft headers for VS2013 are unsuitable for our use in Qt with clang-cl. Instead, use cl.exe. It's a much better-known quantity and is always on PATH if trying to build with clang-cl, as the latter needs the former to fall back to if necessary. This does not affect the build of Qt libraries and tools. Task-number: QTBUG-51534 Change-Id: I149e0540c00745fe8119fffd146287662436c4b9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Ensure that configure.exe is built in C++11 mode with ICCThiago Macieira2016-06-171-1/+1
| | | | | | | | I changed qmake with commit f5eeadb9, but that change was apparently incomplete. Change-Id: Ib57b52598e2f452985e9fffd1458b02579f33c5d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Add initial clang-cl support to QtAndreas Holzammer2016-02-111-1/+7
| | | | | | | | | | | | | | | | | | | This adds the functionality to build Qt with clang under Windows against the Microsoft Visual Studio 2015 runtime. In order to replicate this, a Clang 3.8 build with Visual Studio 2015 Update 1 is needed. Adds compiler detection to Qt to distinguish correctly the clang compiler and Windows with Visual Studio. Clang has some built-in numeric functions, there is no need to use the Microsoft versions, which also conflict here. Task-number: QTBUG-50804 Change-Id: Ia4b267a298310ac7d73edf473b12792991249d8a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Add Intel copyright to files that Intel has had non-trivial contributionThiago Macieira2016-01-211-0/+1
| | | | | | | | | I wrote a script to help find the files, but I reviewed the contributions manually to be sure I wasn't claiming copyright for search & replace, adding Q_DECL_NOTHROW or adding "We mean it" headers. Change-Id: I7a9e11d7b64a4cc78e24ffff142b506368fc8842 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Updated license headersJani Heikkinen2016-01-211-17/+12
| | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I42a473ddc97101492a60b9287d90979d9eb35ae1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Move the official Qt version from qglobal.h to .qmake.confThiago Macieira2015-10-141-2/+18
| | | | | | | | | It's easier to parse than qglobal.h. The objective is actually to have macros with parts of the version number, so the major or minor numbers could be used in other preprocessor macros. Change-Id: I42e7ef1a481840699a8dffff1404eda1dd5c308d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Use jom instead of nmake to compile configure.exeThiago Macieira2015-07-211-3/+4
| | | | | Change-Id: Ib463f09c2031e41515a7e3b1f9d1961712915413 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* configure.bat: Search for icl.exe before cl.exeThiago Macieira2015-07-171-6/+6
| | | | | | | | The Intel compiler's compilervars.bat also puts the MSVC compiler in PATH, so cl.exe was always being found first. Change-Id: I72e524da10fb0e221c4530a3e5c1a4a347c3f878 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* support spaces in build and install dirsOswald Buddenhagen2015-02-171-1/+1
| | | | | | | | spaces in the source dir are not supported for now, as that requires some more profound refactoring of the bootstrap makefiles. Change-Id: Ie0c07a1558b8326f642f2ea144bc1cd85ee761af Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-111-7/+7
| | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
* remove some redundant backslashesOswald Buddenhagen2015-02-041-3/+3
| | | | | | | %QTSRC% always contains a trailing backslash. Change-Id: I96772c18f45655f8dbe386f9351d0823fa70f1d0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update license headers and add new license filesMatti Paaso2014-09-241-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: Iec3406e3eb3f133be549092015cefe33d259a3f2 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* get rid of syncqt wrapper scriptsOswald Buddenhagen2013-05-131-1/+1
| | | | | | | | | | | instead, rename it to syncqt.pl and rely on qtPrepareTool()'s new ability to correctly invoke it as a perl script even under windows. the wrappers themselves have been trivial at this point, so there is no added value in keeping them, either. Change-Id: I77cf65edbcfaa48ed1900defe940d4eb4b82d5b9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-181-1/+1
| | | | | Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-221-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If1cc974286d29fd01ec6c19dd4719a67f4c3f00e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* don't skip the configure.exe build even when it already existsOswald Buddenhagen2012-09-211-1/+0
| | | | | | | the build steps are now fast enough to make no-op rebuilds no problem. Change-Id: I1018735bf50f3e7a66e22637237f26f98a3baf1d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't skip the syncqt call even when include/ existsOswald Buddenhagen2012-09-211-10/+8
| | | | | | | the syncqt run is now fast enough Change-Id: Ie95a617fe99791ed38d02fe41578a0136fb68ddc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't require a fake qconfig.h for the configure bootstrapOswald Buddenhagen2012-09-191-8/+0
| | | | | Change-Id: I3d1224ad19b9e5278e35cf7c5142a29ccb589140 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* syncqt only the QtCore headers for the bootstrapOswald Buddenhagen2012-09-191-1/+1
| | | | | Change-Id: I26e19805823bfe987c721f6a274803e54f0e4003 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* introduce -minimal mode to syncqt and use it for bootstrappingOswald Buddenhagen2012-09-111-4/+2
| | | | | | | | | | the bootstrap does not need CamelCase includes, deprecated headers and whatnot, so just don't do it. the full thing will be run on qtbase by qmake. Change-Id: Idffdd4750a73574c8c32ee75d00080abfe37e03c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* bypass configure bootstrap for non-git buildsOswald Buddenhagen2012-09-051-0/+5
| | | | | Change-Id: Ifa56297db0c5f198080a728f033393ab60eb1b74 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove Q_BYTE_ORDER and -*-endian arguments from configuresBradley T. Hughes2012-03-021-3/+1
| | | | | | | | | | | | | | | | | | Do not write Q_BYTE_ORDER to qconfig.h in the configures. Instead, we #define Q_BYTE_ORDER in qprocessordetection.h, since many CPUs only support a single endian format. For bi-endian processors, we set Q_BYTE_ORDER depending on how the preprocessor sets __BYTE_ORDER__, __BIG_ENDIAN__, or __LITTLE_ENDIAN__ (instead of using a compile test to do so). For operating systems that only support a single byte order, we can check for Q_OS_* in addition to the preprocessor macros above. This is possible because qprocessordetection.h is included by qglobal.h after Q_OS_* and Q_CC_* detection has been done. Do this for Windows CE, which is always little- endian according to MSDN. Change-Id: I019a95e05252ef69895c4b38fbfa6ebfb6a943cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix configure -redoOswald Buddenhagen2012-03-011-1/+1
| | | | | | | | -redo must be the first argument (except -srcdir, which we treat differently), so let's pass the user arguments first. Change-Id: I5da37d1a6e1aec67449daf64b8bd2ffcc0b075a4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* bootstrap configure.exe on windowsOswald Buddenhagen2012-02-161-0/+121
it is *ugly* to have the binary in the repository. this adds a few seconds to the windows build, as the configure needs to be rebuilt, obviously. that's almost negligible. Change-Id: I40ffde23b3c3af2b6bab3e78cd0a9f433214b563 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>