diff options
| -rw-r--r-- | .gitmodules | 68 | ||||
| -rwxr-xr-x | init-repository | 51 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtactiveqt | 0 | ||||
| m--------- | qtandroidextras | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtcanvas3d | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtenginio | 0 | ||||
| m--------- | qtfeedback | 0 | ||||
| m--------- | qtgraphicaleffects | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtmacextras | 0 | ||||
| m--------- | qtmultimedia | 0 | ||||
| m--------- | qtpim | 0 | ||||
| m--------- | qtpurchasing | 0 | ||||
| m--------- | qtqa | 0 | ||||
| m--------- | qtquick1 | 0 | ||||
| m--------- | qtquickcontrols | 0 | ||||
| m--------- | qtquickcontrols2 | 0 | ||||
| m--------- | qtscript | 0 | ||||
| m--------- | qtsensors | 0 | ||||
| m--------- | qtserialbus | 0 | ||||
| m--------- | qtserialport | 0 | ||||
| m--------- | qtsvg | 0 | ||||
| m--------- | qtsystems | 0 | ||||
| m--------- | qttools | 0 | ||||
| m--------- | qttranslations | 0 | ||||
| m--------- | qtwayland | 0 | ||||
| m--------- | qtwebchannel | 0 | ||||
| m--------- | qtwebengine | 0 | ||||
| m--------- | qtwebkit | 0 | ||||
| m--------- | qtwebkit-examples | 0 | ||||
| m--------- | qtwebsockets | 0 | ||||
| m--------- | qtwebview | 0 | ||||
| m--------- | qtwinextras | 0 | ||||
| m--------- | qtx11extras | 0 | ||||
| m--------- | qtxmlpatterns | 0 |
41 files changed, 69 insertions, 50 deletions
diff --git a/.gitmodules b/.gitmodules index 7b606d91..743e2e8e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.6.0 + branch = 5.6 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.6.0 + branch = 5.6 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.6.0 + branch = 5.6 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.6.0 + branch = 5.6 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.6.0 + branch = 5.6 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.6.0 + branch = 5.6 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.6.0 + branch = 5.6 status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.6.0 + branch = 5.6 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.6.0 + branch = 5.6 status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,14 +96,14 @@ recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtsystems"] depends = qtbase @@ -136,130 +136,130 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats path = qt3d url = ../qt3d.git - branch = 5.6.0 + branch = 5.6 status = preview [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtquick1"] depends = qtscript recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git - branch = 5.6.0 + branch = 5.6 status = obsolete [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.6.0 + branch = 5.6 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.6.0 + branch = 5.6 status = preview [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 5.6.0 + branch = 5.6 status = deprecated [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = 5.6.0 + branch = 5.6 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.6.0 + branch = 5.6 status = addon [submodule "qtquickcontrols2"] depends = qtquickcontrols path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.6.0 + branch = 5.6 status = preview [submodule "qtpurchasing"] depends = qtbase diff --git a/init-repository b/init-repository index cf9487a2..fd291252 100755 --- a/init-repository +++ b/init-repository @@ -157,7 +157,10 @@ EOF use Carp qw( confess ); use English qw( -no_match_vars ); use Getopt::Long qw( GetOptions ); -use Cwd qw( getcwd ); +use Cwd qw( getcwd abs_path ); + +my $script_path = abs_path($0); +$script_path =~ s,[/\\][^/\\]+$,,; my $GERRIT_SSH_BASE = 'ssh://@USER@codereview.qt-project.org@PORT@/'; @@ -522,11 +525,16 @@ sub ensure_link return if (!$self->{'force-hooks'} and -f $tgt); unlink($tgt); # In case we have a dead symlink or pre-existing hook print "Aliasing $src\n as $tgt ...\n" if (!$self->{quiet}); - return if eval { symlink($src, $tgt) }; + if ($^O ne "msys" && $^O ne "MSWin32") { + return if eval { symlink($src, $tgt) }; + } # Windows doesn't do (proper) symlinks. As the post_commit script needs # them to locate itself, we write a forwarding script instead. open SCRIPT, ">".$tgt or die "Cannot create forwarding script $tgt: $!\n"; - print SCRIPT "#!/bin/sh\nexec `dirname \$0`/$src \"\$\@\"\n"; + # Make the path palatable for MSYS. + $src =~ s,\\,/,g; + $src =~ s,^(.):/,/$1/,g; + print SCRIPT "#!/bin/sh\nexec $src \"\$\@\"\n"; close SCRIPT; } @@ -534,19 +542,30 @@ sub git_install_hooks { my ($self) = @_; - return if (!-d 'qtrepotools/git-hooks'); - - # Force C locale as git submodule returns the localized string "Entering" - local $ENV{LC_ALL} = 'C'; - chomp(my @modules = `git submodule foreach :`); - push @modules, ""; - for my $module (@modules) { - $module =~ s,^Entering \'([^\']+)\'$,$1/,; - my $rel = $module; - $rel =~ s,[^/]+,..,g; - $rel .= "../../qtrepotools/git-hooks/"; - $self->ensure_link($rel.'gerrit_commit_msg_hook', $module.'.git/hooks/commit-msg'); - $self->ensure_link($rel.'git_post_commit_hook', $module.'.git/hooks/post-commit'); + my $hooks = $script_path.'/qtrepotools/git-hooks'; + return if (!-d $hooks); + + my @configresult = qx(git config --list --local); + foreach my $line (@configresult) { + next if ($line !~ /submodule\.([^.=]+)\.url=/); + my $module = $1.'/.git'; + if (!-d $module) { + open GITD, $module or die "Cannot open $module: $!\n"; + my $gd = <GITD>; + close GITD; + chomp($gd); + $gd =~ s/^gitdir: // or die "Malformed .git file $module\n"; + $module = $gd; # We expect it to be always absolute. + if (open COMD, $module.'/commondir') { + my $cd = <COMD>; + chomp($cd); + $module .= '/'.$cd; + $module = abs_path($module); + close COMD; + } + } + $self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module.'/hooks/commit-msg'); + $self->ensure_link($hooks.'/git_post_commit_hook', $module.'/hooks/post-commit'); } } diff --git a/qt3d b/qt3d -Subproject 7a208d76ed96bb506899becfe680df06f95451c +Subproject d4553c08097a2bc632be57c085105b4f4ff0c54 diff --git a/qtactiveqt b/qtactiveqt -Subproject ffa6ba6d81bc79769b5d7c14b3c11f5fb644e3b +Subproject a4b8485cd38a9c33cdcf1b97633fa65b7230643 diff --git a/qtandroidextras b/qtandroidextras -Subproject c2ca28adc0e821427072d86cbb4fbc27a39d130 +Subproject 0a1697302c15c0911bd2c78da3cd47a4006fe5f diff --git a/qtbase b/qtbase -Subproject d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5 +Subproject 2e385b3d74ffbcad820b36b717f9215cc7b8672 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d1 +Subproject d367ac81d5ef77f02434274524477dc0e5c2b4a diff --git a/qtconnectivity b/qtconnectivity -Subproject 8b550f0a7508ed413cded71a20485e61010b0aa +Subproject 80b6557be3a23a5118ddf8c4b68bc28b66f52b4 diff --git a/qtdeclarative b/qtdeclarative -Subproject dc558b69f083c89aa8c02952e5f167405939a61 +Subproject 7d8c941574114ff0ce3f12793bc9c9356577fc0 diff --git a/qtdoc b/qtdoc -Subproject 2ed0ac4bbb4d3bfe884f946eac89f71c44f3d27 +Subproject 0d69406c73baae0005f19bd38bde913d270080e diff --git a/qtenginio b/qtenginio -Subproject 2a19257a5eef7a25a05d5cf7ea69ecc4184226f +Subproject a6434420574f775d3afa6e8912eb2ede8429db9 diff --git a/qtfeedback b/qtfeedback -Subproject 862de791d785797a561204c78490f31a318a936 +Subproject 28ca62414901502189ea28ef2efd55138618761 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 4b8e9a348ca379b203c26ff14dd236267dd6064 +Subproject 6523d7c4843e1d4176035c46e1514c39bdcfc3b diff --git a/qtimageformats b/qtimageformats -Subproject 0bd46d5861fa7b48c87cd3a734d00671df92986 +Subproject bf5b49878d75d316f31225f76152e8381a3d5f0 diff --git a/qtlocation b/qtlocation -Subproject ca4bce553d03a64fa119650990083267ea9c8d3 +Subproject f40e92b147560be15e0f53dfd7f6b2d698c00fb diff --git a/qtmacextras b/qtmacextras -Subproject d8ebb7eeea7e6b19763f248d1e04e8a22b91bad +Subproject 15fb52a91240efa495d8a4cdca533bfc4615fbb diff --git a/qtmultimedia b/qtmultimedia -Subproject 9985224a89b830dc182b428f491b6187d6f0e1b +Subproject 15c42ebccb45fcfd2d7d0c6a52af1f81eb1eb70 diff --git a/qtpim b/qtpim -Subproject fa74ad6eda129af79416c54e42b6e4326e8c954 +Subproject de4cfc6b53b426799a035fefe81db9d49d3d03a diff --git a/qtpurchasing b/qtpurchasing -Subproject 951d75d744ab66665b41d533ce3d38df07c0400 +Subproject b5c6c76fac771326064295368a53cbdaf2bf0f7 diff --git a/qtqa b/qtqa -Subproject 683f523bcc524e6f78e5a3d1d3c15e2d858bac8 +Subproject 7c7310a7e6b35591e64e6c978a179b5846296ee diff --git a/qtquick1 b/qtquick1 -Subproject dcc5e5c01c28b227f0e5e5e4976a9d26e8a4529 +Subproject bf4efac4ed2f3b1ff11fd1361506dec3c2a8726 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79 +Subproject ba2c5d40c53d5a268022931c978534563aeff80 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 7fc567eda8a187e365f4c29c6e8f08440bf3121 +Subproject c59c43bbc44026a508746b1de2505f6185bd031 diff --git a/qtscript b/qtscript -Subproject a70f6a1b9599931fccd13b15a1700e61137f7e7 +Subproject c22103904bfabc38edab7ac538f30fe74cecd3f diff --git a/qtsensors b/qtsensors -Subproject 7197e7f4b385315cb241043495cbfad58deb911 +Subproject 0b00ee6f6c311a7f5c0b4f2441dad97a454d172 diff --git a/qtserialbus b/qtserialbus -Subproject 48f32572590e45a57573944c0822855819d138d +Subproject 04b75569f36eec14662505a08bf8c1d565cb10f diff --git a/qtserialport b/qtserialport -Subproject 03d492e49e74eefa1c83e37e833d862f4b9f1e4 +Subproject 9a70ee2389d3302f6a4262325f8a76e4d867b47 diff --git a/qtsvg b/qtsvg -Subproject 38777ea7451d55e9c3d32d88d46063016013f60 +Subproject b722836765dccca04683939d0d4f72a9e2585d8 diff --git a/qtsystems b/qtsystems -Subproject 37b614abbfb35d06a57e5b0824249c3abd5640e +Subproject cc2077700bd5503d1fcf53aef83cbb76975e745 diff --git a/qttools b/qttools -Subproject 9904992dc4eb9a5958fcfbac238374ff3849814 +Subproject 440502811b7b9749d621d20d18cfd569fceeb5c diff --git a/qttranslations b/qttranslations -Subproject 41d212290c3822b8eef151785d89ac5f5b246bd +Subproject cbef985e3c3e9af2d124d40959fc674b3b8aa33 diff --git a/qtwayland b/qtwayland -Subproject 29b8bd8b1117589341110502fe516bf22c92074 +Subproject 3fcb77996b3e6c076d50db9ccf9da3aefd24f15 diff --git a/qtwebchannel b/qtwebchannel -Subproject 92d903d92b430222cd3f89eab08d61d947e5abe +Subproject 64a106da72796377bbff5cce0ecc5a379b10549 diff --git a/qtwebengine b/qtwebengine -Subproject 5c4ae298b0a3d75c4c5ea8aef0595914ab25607 +Subproject 963f90b7a07236d81d7bb65798c641556501ab1 diff --git a/qtwebkit b/qtwebkit -Subproject 81f43efbb2112b693b21d8f95cd627e9fd1032b +Subproject 7205faf1a546a690f68176989100109e9a3335b diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject 7988aecdbcb07f3a214c2c804a39db3fc561784 +Subproject 1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb3 diff --git a/qtwebsockets b/qtwebsockets -Subproject 88946bbe209cb6148b4a3284077bb9a06c7bc1e +Subproject 3b128f9b45f4fafc305ff0c89cfc2cb665c856d diff --git a/qtwebview b/qtwebview -Subproject 847f8c40c1f124f3021d78644562b359540e26d +Subproject 299883956859a3eea1f2637a781adfec45c4b3c diff --git a/qtwinextras b/qtwinextras -Subproject b53d3a1e1439f4af908094dc82ba27c9b82d07c +Subproject f132bf0938c13745d4e6f7dd9c65db577d94187 diff --git a/qtx11extras b/qtx11extras -Subproject d64ee96f0df4d3baa6959b8552bc59d53cb0b45 +Subproject f27489d66cc6d8263130451c26c7e4ae40acc6b diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject de2dadb8af67f9d425c3a8d2353a7d5b0758891 +Subproject 7a8d395a3b1eb5f24aa96509666326bad4218c1 |