brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win32: remove automatic build option from mingw script

Browse Source 
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.
This commit is contained in:
Robert Bragg 2011-03-15 20:04:15 +00:00
parent e51749d33c
commit ed025f1c85
3 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/mingw/Makefile.am
View File

@ -1 +1 @@
EXTRA_DIST = README mingw-cross-compile.sh EXTRA_DIST = README mingw-fetch-dependencies.sh

6
build/mingw/README
View File

@ -1,5 +1,5 @@
The mingw-cross-compile.sh script in this directory automates The mingw-fetch-dependencies.sh script in this directory automates
compilation of Clutter using the MinGW compiler. For a description of fetching of the depndencies required to cross compile Clutter using
how to use it, see: the MinGW compiler. For a description of how to use it, see:
http://wiki.clutter-project.org/wiki/BuildingClutterOnWindows http://wiki.clutter-project.org/wiki/BuildingClutterOnWindows

24
build/mingw/mingw-cross-compile.sh → build/mingw/mingw-fetch-dependencies.sh
View File

@ -31,8 +31,6 @@ GL_HEADER_URLS=( \
GL_HEADERS=( gl.h mesa_wgl.h glext.h ); GL_HEADERS=( gl.h mesa_wgl.h glext.h );
CLUTTER_GIT="git://git.clutter-project.org"
function download_file () function download_file ()
{ {
local url="$1"; shift; local url="$1"; shift;
@ -314,25 +312,3 @@ fi;
EOF EOF
chmod a+x "$env_file"; 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;