Replace mother with qt-bundle

1 files changed, 14 insertions, 14 deletions

diff --git a/scripts/905_git_split b/scripts/905_git_split
index d0d7785..fba3986 100644
--- a/scripts/905_git_split
+++ b/scripts/905_git_split
@@ -26,11 +26,11 @@ chdir("..");
 fsRmdir("src");
 fsRmdir("tools");
 
-# Ensure that the mother repo <QTDIR>/qt is created
+# Ensure that the qt-bundle repo <QTDIR>/qt is created
 # any by default use that as the repo base for the modules
-my $motherdir = "qt";
-my $repos_base = $qtdir . "/" . $motherdir;
-ensureDir($motherdir);
+my $qtbundledir = "qt";
+my $repos_base = $qtdir . "/" . $qtbundledir;
+ensureDir($qtbundledir);
 my $cacheDir = $qtWebKitType;
 
 
@@ -84,13 +84,13 @@ foreach my $module (@repos) {
     chdir($qtdir);
 }
 
-#-- generate mother repo
-chdir($motherdir);
+#-- generate qt-bundle repo
+chdir($qtbundledir);
 run ("git init . -q");
-fsCopy("-r", "$basepath/mother/*", ".");
+fsCopy("-r", "$basepath/qt-bundle/*", ".");
 if ($link_type == COPY || $link_type == HARDLINKS) {
     foreach my $module (@repos) {
-        # module repo will either be inside the mother repo already
+        # module repo will either be inside the qt-bundle 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");
@@ -131,7 +131,7 @@ if (! -d "$basepath/$cacheDir") {
     if (runNotDie("git cat-file -e $qtWebKitCheckoutRef")) {
         run("git fetch");
     }
-    chdir("$qtdir/$motherdir");
+    chdir("$qtdir/$qtbundledir");
 }
 if ($run_push) {
     run("git submodule -q add --reference $basepath/$cacheDir $qtWebKitCloneUrl qtwebkit");
@@ -143,13 +143,13 @@ run("git reset --hard $qtWebKitCheckoutRef");
 chdir("..");
 run("git submodule init");
 run ("git add . "); #
-run("git commit -m \"Long live the mother Qt repository\" --author \"Qt by Nokia <qt-info\@nokia.com>\"  -q");
+run("git commit -m \"Long live the qt-bundle Qt repository\" --author \"Qt by Nokia <qt-info\@nokia.com>\"  -q");
 
-# push mother to the server
+# push qt-bundle to the server
 if ($run_push) {
-    print("Pushing mother repo to server:\n");
-    run("git remote add mother git\@scm.dev.nokia.troll.no:qt/mother.git");
-    run("GIT_FORCE=yes-please GIT_PUSH=size,generated,crlf,conflict,giant,alien git push mother +master");
+    print("Pushing qt-bundle repo to server:\n");
+    run("git remote add qt-bundle git\@scm.dev.nokia.troll.no:qt/qt-bundle.git");
+    run("GIT_FORCE=yes-please GIT_PUSH=size,generated,crlf,conflict,giant,alien git push qt-bundle +master");
 }
 
 return 1;