Merge git://spitspat.com/git/factor

release
Doug Coleman 2007-12-04 14:16:04 -06:00
commit 834090f09a
1 changed files with 27 additions and 6 deletions

View File

@ -32,12 +32,16 @@ check_ret() {
}
check_gcc_version() {
echo -n "Checking gcc version..."
GCC_VERSION=`gcc --version`
check_ret gcc
if [[ $GCC_VERSION == *3.3.* ]] ; then
echo "bad!"
echo "You have a known buggy version of gcc (3.3)"
echo "Install gcc 3.4 or higher and try again."
exit 3
fi
echo "ok."
}
check_installed_programs() {
@ -53,16 +57,20 @@ check_installed_programs() {
check_library_exists() {
GCC_TEST=factor-library-test.c
GCC_OUT=factor-library-test.out
echo "Checking for library $1"
echo -n "Checking for library $1"
echo "int main(){return 0;}" > $GCC_TEST
gcc $GCC_TEST -o $GCC_OUT -l $1
if [[ $? -ne 0 ]] ; then
echo "not found!"
echo "Warning: library $1 not found."
echo "***Factor will compile NO_UI=1"
NO_UI=1
fi
rm -f $GCC_TEST
check_ret rm
rm -f $GCC_OUT
check_ret rm
echo "found."
}
check_X11_libraries() {
@ -87,7 +95,9 @@ check_factor_exists() {
}
find_os() {
echo "Finding OS..."
uname_s=`uname -s`
check_ret uname
case $uname_s in
CYGWIN_NT-5.2-WOW64) OS=windows-nt;;
*CYGWIN_NT*) OS=windows-nt;;
@ -100,7 +110,9 @@ find_os() {
}
find_architecture() {
echo "Finding ARCH..."
uname_m=`uname -m`
check_ret uname
case $uname_m in
i386) ARCH=x86;;
i686) ARCH=x86;;
@ -116,6 +128,7 @@ write_test_program() {
}
find_word_size() {
echo "Finding WORD..."
C_WORD=factor-word-size
write_test_program
gcc -o $C_WORD $C_WORD.c
@ -208,11 +221,11 @@ get_boot_image() {
maybe_download_dlls() {
if [[ $OS == windows-nt ]] ; then
wget http://factorcode.org/dlls/freetype6.dll
check_ret
check_ret wget
wget http://factorcode.org/dlls/zlib1.dll
check_ret
check_ret wget
chmod 777 *.dll
check_ret
check_ret chmod
fi
}
@ -221,7 +234,7 @@ bootstrap() {
}
usage() {
echo "usage: $0 install|install-x11|update"
echo "usage: $0 install|install-x11|update|quick-update"
}
install() {
@ -244,11 +257,18 @@ update() {
git_pull_factorcode
make_clean
make_factor
}
update_bootstrap() {
delete_boot_images
get_boot_image
bootstrap
}
refresh_image() {
./$FACTOR_BINARY -e="refresh-all save 0 USE: system exit"
}
install_libraries() {
sudo apt-get install libc6-dev libfreetype6-dev wget git-core git-doc libx11-dev glutg3-dev rlwrap
}
@ -256,6 +276,7 @@ install_libraries() {
case "$1" in
install) install ;;
install-x11) install_libraries; install ;;
update) update ;;
quick-update) update; refresh_image ;;
update) update; update_bootstrap ;;
*) usage ;;
esac