Francois Gouget : testbot/build: Rename the wine-git directory to wine to simplify setup.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: a7ab9e840be914c71c7519c6df3c3c85c798949e
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=a7ab9e840be914c71c7519c6d...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Mon Feb 25 15:55:53 2013 +0100

testbot/build: Rename the wine-git directory to wine to simplify setup.

---

 testbot/bin/build/Build.pl    |    8 ++++----
 testbot/bin/build/Reconfig.pl |    6 +++---
 testbot/doc/INSTALL.txt       |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl
index 8ecbd09..21899af 100755
--- a/testbot/bin/build/Build.pl
+++ b/testbot/bin/build/Build.pl
@@ -115,7 +115,7 @@ sub ApplyPatch
   }
 
   InfoMsg "Applying patch\n";
-  system("( cd $DataDir/wine-git && set -x && " .
+  system("( cd $DataDir/wine && set -x && " .
          "  git apply --verbose $PatchFile " .
          ") >> $LogDir/Build.log 2>&1");
   if ($? != 0)
@@ -127,7 +127,7 @@ sub ApplyPatch
   if ($NeedAutoconf && ! $NeedConfigure)
   {
     InfoMsg "Running autoconf\n";
-    system("( cd $DataDir/wine-git && set -x && " .
+    system("( cd $DataDir/wine && set -x && " .
            "  autoconf --output configure configure.ac " .
            ") >>$LogDir/Build.log 2>&1");
     if ($? != 0)
@@ -141,7 +141,7 @@ sub ApplyPatch
 
   if ($NeedImplib)
   {
-    if (open (FH, "<$DataDir/wine-git/$PatchType/$BaseName/Makefile.in"))
+    if (open (FH, "<$DataDir/wine/$PatchType/$BaseName/Makefile.in"))
     {
       $NeedImplib = !1;
       my $Line;
@@ -179,7 +179,7 @@ sub BuildTestExecutable
     InfoMsg "Reconfigure $Bits-bit crossbuild\n";
     my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32");
     system("( cd $DataDir/build-mingw$Bits && set -x && " .
-           "  ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " .
+           "  ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " .
            ") >>$LogDir/Build.log 2>&1");
     if ($? != 0)
     {
diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl
index cc8e76e..a82d879 100755
--- a/testbot/bin/build/Reconfig.pl
+++ b/testbot/bin/build/Reconfig.pl
@@ -60,7 +60,7 @@ sub FatalError
 
 sub GitPull
 {
-  system("cd $DataDir/wine-git && git pull >> $LogDir/Reconfig.log 2>&1");
+  system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1");
   if ($? != 0)
   {
     LogMsg "Git pull failed\n";
@@ -115,7 +115,7 @@ sub BuildNative
   mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native");
   system("( cd $DataDir/build-native && set -x && " .
          "  rm -rf * && " .
-         "  time ../wine-git/configure --enable-win64 --without-x --without-freetype && " .
+         "  time ../wine/configure --enable-win64 --without-x --without-freetype && " .
          "  time make -j$ncpus depend && " .
          "  time make -j$ncpus __tooldeps__ " .
          ") >>$LogDir/Reconfig.log 2>&1");
@@ -137,7 +137,7 @@ sub BuildCross
   mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits");
   system("( cd $DataDir/build-mingw$Bits && set -x && " .
          "  rm -rf * && " .
-         "  time ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " .
+         "  time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " .
          "  time make -j$ncpus depend  && " .
          "  time make -j$ncpus programs/winetest " .
          ") >>$LogDir/Reconfig.log 2>&1");
diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt
index e8101ab..c8597d2 100644
--- a/testbot/doc/INSTALL.txt
+++ b/testbot/doc/INSTALL.txt
@@ -139,10 +139,10 @@ Dependencies:
   should be available as $HOME/tools/testbot/doc/INSTALL.txt).
     git clone git://source.winehq.org/git/tools.git
 - Create the $HOME/tools/testbot/var directory and clone the Wine git
-  repository to wine-git:
+  repository to wine:
     mkdir $HOME/tools/testbot/var
     cd $HOME/tools/testbot/var
-    git clone git://source.winehq.org/git/wine.git wine-git
+    git clone git://source.winehq.org/git/wine.git wine
 - Run $HOME/tools/testbot/bin/build/Reconfig.pl.
 - Check $HOME/tools/testbot/var/Reconfig.log to make sure it succeeded. Fix
   issues until it works.