summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated package README: make it common for binary and source packagesv5.0.0-beta1aavit2012-08-271-13/+31
| | | | | Change-Id: I91c53b006909e89e8234065910179240dd492dab Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add a README.txt for the binary Qt packagesaavit2012-08-271-0/+100
| | | | | | Task-number: QTBUG-26642 Change-Id: I9a837518dda92518abc04fadbdab71483297d0ff Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix for doc generation.Johanna Aijala2012-08-231-10/+15
| | | | | | | | Fixed the documentation generation part of the script. Change-Id: Ib6bc0c545702f2072c6e1a4ad4d68e936f307258 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Remove block of code that does not workIikka Eklund2012-08-211-11/+0
| | | | | | | | | The removed block of code sometimes deleted invalid content. Remove it untill better solution is implemented. Change-Id: Ie09ba8fd5e34564fde9cfb70c3c057c71100c4ca Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Improve file patching operation for qt5 build pathsIikka Eklund2012-08-212-19/+46
| | | | | | | | | | | | | | Added/fixed functionality to patch build paths after qt5 build. The build paths must match the value that will get embedded into qmake executable. This commit will make sure that all text files (after build) will get scanned for local build paths and will get replaced by the 'correct' build path (qt_prfxpath). After this patching process the Qt Installer-Framework can patch the files correctly during installation process performed by the end user. Change-Id: I0039de88df58e70d61ec5cbea081c236dbf8b3b3 Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix a bug in patch_qmake_qt_key.pyIikka Eklund2012-08-211-1/+1
| | | | | | | | Fix a bug when reading a value from qmake executable Change-Id: I51aafaa2932b3836d093d6d152f5ba8a02677a56 Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix for executing patch file, update to build script.joaijala2012-08-213-11/+30
| | | | | | | | | | Added missing space to if sentence executing the patch file. Configure options updated on build script, qtphonon and qtdocgallery removed from modules default list. Change-Id: I5f88c858a7443d5c142499d84b7fa9250e1d1ae2 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Update the 3rd party license agreement textIikka Eklund2012-08-131-6/+18
| | | | | | | This version is from qtbase LICENSE.LGPL Change-Id: Ieff8b4bd9742cf2d59fbb923aced557f35db334d Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update installer version into "5.0.0 Beta 1" in config.xmlIikka Eklund2012-08-133-3/+3
| | | | | | | Fine tune the version number in config.xml files. Change-Id: Ia120ef59c88ad2b9b2371c77212780ffd27d8e56 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Enable translations for static Qt build for Qt5 beta installerIikka Eklund2012-08-132-2/+2
| | | | | | | | | Qt translations was omitted from static Qt builds (for IFW). This commit will enable translations into builds. Effect is that IFW can then use translation files and does not use hard coded strings instead. Change-Id: I29b483d08c177e80ab6e5439d08edada43488867 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fixes and fine tuning of the Qt5 build script.joaijala2012-08-103-246/+241
| | | | | | | | | | | | | | | Added: - print_wrap() function for easier grepping the logs generated by the build script from the full build log - removed -release option from configure options - added commandline parameter for thread count used and should translations and webkit be builded - fixed submodule default order generation - removed pri files backuping and restoring as unecessary Change-Id: Ic4ebfe8ddf87d35d45a2678c554f5e4a6acfd078 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Added support for changing license type with command line parameter.joaijala2012-08-101-4/+30
| | | | | | | | | | | | User can change the license type by giving -l option with license name. If none is given license will default to 'opensource'. -p command line option is used for entering a .sh script that is used for patching the sources if needed before they are archived. Change-Id: I42ef7186fe671f90dbfac77bada165c49401a873 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Added error checks and two new helper functions.joaijala2012-08-101-5/+46
| | | | | | | | | | Added error checks and prints, added functions: delete_files_by_type_recursive() locate_directory() Change-Id: I8c5fab6f460cb5f700326bf56a9ec90b6f73226d Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Enable custom configurations directory when creating installerIikka Eklund2012-08-073-8/+22
| | | | | | | | | | | | Added possibility to add custom configurations directory when calling create_installer.py, extra argument is: configurations_dir=my_custom_configurations_dir This way it's easier to maintain different installer projects. Change-Id: Ic02cd493bb93ab24094323f12b8fb16876e7cb8e Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Fix for bug QTBUG-26645Simo Fält2012-08-061-2/+2
| | | | | | | | | Removed 64 bit package for now, while qt-project doesn't have build node to produce those yet. Change-Id: I0f14c6fb86286d3713064fdaf4ad5339dcfdc39b Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Add initial licensing info dialog into Qt 5 Beta installer.Iikka Eklund2012-08-022-0/+505
| | | | | | | | | | Before starting installation the user must accept licensing terms. The initial draft file is copied from Nokia SDK 1.2. The contents of this license file needs to be rewritten by somebody to be valid for Qt 5 Beta installer. Change-Id: I12a78e132d628a330da880757c9a7c078e37db04 Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Register Qt5 documentation operation added for Beta installerIikka Eklund2012-08-021-0/+4
| | | | | | | | | | | Added RegisterDocumentation operation for Qt5 src component. This is temporary solution for Beta. In final the documentation should be put as separate component. Change-Id: Ib9228ec50a3df1f0f4ac0aa526d7437d5ddbf63b Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Consistently label the first Qt 5 beta as "Beta 1".Jason McDonald2012-07-3021-50/+50
| | | | | Change-Id: I1f090279c710f37d0b711ddea978676ae95947b0 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Don't suggest using amd64 parameter for vcvarsall.bat for 32bit buildsMiikka Heikkinen2012-07-131-1/+1
| | | | | | | For 32bit builds vcvarsall.bat should be run without parameters. Change-Id: I2aab614ed47225df0df5bae8a508defa69f0408b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Removed unnecessary jenkins-configurations directory.Simo Fält2012-07-1238-927/+0
| | | | | | | Jenkins is now using the default configs in configurations dir. Change-Id: I193ec70dc1875c53f7b4cd771d243b3b7b72d954 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* qt5_tool: Turn off parallelization for make install.Friedemann Kleint2012-07-111-1/+5
| | | | | | | Causes failures on Windows. Change-Id: I3384e746d663004dea874db8b563612d209be11c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Use "beta1" instead of "beta" in source package names.Jason McDonald2012-07-114-4/+4
| | | | | Change-Id: Ib1c5b1303c7c119f6a7e10295055ba394ede4101 Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Fixing mksrc.sh to update the sha1 values correctly.Simo Fält2012-07-111-4/+5
| | | | | | | | The mksrc.sh didn't cleanup possible old files containing sha1 values. Also removed unnecessary move of submodules.txt. Change-Id: I24d71caf0167911003f8bb6eaf07c0fd227fc224 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* qt5_tool: Improve make handlingFriedemann Kleint2012-07-091-14/+31
| | | | | | | | | - Windows: Autodetect jom - Execute make install if required, deduced only from configure arguments. Change-Id: I59806a2c1c7c8e1bbd12fa667885a835365edd32 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Change vcredistributable configurations to be user selectableIikka Eklund2012-07-066-6/+6
| | | | | | | | | Make vcredistributable components visible and user selectable. Also do not use silent install option for them. Change-Id: Icb83221fb227fc72645899ef7001332d67128955 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Add vcredistributables (32bit and 64bit) into Qt5 beta installersIikka Eklund2012-07-057-2/+94
| | | | | | | | | Added Win configurations to bundle vcredistributables as part of the installers. Change-Id: I7970a32708d148754206eded87fccdc2966c00a2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Critical fix for packaging scriptsIikka Eklund2012-07-051-0/+33
| | | | | | | | | If one installer component had more than one archive the packaging script resulted invalid archives. This patch fixes the problem. Change-Id: I036c32779846f5bccb247aa7862843dee2d8e450 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Add command line override into licensing mode (packaging script)Iikka Eklund2012-07-051-2/+8
| | | | | | | | | | | | | | | Added command line override option for licensing mode: licence_type=[opensource/commercial] If no licencing type is given as command line argument the default one from configurations/all-os/common configuration file is used. For the moment the licensing type is used only for installer naming scheme. Change-Id: I2e27b8ab7b7efb41df0e5151e18806d2fd27b653 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Update installer naming schemeIikka Eklund2012-07-042-18/+44
| | | | | | | | | | | | | | | | Generate installer name using the following scheme: qt-<platform>-<license>-<version>-<tag>-<compiler>- <target_arch>-<offline/online>.<extension> Compiler must be given as command line argument, e.g. compiler=vs2010 Target architecture must be given as command line argument, e.g. target_arch=x86 Change-Id: I1e61774c57167604ec78bf1a84c1e2146a877c7e Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Update README file for Qt5 beta installerIikka Eklund2012-07-045-6/+6
| | | | | | | | | | Renamed the README into README.txt so that on Windows it will get opened automatically. Also changed the location where the README file will get loaded for installer creation. Change-Id: I3a54e6ae75f0b5413b5ffa76ffa50a87b58d2a17 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Add ICU libraries as a part of the Windows installerIikka Eklund2012-07-041-2/+14
| | | | | | | | | | | Updated Windows configuration so that ICU libraries will be bundled as a part of the qt5 beta msvc2010 installations, both 32bit and 64bit packages. Change-Id: Ia359be2e8ead24b7813b1df0283b026f120a0fee Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Added shortcut for qt-project.org web page.joaijala2012-07-033-2/+13
| | | | | | | Shortcut to qt-project.org web page for windows installer. Change-Id: I9c6dda8d19a85c7b1b060aa09cd5cbe55eeee645 Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Uninstall and ReadMe shortcuts addedjoaijala2012-07-0315-63/+244
| | | | | | | | | | | Added uninstall shortcut and readme. On windows there is a shortcut to readme, readme can be launched from the final page of the installer. Change-Id: I9c88f5dffb7d4550c81496d0d47c09bb5855e8c2 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com>
* qt5_tool: Adapt to buildsystem branchFriedemann Kleint2012-07-021-25/+4
| | | | | | | | - Remove Windows workaround (copying of profiles). - Remove call to obsoleted 'build' script. Change-Id: I00e754d9a9780a96e1d578f09d855e63da34f5ac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Updates to jenkins build scriptsSimo Fält2012-07-022-15/+10
| | | | | | | | | - changed the Makefile target from make_default to make_first, which is used to detect the correct build order for submoules Change-Id: Idd4ea3e7803c7641005d9018a09198a08bff073b Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Updating qt-project.org specific servers into beta configs.Simo Fält2012-07-025-20/+20
| | | | | | | | | | | | | | - 32 and 64 bit linux beta configs defaults to qt-project's Jenkins 11.10 Ubuntu nodea - mac and win beta configs defaults to qt-project's Jenkins mac and win nodes - linux installer-frmaework was changed to use https instead of gitrotocol, while https has been more reliable from that node Change-Id: Id8abc0619e93e46cdf37e2e5feed93cad114c9de Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* bldinstallercommon.py: Print output for all failing commands.Friedemann Kleint2012-06-291-4/+10
| | | | | | | Strip leading lines of verly long logs. Change-Id: I0cbb1839906698c49f7e0ef858ad7ded37546b8e Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Fix packaging scripts bug in archive uri resolver.Iikka Eklund2012-06-292-3/+4
| | | | | | | | | Fix a bug in archive resolver. Before the archive resolver did not form the file path correctly when trying to locate local archives from /data folder. Change-Id: Icfa3648e1d2d3e72e61dcbb3f3d6d5a129ebc21a Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Minor updates into python installer/SDK creation scripts.Iikka Eklund2012-06-261-1/+2
| | | | | | | | Add sanity check for config.xml template checking and remove unnecessary console printing. Also fix a bug in file extraction function. Change-Id: I70541f6db5e994d9dcbc57b6064928b7ef906ed8 Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Bug fixes into packaging scripts.Iikka Eklund2012-06-263-14/+37
| | | | | | | | | Various bug fixes into packaging scripts. Fixed file extraction, clean-up and repackaging functionalities. Change-Id: I15a4a35a1e64321368d025d8745def45c1a9e2c6 Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Add python script to build Qt5 packages for installer purposes.Iikka Eklund2012-06-262-0/+706
| | | | | | | | | | | | | | | | | Initial version of python script to build and create Qt5 binary packages for installer/SDK purposes. - Script can be run on Linux/Windows/Mac - Script can produce one "monolithic" Qt5 binary package (.7z) - Script can produce produce submodularized Qt5 binary packages (.7z) Added script for changing qt_prfxpath. Added -R ___PADDING__ option to configure on linux. Change-Id: If2ae915b9f5791a09b0ee1d9e228ff721a7497c5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Enable RPath patching during installer creation phaseIikka Eklund2012-06-262-2/+2
| | | | | | | | | Linux only. Do not assume that binary packages have the RPaths patched by default. Enable RPath patching during installer creation. Change-Id: Ia5137dbc8b7d1fb7fdd8efcc0d7f3cde88257dad Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Update the release-tools/README.Friedemann Kleint2012-06-261-121/+486
| | | | | | Change-Id: I513bb51639f46f0b595e08e674c18425fe60146d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Fine tune Qt 5 Beta installer configurations.Iikka Eklund2012-06-2621-68/+52
| | | | | | | | | Some fine tuning into Qt5 Beta installer configurations. Updated component description texts and removed unnecessary item from install tree. Change-Id: I71a5121cb99b66353dda00064835dc9e4d4e2901 Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Add support for older repogen and archivegen tool usage.Iikka Eklund2012-06-251-2/+14
| | | | | | | | New version of archivegen and repotool in IFW have different command line syntax. Add support into script to take this into account. Change-Id: Ibc7e03d1febe16d7b1ef18d632395b3a8a2fc91b Reviewed-by: Simo Fält <simo.falt@nokia.com>
* Added shortcuts for windows components.joaijala2012-06-203-1/+111
| | | | | | | | Added shortcuts for Uninstall, Assistant, Designer and Linguist. Change-Id: I9b1d728c8244de30b4b085bf246f02e14fa488b9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* improve docu about gpush.alias.*Oswald Buddenhagen2012-06-201-3/+6
| | | | | Change-Id: If0ee43aead0ba220c7800aa15ab3ad05106f8af0 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* add some more aliasesOswald Buddenhagen2012-06-201-0/+8
| | | | | Change-Id: I0858080f9dda1be0c6ac53e8edd2f05f88415f51 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* support multiple names for aliases in .git-gpush-aliasesOswald Buddenhagen2012-06-202-7/+9
| | | | | | | aka, aliases for aliases Change-Id: I587283e785fe1d77153f19f752175e7cc432efd9 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* sort alias listOswald Buddenhagen2012-06-201-22/+22
| | | | | | | it's unmaintainable otherwise Change-Id: Ia206d1bc9e67374f61f67c3991a81933cb078b22 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 21:21:55 +0000