summaryrefslogtreecommitdiffstats
path: root/bin/syncqt
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in license headers.Jason McDonald2012-01-051-1/+1
| | | | | Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* syncqt: fixed QT_MODULE_BASE when build path != install pathRohan McGovern2011-12-061-1/+1
| | | | | | | | | | | | | | | QT_MODULE_BASE is exclusively used to refer to the top-level source directory of a module. However, in non-developer-build mode (used only when the build path is not equal to the install path), syncqt would incorrectly set the value of QT_MODULE_BASE to the build directory. This caused all $$QT.<module>.sources variables to point to the wrong place. Make it always point to the source directory. Change-Id: I401cf000f9e3a4ab97d68db40330bb98aec25a9a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* syncqt: Create deprecated headers that work with MSVCKent Hansen2011-12-021-1/+5
| | | | | | | | | MSVC doesn't understand the #warning directive; use #pragma message instead. Change-Id: I42fe43269f5a84559a983932737c9eeb6b74b1ff Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add deprecated headers support to syncqtKent Hansen2011-11-291-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | When renaming classes, or when moving classes from one module to another, it's useful to have a simple way of supporting the old API/location for some time. To this end, syncqt shall now recognize a "deprecatedheaders" section in sync.profile. It looks like this: %deprecatedheaders = ( "QtDeclarative" => { "qquickcanvas.h" => "QtQuick2/qquickcanvas.h", "qquickitem.h" => "QtQuick2/qquickitem.h", "QQuickCanvas" => "QtQuick2/QQuickCanvas", "QQuickItem" => "QtQuick2/QQuickItem", } ); In the above example, syncqt would generate a header called qquickcanvas.h for the QtDeclarative module; when included, this header will issue a warning and include <QtQuick2/qquickcanvas.h>. And so on, for the other entries. Deprecated headers are installed along with the module's normal headers. Change-Id: Ie2518b42275c2b2ff44216f07d376ccf5be6dc45 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* syncqt: Don't generate deprecated forwarding headers anymoreTor Arne Vestbø2011-11-241-28/+0
| | | | | | | | | The forwarding headers in 'include/Qt' were deprectated in Qt 4. This is Qt 5, so time to remove them. Change-Id: I4bf3797475b91f58af1761ed4165b552613299b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add a new handler to syncqt for explicitly dealing with special case headersKevin Simons2011-11-141-3/+17
| | | | | | Change-Id: I83b26fc88aee0052502c0a4d385ea97f8c933c66 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Teach syncqt to handle multiple %moduleheaders directoriesTor Arne Vestbø2011-10-201-135/+142
| | | | | | | | Each directory is separated by a ';'. The syntax was chosen over the regular perl [] syntax as ';' was used already in other places. Change-Id: I7a07a1facb7c08d7a9de6ec45ad57f6057cb0150 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Prevent 'Argument "" isn't numeric' warning when module version is missingTor Arne Vestbø2011-10-111-7/+7
| | | | | | | Change-Id: I2ecef7060c1e436e499221cac03266744a9ee309 Reviewed-on: http://codereview.qt-project.org/6432 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Fix missing/broken license headersJason McDonald2011-09-131-5/+41
| | | | | | | Change-Id: I54f3ca5979b78f9eec8115cc580c32321859acf6 Reviewed-on: http://codereview.qt-project.org/4514 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add QtV8 library to QtBaseKent Hansen2011-08-291-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds Aaron's copy of V8 to src/3rdparty/v8 (as a git submodule), and builds it as a "normal" Qt library (without any dependencies on Qt itself). The library can be added to a project with QT += v8-private V8 API headers are available as private includes, e.g. #include <private/v8.h> The API is private because we're exposing a third-party API directly, and we don't want to (and cannot) make source or binary compatibility guarantees for it. Since we want the V8 public API headers to be private headers in Qt, syncqt and sync.profile were extended to understand a new configuration option, the @allmoduleheadersprivate array, that tells syncqt whether all the library headers should be treated as private even though they don't follow the _p.h Qt convention. The V8 project files, patches and autotests are copied from the QtDeclarative repository. The next step after this commit is to remove QtDeclarative's copy of V8 and link with QtV8 instead. Task-number: QTBUG-20963 Change-Id: Ib8820362cdbc8fa662a5e97db841656cf38d1b62 Reviewed-on: http://codereview.qt.nokia.com/3092 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Report an error when the version header can't be writtenLincoln Ramsay2011-08-171-1/+1
| | | | | | | | | | | | If sync.profile points to a location that does not exist in the %modules section, the version header cannot be written. Report the error clearly so this problem can be identified. Change-Id: Ib681087f46362487ffb621221d33cf9b7e54df2f Reviewed-on: http://codereview.qt.nokia.com/2761 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Allow adding to @ignore_headers from sync.profileMarius Storm-Olsen2011-08-041-1/+1
| | | | | | | | | | We need this to avoid syncing certain files in QtDeclarative on Windows. Change-Id: Ia9fc95262ac18bafc39efc038ea70a1b5d67cddd Reviewed-on: http://codereview.qt.nokia.com/2641 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Try to make sure the config test script is installed.Michael Goddard2011-07-261-3/+11
| | | | | | | | | | And try to fail a bit more gracefully if it isn't. Change-Id: I62e01c0536aa0a032940d6a9a5ccf5edcfeef221 Reviewed-on: http://codereview.qt.nokia.com/2109 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add rudimentary config.test support when configuring modules.Michael Goddard2011-07-221-0/+17
| | | | | | | | | | | | | | | | | | An extra script is added (qtmodule-configtests) which is currently invoked from syncqt (with some derived parameters passed to it). The module can optionally have an entry in the module's sync.profile file in the form of a perl map of "test name" => parameters. Tests can print an advisory message if they fail (e.g. "Install this SDK/dev package"), or abort the syncqt process (e.g. mandatory prereq missing). Also, if the test has a "requires(foo)" line that results in it being skipped, this is also supported. Change-Id: Ic3c820a488a0992c944994d4d7dc283da36742d6 Reviewed-on: http://codereview.qt.nokia.com/928 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Prefix each output line with the library being processedMarius Storm-Olsen2011-07-211-30/+39
| | | | | | | | | | Makes it easier to track which library output is coming from, when building Qt with -j > 1. Change-Id: I9acda04e84014dc441e409a0b24b2f78762dcc1c Reviewed-on: http://codereview.qt.nokia.com/1765 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Make syncqt output more compact by default, and add verbosity levelMarius Storm-Olsen2011-07-211-17/+49
| | | | | | | | | | | By default, syncqt will now compress the console output of what it's doing. Increasing the verbosity level will make syncqt output the same as before Change-Id: I542072504f022f87997b4036eda5747a5da88839 Reviewed-on: http://codereview.qt.nokia.com/1764 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Close filehandle when doneMarius Storm-Olsen2011-07-211-0/+3
| | | | | | | | | | Also add a fixme, since the version headers are currently being created in the source directory. Change-Id: If6e9eeba854a1f35561b69518eb8739dc28a58be Reviewed-on: http://codereview.qt.nokia.com/1763 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Sort all readdirs, so the output is reliableMarius Storm-Olsen2011-07-201-3/+3
| | | | | | | | | | | | | We need the content of the generated module master headers to be reliable, so rebuilding in the same environment doesn't produce different results. This minimizes the diff from package building systems. Change-Id: Ic914f56e13b11f313f01f6b8666c2d28aa50a985 Reviewed-on: http://codereview.qt.nokia.com/1900 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Arvid Picciani <arvid.picciani@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Implemented module-local caching of module profiles.axis2011-06-031-15/+47
| | | | | | | | | | | | | | | | | | | | | | | We use syncqt to generate .qmake.cache also for submodules, which contains the location of forwarding module profiles for that module. This enables us to build without having to put module profiles into mkspecs/modules until install time. Also added support for -developer-build to syncqt. What it does is to point build directories for binaries and libraries to a common location in QtBase. This is more convenient when doing development, since you don't need to set your path to every module's bin/ directory, but it cannot be used with release builds, since they need to build independently of QtBase, in their own directory. Change-Id: I959c62c11c644f2147a98da894a72452d9c44327 Task: QTBUG-19585 Task: QTBUG-19583 Reviewed-on: http://codereview.qt.nokia.com/232 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Make sure that we error out if we cannot write forwarding profile.axis2011-06-031-1/+1
| | | | | | | | Change-Id: Ic0b62532dd8a52cf6ab7a7c10c5ffbe3c9039ec1 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/229 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Fixed an argument parsing bug in syncqt.axis2011-06-021-6/+6
| | | | | | | | | | | We need to move the detection up above the general -no-* match, otherwise it never hits. Change-Id: I04ab5a1ed2c4a01219e7b9e10948b3fc4989f4b8 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/228 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-111-22/+22
|\ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: Fix a bug in syncqt.
| * Fix a bug in syncqt.Liang Qi2011-05-111-22/+22
| | | | | | | | | | | | | | Move the generation of version header file before the sync of header files. Reviewed-by: TrustMe
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-111-0/+40
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: Add QT_xxx_VERSION macros for each library in qtbase
| * Add QT_xxx_VERSION macros for each library in qtbaseLiang Qi2011-05-101-0/+40
| | | | | | | | | | | | | | Provide version info for each library like QTCORE_VERSION and etc. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
* | Fixed detection of QtBase directory.axis2011-05-101-3/+3
|/ | | | | | | | The old check would fail for an installed copy of Qt. Instead, base the check on using QTDIR if it present, otherwise use the parent of the bin directory, and then check that "mkspecs" is present. Reviewed-by: Olivier Goffart
* Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-021-1/+21
| | | | | | | This will allow us to expose private headers in a controlled manner, and ensure that they are not used by accident. This also means that we internally will have to enable the private headers for the modules we wish to use in the project.
* Install syncqt, and ensure it runs fine for external modulesMarius Storm-Olsen2011-05-021-2/+6
|
* Introduced the QT.<module>.plugins variable to module profiles.axis2011-04-271-0/+1
|
* Fixed syncqt generation of bin path.axis2011-04-271-1/+1
| | | | | | Now it points to QtBase's bin directory, in the case of developer builds. This makes it easier to develop modules together without having to install them first.
* Added QT.<module>.imports support to module profiles.axis2011-04-271-0/+1
|
* Load the sync.profile after setting the variables.Prasanth Ullattil2011-04-271-9/+10
|
* Temporarily pointing QT_MODULE_LIB_BASE to qtbase/libPrasanth Ullattil2011-04-271-1/+1
| | | | | This has to changed when we start to generate the module binaries in their respective lib/bin folders.
* Make each module refer to its own bin/Marius Storm-Olsen2011-04-271-0/+1
| | | | | | | Since modules cannot rely on QtCore having a build directory, nor can they build the applications directly into $$[QT_INSTALL_BINS] each module needs their own bin/. Add this path to each module's pri file, so others can use their applications
* Made syncqt collapse redundant ".." sections in paths.axis2011-04-271-0/+2
|
* Fixed useless substitution in syncqt.axis2011-04-271-1/+0
| | | | | The substitution is not necessary and messes up the argument that is passed in.
* Add hardcoded qclass_lib_map.h based on 4.8Marius Storm-Olsen2011-04-271-1/+1
| | | | This is only until UIC/Designer handles this properly
* Add the source path to the modules .pri fileMarius Storm-Olsen2011-04-271-0/+1
|
* Add module specific pris, and make syncqt create fwd includesMarius Storm-Olsen2011-04-271-3/+56
| | | | | | | | | | | | | | | | | | | | | | | The module specific pris define the modules name version dependencies include paths lib paths additional CONFIGs and DEFINES They are located in the modules source directory, with fwd includes created in QtBase/mkspecs/modules build directory. The pris use QT_MODULE_INCLUDE_BASE QT_MODULE_LIB_BASE to specify the locations for includes and libs. These paths are normally based on QT_INSTALL_HEADERS QT_INSTALL_LIBS for installed modules, but overridden to the module's build directory by syncqt for the fwd included pris. The path of the pris must be specified in the sync.profile for syncqt to create the fwding pris in QtBase.
* Make syncqt use sync.profile files from each moduleMarius Storm-Olsen2011-04-271-79/+84
| | | | | The sync.profile replaces the hardcoded paths inside syncqt, and enables it to work for other modules than just qtbase.
* Expose private support for separate module in syncqt.Liang Qi2011-04-271-1/+4
|
* Some changes for qtbaseMarius Storm-Olsen2011-04-271-16/+1
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+1121
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12