diff options
author | axis <qt-info@nokia.com> | 2011-04-26 18:20:50 +0200 |
---|---|---|
committer | axis <qt-info@nokia.com> | 2011-04-26 18:20:50 +0200 |
commit | 2f66cb61ffbf147292092ebe29e3d4759dfb9bda (patch) | |
tree | dc17c144831bbd41323a00afdb73b349c13e749a | |
parent | 6e80000e505eb521f754414b86eec243d8df0bc6 (diff) |
The fixes needed to do the final push.
-rwxr-xr-x | modularize | 4 | ||||
-rw-r--r-- | scripts/905_git_split | 6 | ||||
-rw-r--r-- | scripts/950_pulse_dep_tree | 4 |
3 files changed, 8 insertions, 6 deletions
@@ -51,7 +51,7 @@ our @repos = ('qtbase', 'qtsvg', 'qtdeclarative', 'qt3support', 'qtactiveqt', ); # Whether we are using qtwebkit or webkit trunk. -our $qtWebKitType = "webkit"; +our $qtWebKitType = "qtwebkit"; our $qtWebKitCloneUrl; our $qtWebKitCheckoutRef; @@ -60,7 +60,7 @@ if ($qtWebKitType =~ /^webkit$/) { $qtWebKitCheckoutRef = "f1bfaac6bd42996c6a41ad2174b79ae200652759"; # master } else { $qtWebKitCloneUrl = "git://gitorious.org/webkit/qtwebkit.git"; - $qtWebKitCheckoutRef = "f3f39d43672e979521897a5dda98840ea63c238a"; #"refs/remotes/origin/qtwebkit-2.2"; + $qtWebKitCheckoutRef = "f1bfaac6bd42996c6a41ad2174b79ae200652759"; #"refs/remotes/origin/qt-modularization-base"; } diff --git a/scripts/905_git_split b/scripts/905_git_split index ad3201a..cdfd68d 100644 --- a/scripts/905_git_split +++ b/scripts/905_git_split @@ -135,7 +135,8 @@ if ($link_type == COPY || $link_type == HARDLINKS) { # module repo will either be inside the qt5 repo already # or in the move destination directory if ($run_push) { - run("git submodule -q add --reference $repos_base/$module git://scm.dev.nokia.troll.no/qt/$module.git $module"); + #run("git submodule -q add --reference $repos_base/$module git://scm.dev.nokia.troll.no/qt/$module.git $module"); + run("git submodule -q add --reference $repos_base/$module git://gitorious.org/qt/$module.git $module"); } else { run("git submodule -q add $repos_base/$module"); } @@ -146,7 +147,7 @@ if (-d "$basepath/$cacheDir") { chdir("$basepath/$cacheDir"); my $remoteUrl = `git config --get remote.origin.url`; chdir($repos_base); - if ($remoteUrl !~ $qtWebKitCloneUrl) { + if (0 && $remoteUrl !~ $qtWebKitCloneUrl) { print("Deleting cached qtwebkit clone because URLs don't match.\n"); if ($OStype == WINDOWS) { my $webkitPath = "$basepath/$cacheDir"; @@ -181,6 +182,7 @@ if ($run_push) { run("git submodule -q add $basepath/$cacheDir qtwebkit"); } chdir("qtwebkit"); +run("git checkout -b qt-modularization-base origin/qt-modularization-base"); run("git reset --hard $qtWebKitCheckoutRef"); chdir(".."); run("git submodule init"); diff --git a/scripts/950_pulse_dep_tree b/scripts/950_pulse_dep_tree index 5c433c1..2518426 100644 --- a/scripts/950_pulse_dep_tree +++ b/scripts/950_pulse_dep_tree @@ -159,7 +159,7 @@ sub resolveAndCommitDependencies { $committedSha = "LATEST_REVISION"; # Also, go back one commit, because we don't want the newly generated commit to be referenced in # the mother repo. - run("git checkout -q master~1"); + run("git checkout -q qt-modularization-base~1"); } else { run("git push origin master") if ($run_push); $committedSha = `git rev-parse HEAD`; @@ -179,6 +179,6 @@ run("git commit -aq --author=\"axis <qt-info\@nokia.com>\" " . "-m \"Committed dependency information to all modules.\""); run("git push origin master") if ($run_push); -run("cd qtwebkit && git checkout -q master"); +run("cd qtwebkit && git checkout -q qt-modularization-base"); return 1; |