summaryrefslogtreecommitdiffstats
path: root/init-repository
Commit message (Collapse)AuthorAgeFilesLines
* Prospective fix for unnecessary submodule cloningSimon Hausmann2015-03-271-1/+1
| | | | | | | | | | | | When cloning qtdeclarative, we end up also cloning qtdeclarative-testsuites, which is not intentional for users of Qt (and init-repository). The init-repository script checks for the submodule "repo".update key and skips the sub module if the value is "ignore". However according to the documentation no checkout is to be done if the value is "none", which is also what qtdeclarative's .gitmodules specifies for the ecmascript test suite. Change-Id: Ieb37607ae4ea7c32d6af886d3e2533fb9dea1f13 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-03-091-3/+4
|\
| * use git clone --branch instead of --no-checkoutOswald Buddenhagen2015-03-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | git submodule update does not cause an actual checkout if HEAD matches the recorded submodule sha1 even if it was not actually checked out. it would be possible to work around this by calling git checkout HEAD in each submodule if no files are checked out, but that seems hacky. instead, just make the module cloning already check out the desired branch. this produces checkouts that are within a few commits of the final sha1, so isn't too bad. Change-Id: I435c1a2e24f39fd8c0d65f0d90df0216715668b7
* | Update copyright headersJani Heikkinen2015-02-251-22/+14
|/ | | | | | | | | | 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. Change-Id: Ieb3be34b0d4061fb8dc886991528951f59dbd67e Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* don't fetch again when updating submodulesOswald Buddenhagen2015-02-061-1/+1
| | | | | | | | | | we already did it a moment ago. this should affect only the --remote case, but there is no harm in always specifying it. Change-Id: I3ef0854c790726772fb63ab7829b59ef85ac4f18 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* don't checkout when cloningOswald Buddenhagen2015-02-061-1/+2
| | | | | | | | we will subsequently do a submodule update with a possibly different sha1 anyway. Change-Id: I4950f3727e4263a73c32eff8460962d5796bc5f3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* make manual fetching saneOswald Buddenhagen2015-02-061-2/+11
| | | | | | | | | | | it is in no way said that the remote's HEAD will contain the commit to be checked out - in fact, it's pretty much guaranteed that it won't for anything but the default branch. fetching the whole remote avoids additional roundtrips and makes the --branch feature actually work reasonably. Change-Id: I20de2da848b12aea8c5b2784307fe9860252009b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* always check out the target branch when using --branchOswald Buddenhagen2015-02-061-14/+15
| | | | | | | | | a submodule update with --remote will use the tip of the remote's branch, but it won't actually switch to the branch if HEAD doesn't point to it yet. Change-Id: If13e31da2646683dfb9e832eaab929190acb0167 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* fix --branch without --no-updateOswald Buddenhagen2015-02-061-1/+3
| | | | | | | | clearly, i botched the syntax, but i can't even tell how. that's perl. the new version is more readable anyway. Change-Id: Ic3e93c2cf30ee92f368808070899af4b9f7809a3 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* don't fetch unless we are updatingOswald Buddenhagen2014-11-121-1/+1
| | | | | | | | it's just wasting time. Change-Id: I541cc535c5c95b0140cfa14d7cb042dbe029525e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Fix cloning with mirrorsKai Koehne2014-11-121-1/+0
| | | | | | | | | | Commit 486f5f37761 broke the cloning with one of the mirror options: git ls-remote git://mirror/qt/qtactiveqt.git.git test/if/mirror/exists fatal: The remote end hung up unexpectedly Change-Id: Ia154ee34dd10e35b24676777d8dde98ef0790ee1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix description of --mirror argumentKai Koehne2014-11-121-1/+1
| | | | | | | The argument actually requires a trailing slash. Change-Id: Idc2567746d2b3f4ebf31c2bce5ec683d2a1f425b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* teach init-repository about branchesOswald Buddenhagen2014-11-121-4/+29
| | | | | | | | specifically, add the --branch option and the necessary keys to .gitmodules. Change-Id: I09e2df6bd012629f76a35238d66697637bdffe44 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Ignore alternate if its not a git repoJan Arve Saether2014-11-031-1/+1
| | | | | | | | Don't just check if the submodule folder exist, since that doesn't qualify it for being a valid git repo. Change-Id: Ia3902714a0554908c0b8fd3228ed6fc2cfddd344 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* fix to let init-repository work on non english localeBruno Coudoin2014-10-171-0/+2
| | | | | | | | This patch forces the C locale before calling 'git submodule' in order to get the non localized string 'Entering' that we filter out. Change-Id: I46d3770956a6b07e574ad15549bbb8942285b800 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* properly recurse submodule initializationOswald Buddenhagen2014-09-231-10/+11
| | | | | Change-Id: Icd438b9da9af0275dd508186a265bc211d9d01ce Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* don't unnecessarily initialize unwanted submodulesOswald Buddenhagen2014-09-231-4/+3
| | | | | | | it wastes time and causes output noise. Change-Id: Ifee01150293431b3c528f30a46280bd142e30b22 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* don't uninit submodules before re-initingOswald Buddenhagen2014-09-231-10/+1
| | | | | | | | | git-submodule init will simply not touch the already initialized submodules. this is just fine, as we'll overwrite the config entries with our own urls (and remove the obsolete ones) afterwards anyway. Change-Id: I6372bd48be9792e456899dc829226921990140c4 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* keep information about default repos in .gitmodulesOswald Buddenhagen2014-09-231-36/+6
| | | | | | | it's backwards to keep this in the script itself. Change-Id: I4248ba3fef984bdff5d034cb2e6db6cae3209d68 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* don't pass around url unnecessarilyOswald Buddenhagen2014-09-231-6/+17
| | | | | | | we now have everything we need to construct it on the fly. Change-Id: I129e49bbcf46428d0fcef31ab8188df9d6a4026c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* get submodule urls from .gitmodulesOswald Buddenhagen2014-09-231-75/+42
| | | | | | | keeping a redundant copy in the script is plain backwards. Change-Id: Ibdd1bab9d2cb5af7d7747d5caa2afc7d6e7571ad Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* rewrite submodule exclusion logicOswald Buddenhagen2014-09-231-67/+39
| | | | | | | | | | | instead of doing multiple passes over the submodules, do everything in one go. as a bonus, as the internal structure uses exclusion entries in the module list, we can make that feature user-accessible just as well. Change-Id: I8bfb30c8051a9150f92e2e124ff52f64e3efe03c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* nuke the --http optionOswald Buddenhagen2014-09-231-31/+3
| | | | | | | | | it was a vestige from the times when the submodules had absolute urls pointing at git://gitorious.org. as we now use relative urls, things work just fine without that option. Change-Id: I5e93ff8cd2497a27cfbdd53dbcf9db3cd0c4cd1d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* init-repository: Support cases where $submodule/.git is a fileJocelyn Turcotte2014-09-101-1/+1
| | | | | | | | | | | | Since git 1.7.8 the $GIT_DIR of the submodule can be a reference to the super-module's $GIT_DIR/modules/<name>/ Test for existence instead of testing for a directory before attempting a git clone there. Change-Id: Ic539e770067da1417a2ad374c21253212473abe6 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add qtwebengine as submoduleFrederik Gladhorn2014-08-291-0/+2
| | | | | | | | | | | qtwebkit is listed as an optional dependency for qtwebengine to ensure that qtwebkit and qtwebengine are not linked in parallel on the CI system. Otherwise we could run out of memory. Change-Id: Ib80d72407df03037c928d99f55c8e04e98e506d9 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add QtWayland to default checkoutFrederik Gladhorn2014-08-201-0/+1
| | | | | | | QtWayland is going to be released with Qt 5.4. Change-Id: I9a9bead92c6c34324510007ad844c9fdf633690d Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* init-repository: Support submodules more than one dir deepJocelyn Turcotte2014-08-151-2/+4
| | | | | Change-Id: I8783ded72032dda42bc24a855e190e0a2e699b01 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* init-repository: Make sure that we update a submodule before we recurseJocelyn Turcotte2014-08-151-0/+1
| | | | | | | | | Unless we do so, doing git submodule init in a submodule would use the currently checked out version of its .gitmodule instead of the one of its pinned SHA1. Change-Id: I88de421c8d24748dcaa5334c82da2aac4b12b2ad Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Let init-repository build the mirror URL from the original URLJocelyn Turcotte2014-08-151-2/+2
| | | | | | | | | | This allows repositories that have a different submodule name than their URL file part to be using the mirror. i.e. qtwebengine's src/3rdparty mapped to .../qt/qtwebengine-chromium.git Change-Id: Ibea9cb9db701c95fc6f8b0e2457de74823aeeba5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* initialize qtwebengine's chromium submodule after cloning itAndras Becsi2014-08-121-0/+6
| | | | | Change-Id: I7e3ef09eb437f700c6fe010ce44a711118e8bd75 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Add qtwebchannel as submoduleFrederik Gladhorn2014-08-081-0/+2
| | | | | | | | This also updates the qtwebsockets revision since that's needed to compile. Change-Id: I9f3564c78d08abdca73ce395f31b3031a829e502 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Add qtenginio#stable as part of the default modulesSergio Ahumada2014-03-211-0/+1
| | | | | | | Also update qtenginio to the latest stable sha1. Change-Id: Ia60a65c1a66a1b157240cc7ef519dc0c20d36567 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* automatically install hooksOswald Buddenhagen2014-02-281-1/+43
| | | | | | Change-Id: I2fabc610dd69730cfdac45046d4bbc6f53822fc4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* nuke qlalr submoduleOswald Buddenhagen2014-02-221-1/+0
| | | | | | | | it was merged back into qtbase. Change-Id: Ia5e6252ac13b0f821807c825eea611d484c1dd7b Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Add qtwebsockets as submoduleFrederik Gladhorn2014-02-171-0/+2
| | | | | | | | | | | This just adds the module, it doesn't yet make it part of Qt 5.3 or anything like that Change-Id: Icd42c4d2366e31298758a6ef82924bfb64a9f814 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add qtenginio as submoduleFrederik Gladhorn2013-11-011-0/+1
| | | | | Change-Id: Ida65ce0162fa65c37413ce6716eb6382e1593338 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add new qtandroidextras repositoryv5.2.0-alpha1Sergio Ahumada2013-09-271-0/+2
| | | | | | | Also adding it as part of the default modules. Change-Id: I899ba6eec9ba6ab7103ecc6dba5245da16e01a32 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Add qtmacextras#stable as part of the default modulesSergio Ahumada2013-09-271-0/+1
| | | | | | | | | Also updating the sha1 to the latest one that has passed the CI already. Change-Id: I88d803a738be59c377ef4c2315a855d2675331d4 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Add qtlocation#dev as part of the default modulesSergio Ahumada2013-09-201-0/+1
| | | | | Change-Id: I6f684aa4b3a1fbefbaa89d8452035d9e93cd2b04 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-09-111-39/+11
|\ | | | | | | | | | | | | Conflicts: qt.pro Change-Id: I21548a5c5c060939c58305bcbc5732d90f90bf82
| * Add --oslo option to init-repositoryAlex Blasche2013-08-211-0/+11
| | | | | | | | | | | | | | | | | | Oslo devs can use a local git mirror. Change-Id: Id6f919ff65ddf0c0b5839316014f51d2293008fd Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Cleanup of init-repositoryAlex Blasche2013-08-201-42/+3
| | | | | | | | | | | | | | | | | | | | Removes old Nokia URLs and options associated with Nokia infrastructure Change-Id: Id5a28d7ed14fe069ceff6afbe372aa69dda80475 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add qtconnectivity#dev as part of the default modulesSergio Ahumada2013-09-101-0/+1
| | | | | | | | | | Change-Id: I5c3885e411a1e097da7aa161ef678d85fc606191 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Add qtwinextras#dev as part of the default modulesSergio Ahumada2013-08-291-0/+1
| | | | | | | | | | | | Change-Id: Ic0f6d569576186abdf4f81f3b2f19d6805cba579 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | purge qtjsbackendOswald Buddenhagen2013-08-171-2/+0
|/ | | | | | Change-Id: Ic761324c7b7afdfd509bea1db0d75ba259f8fb94 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Add qtmacextras and qtwinextras to qt5.git#stableSergio Ahumada2013-06-261-0/+2
| | | | | Change-Id: I440e8ad733feaadb07e74fb91342434f66bae160 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* fix Berlin's mirror URLJoerg Bornemann2013-06-211-1/+1
| | | | | | Change-Id: Id3aaaa943370bece428a37dd8a1d89034fadeffd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* renamed qtwebkit-examples-and-demos => qtwebkit-examplesOswald Buddenhagen2013-05-011-3/+3
| | | | | | Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* Add new modules (qtquickcontrols, qtserialport and qtx11extras)v5.1.0-alpha1Sergio Ahumada2013-04-041-0/+7
| | | | | | | | Also adding qtsensors as part of the default modules and updating its sha1. Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da Reviewed-by: David Faure (KDE) <faure@kde.org>
* re-add a bunch of modulesOswald Buddenhagen2013-04-031-0/+2
| | | | | | | | | | | | | | | this allows for easy cloning and build system maintenance also for modules which are currently irrelevant, thus hopefully keeping the barrier to their revival low. it does not affect the casual developer or the CI system, as init-repository will not clone these modules. This (abstractly) reverts commits 41c3f2cb5f633f0e540482ca01b2c2caa2475e57, 725a51b1d83626e16989804707356baa909c339f and 1117d4da2caf1989f63ca0a8073a799df80428bc. Change-Id: Iabc750642fc1c163f3ebc96cf6edaa9b04378094 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>