projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* XmlSerializerTests.cs: Undo some of Hagit's code formatting changes.
[mono.git]
/
web
/
mono-build-w32.sh
diff --git
a/web/mono-build-w32.sh
b/web/mono-build-w32.sh
index 73e3fd17acaf4f89c3c516e12a911a68d451d90b..fe9d061fe51311684dbe497f30c7d60d2415b790 100755
(executable)
--- a/
web/mono-build-w32.sh
+++ b/
web/mono-build-w32.sh
@@
-16,6
+16,7
@@
test -z "$here" && here=`pwd`
echo "Building Mono and dependencies in $here, installing to $here/install"
PATH=$here/install/bin:$here/install/lib:$PATH
echo "Building Mono and dependencies in $here, installing to $here/install"
PATH=$here/install/bin:$here/install/lib:$PATH
+export C_INCLUDE_PATH=$here/install/include
# Make sure cygwin's libiconv is installed, or libtool blows its tiny mind
if [ ! -f /usr/lib/libiconv.la ]; then
# Make sure cygwin's libiconv is installed, or libtool blows its tiny mind
if [ ! -f /usr/lib/libiconv.la ]; then
@@
-48,11
+49,6
@@
fi
cvs checkout mono || exit -1
cvs checkout mono || exit -1
-if [ ! -z "${AUTO_STABLE}" -o -e /usr/autotool/stable ]; then
- export AUTO_STABLE=${AUTO_STABLE:-/usr/autotool/stable}
- export AUTO_DEVEL=${AUTO_STABLE}
-fi
-
echo "Checking automake version"
automake_required="1.6.2"
automake_version=`automake --version | head -1 | awk '{print $4}' | tr -d '[a-zA-Z]' | sed 's/-.*$//g'`
echo "Checking automake version"
automake_required="1.6.2"
automake_version=`automake --version | head -1 | awk '{print $4}' | tr -d '[a-zA-Z]' | sed 's/-.*$//g'`
@@
-64,6
+60,14
@@
else
echo "Automake version new enough."
fi
echo "Automake version new enough."
fi
+# This causes libgc-not-found problem
+#
+## Select the stable version anyway...
+#if [ ! -z "${AUTO_STABLE}" -o -e /usr/autotool/stable ]; then
+# export AUTO_STABLE=${AUTO_STABLE:-/usr/autotool/stable}
+# export AUTO_DEVEL=${AUTO_STABLE}
+#fi
+
# Need to install pkgconfig and set ACLOCAL_FLAGS if there is not a
# pkgconfig installed already. Otherwise set PKG_CONFIG_PATH to the
# glib we're about to install in $here/install.
# Need to install pkgconfig and set ACLOCAL_FLAGS if there is not a
# pkgconfig installed already. Otherwise set PKG_CONFIG_PATH to the
# glib we're about to install in $here/install.
@@
-97,6
+101,15
@@
function aclocal_scan () {
return 1
}
return 1
}
+function install_icuconfig() {
+ if [ ! -f $here/install/bin/icu-config ]; then
+ wget http://www.go-mono.com/archive/icu-config
+ mv icu-config $here/install/bin
+ chmod 755 $here/install/bin/icu-config
+ fi
+}
+
+
function install_package() {
zipfile=$1
markerfile=$2
function install_package() {
zipfile=$1
markerfile=$2
@@
-122,11
+135,13
@@
else
install_pkgconfig=yes
fi
install_pkgconfig=yes
fi
-# But we still need to use the mingw libs for glib & co
-ACLOCAL_FLAGS="-I $here/install/share/aclocal $ACLOCAL_FLAGS"
+# This causes libgc-not-found problem
+#
+## But we still need to use the mingw libs for glib & co
+#ACLOCAL_FLAGS="-I $here/install/share/aclocal $ACLOCAL_FLAGS"
-export PATH
-export ACLOCAL_FLAGS
+
#
export PATH
+
#
export ACLOCAL_FLAGS
# Grab pkg-config, glib etc
if [ ! -d $here/install ]; then
# Grab pkg-config, glib etc
if [ ! -d $here/install ]; then
@@
-145,6
+160,9
@@
install_package glib-dev-2.0.4-20020703.zip lib/glib-2.0.lib glib-dev
install_package libiconv-1.7.zip lib/iconv.dll iconv
install_package libintl-0.10.40-20020101.zip lib/libintl-1.dll intl
install_package libgc-dev.zip lib/gc.dll gc-dev
install_package libiconv-1.7.zip lib/iconv.dll iconv
install_package libintl-0.10.40-20020101.zip lib/libintl-1.dll intl
install_package libgc-dev.zip lib/gc.dll gc-dev
+install_package icu-2.6.1-Win32_msvc7.zip icu/bin/icuuc26.dll icu
+
+install_icuconfig
if [ $install_pkgconfig = "no" ]; then
echo "Fixing up the pkgconfig paths"
if [ $install_pkgconfig = "no" ]; then
echo "Fixing up the pkgconfig paths"
@@
-157,10
+175,9
@@
if [ $install_pkgconfig = "no" ]; then
fi
# Needed to find the libgc bits
fi
# Needed to find the libgc bits
-CPPFLAGS="$CPPFLAGS -I$here/install/include"
-LDFLAGS="$LDFLAGS -L$here/install/lib"
-export CPPFLAGS
-export LDFLAGS
+export CFLAGS="-I $here/install/include -I $here/install/icu/include"
+export LDFLAGS="-L$here/install/lib -L$here/install/icu/lib"
+export PATH="$here/install/icu/bin:$PATH"
# Make sure we build native w32, not cygwin
#CC="gcc -mno-cygwin"
# Make sure we build native w32, not cygwin
#CC="gcc -mno-cygwin"