steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2008-03-11 21:01:51 -05:00
parent 5af2be3798 efa82400b8
commit c1a8056e9f
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/db/sql/sql-tests.factor
View File

@ -1,4 +1,4 @@
USING: kernel db.sql ; USING: kernel namespaces db.sql sequences math ;
IN: db.sql.tests IN: db.sql.tests
TUPLE: person name age ; TUPLE: person name age ;

42
misc/factor.sh
View File

@ -56,7 +56,7 @@ check_ret() {
check_gcc_version() { check_gcc_version() {
echo -n "Checking gcc version..." echo -n "Checking gcc version..."
GCC_VERSION=`gcc --version` GCC_VERSION=`$CC --version`
check_ret gcc check_ret gcc
if [[ $GCC_VERSION == *3.3.* ]] ; then if [[ $GCC_VERSION == *3.3.* ]] ; then
echo "bad!" echo "bad!"
@ -85,18 +85,35 @@ set_md5sum() {
fi fi
} }
set_gcc() {
case $OS in
openbsd) ensure_program_installed egcc; CC=egcc;;
*) CC=gcc;;
esac
}
set_make() {
case $OS in
netbsd) MAKE='gmake';;
freebsd) MAKE='gmake';;
openbsd) MAKE='gmake';;
dragonflybsd) MAKE='gmake';;
*) MAKE='make';;
esac
if ! [[ $MAKE -eq 'gmake' ]] ; then
ensure_program_installed gmake
fi
}
check_installed_programs() { check_installed_programs() {
ensure_program_installed chmod ensure_program_installed chmod
ensure_program_installed uname ensure_program_installed uname
ensure_program_installed git ensure_program_installed git
ensure_program_installed wget curl ensure_program_installed wget curl
ensure_program_installed gcc ensure_program_installed gcc
ensure_program_installed make ensure_program_installed make gmake
ensure_program_installed md5sum md5 ensure_program_installed md5sum md5
ensure_program_installed cut ensure_program_installed cut
case $OS in
netbsd) ensure_program_installed gmake;;
esac
check_gcc_version check_gcc_version
} }
@ -105,7 +122,7 @@ check_library_exists() {
GCC_OUT=factor-library-test.out GCC_OUT=factor-library-test.out
echo -n "Checking for library $1..." echo -n "Checking for library $1..."
echo "int main(){return 0;}" > $GCC_TEST echo "int main(){return 0;}" > $GCC_TEST
gcc $GCC_TEST -o $GCC_OUT -l $1 $CC $GCC_TEST -o $GCC_OUT -l $1
if [[ $? -ne 0 ]] ; then if [[ $? -ne 0 ]] ; then
echo "not found!" echo "not found!"
echo "Warning: library $1 not found." echo "Warning: library $1 not found."
@ -155,6 +172,7 @@ find_os() {
*NetBSD*) OS=netbsd;; *NetBSD*) OS=netbsd;;
*FreeBSD*) OS=freebsd;; *FreeBSD*) OS=freebsd;;
*OpenBSD*) OS=openbsd;; *OpenBSD*) OS=openbsd;;
*DragonFly*) OS=dragonflybsd;;
esac esac
} }
@ -206,6 +224,8 @@ echo_build_info() {
echo GIT_PROTOCOL=$GIT_PROTOCOL echo GIT_PROTOCOL=$GIT_PROTOCOL
echo GIT_URL=$GIT_URL echo GIT_URL=$GIT_URL
echo DOWNLOADER=$DOWNLOADER echo DOWNLOADER=$DOWNLOADER
echo CC=$CC
echo MAKE=$MAKE
} }
set_build_info() { set_build_info() {
@ -239,6 +259,8 @@ find_build_info() {
set_factor_binary set_factor_binary
set_build_info set_build_info
set_downloader set_downloader
set_gcc
set_make
echo_build_info echo_build_info
} }
@ -263,12 +285,8 @@ cd_factor() {
} }
invoke_make() { invoke_make() {
case $OS in $MAKE $*
netbsd) make='gmake';; check_ret $MAKE
*) make='make';;
esac
$make $*
check_ret $make
} }
make_clean() { make_clean() {