From ed025f1c85035680ed4119941b6c206231dd02a0 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Tue, 15 Mar 2011 20:04:15 +0000
Subject: [PATCH] win32: remove automatic build option from mingw script

This removes the "Do you want to checkout and build Clutter?" option
from the mingw-cross-compile.sh script and renames the script
mingw-fetch-dependencies.sh

As it stands the mingw-cross-compile.sh script isn't enough to fetch all
the dependencies for building clutter, since Tor doesn't provide binaries
for json-glib so the option to checkout and build clutter can't work.

Also it doesn't seem ideal to clone a fresh clutter repo instead of
being able to compile the source of the current repo.
---
 build/mingw/Makefile.am                       |  2 +-
 build/mingw/README                            |  6 ++---
 ...compile.sh => mingw-fetch-dependencies.sh} | 24 -------------------
 3 files changed, 4 insertions(+), 28 deletions(-)
 rename build/mingw/{mingw-cross-compile.sh => mingw-fetch-dependencies.sh} (93%)

diff --git a/build/mingw/Makefile.am b/build/mingw/Makefile.am
index 69195f791..dda135072 100644
--- a/build/mingw/Makefile.am
+++ b/build/mingw/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = README mingw-cross-compile.sh
+EXTRA_DIST = README mingw-fetch-dependencies.sh
diff --git a/build/mingw/README b/build/mingw/README
index 61e6a13b1..8ba008e12 100644
--- a/build/mingw/README
+++ b/build/mingw/README
@@ -1,5 +1,5 @@
-The mingw-cross-compile.sh script in this directory automates
-compilation of Clutter using the MinGW compiler. For a description of
-how to use it, see:
+The mingw-fetch-dependencies.sh script in this directory automates
+fetching of the depndencies required to cross compile Clutter using
+the MinGW compiler. For a description of how to use it, see:
 
  http://wiki.clutter-project.org/wiki/BuildingClutterOnWindows
diff --git a/build/mingw/mingw-cross-compile.sh b/build/mingw/mingw-fetch-dependencies.sh
similarity index 93%
rename from build/mingw/mingw-cross-compile.sh
rename to build/mingw/mingw-fetch-dependencies.sh
index 189a60de0..981020b3f 100755
--- a/build/mingw/mingw-cross-compile.sh
+++ b/build/mingw/mingw-fetch-dependencies.sh
@@ -31,8 +31,6 @@ GL_HEADER_URLS=( \
 
 GL_HEADERS=( gl.h mesa_wgl.h glext.h );
 
-CLUTTER_GIT="git://git.clutter-project.org"
-
 function download_file ()
 {
     local url="$1"; shift;
@@ -314,25 +312,3 @@ fi;
 EOF
 
 chmod a+x "$env_file";
-
-if y_or_n "Do you want to checkout and build Clutter?"; then
-    source "$env_file";
-
-    guess_dir CLUTTER_BUILD_DIR "clutter" \
-	"the build directory for clutter" "Build dir";
-    git clone "$CLUTTER_GIT/clutter" $CLUTTER_BUILD_DIR;
-    if [ "$?" -ne 0 ]; then
-	echo "git failed";
-	exit 1;
-    fi;
-    ( cd "$CLUTTER_BUILD_DIR" && do_autogen );
-    if [ "$?" -ne 0 ]; then
-	echo "autogen failed";
-	exit 1;
-    fi;
-    ( cd "$CLUTTER_BUILD_DIR" && make all install );
-    if [ "$?" -ne 0 ]; then
-	echo "make failed";
-	exit 1;
-    fi;
-fi;