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

build.sh: correctness / safety and fixups

handle-patch-and-put
Cat Stevens 2018-08-16 20:26:16 -04:00 committed by John Benediktsson
parent f11e5da90f
commit d8e7e8606f
1 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
build.sh
View File

@ -15,9 +15,11 @@ GIT_PROTOCOL=${GIT_PROTOCOL:="git"}
GIT_URL=${GIT_URL:=$GIT_PROTOCOL"://factorcode.org/git/factor.git"} GIT_URL=${GIT_URL:=$GIT_PROTOCOL"://factorcode.org/git/factor.git"}
SCRIPT_ARGS="$*" SCRIPT_ARGS="$*"
REQUIRE_CLANG_VERSION=3.1
# return 1 on found # return 1 on found
test_program_installed() { test_program_installed() {
if ! [[ -n `type -p $1` ]] ; then if ! [[ -n $(type -p $1) ]] ; then
return 0; return 0;
fi fi
return 1; return 1;
@ -27,7 +29,7 @@ test_program_installed() {
test_programs_installed() { test_programs_installed() {
installed=0; installed=0;
$ECHO -n "Checking for all($*)..." $ECHO -n "Checking for all($*)..."
for i in $* ; for i in "$@" ;
do do
test_program_installed $i test_program_installed $i
if [[ $? -eq 1 ]]; then if [[ $? -eq 1 ]]; then
@ -54,7 +56,7 @@ exit_script() {
ensure_program_installed() { ensure_program_installed() {
installed=0; installed=0;
$ECHO -n "Checking for any($*)..." $ECHO -n "Checking for any($*)..."
for i in $* ; for i in "$@" ;
do do
test_program_installed $i test_program_installed $i
if [[ $? -eq 1 ]]; then if [[ $? -eq 1 ]]; then
@ -133,16 +135,16 @@ semver_into() {
} }
clang_version_ok() { clang_version_ok() {
CLANG_VERSION=`clang --version | head -n1` CLANG_VERSION=$(clang --version | head -n1)
CLANG_VERSION_RE='^[a-zA-Z0-9 ]* version (.*)$' # 3.3-5 CLANG_VERSION_RE='^[a-zA-Z0-9 ]* version (.*)$' # 3.3-5
if [[ $CLANG_VERSION =~ $CLANG_VERSION_RE ]] ; then if [[ $CLANG_VERSION =~ $CLANG_VERSION_RE ]] ; then
export "CLANG_VERSION=${BASH_REMATCH[1]}" export "CLANG_VERSION=${BASH_REMATCH[1]}"
local CLANG_MAJOR local CLANG_MINOR local CLANG_PATCH local CLANG_SPECIAL local CLANG_MAJOR CLANG_MINOR CLANG_PATCH CLANG_SPECIAL
semver_into "$CLANG_VERSION" CLANG_MAJOR CLANG_MINOR CLANG_PATCH CLANG_SPECIAL semver_into "$CLANG_VERSION" CLANG_MAJOR CLANG_MINOR CLANG_PATCH CLANG_SPECIAL
if [[ $CLANG_MAJOR -lt 3 if [[ $CLANG_MAJOR -lt 3
|| ( $CLANG_MAJOR -eq 3 && $CLANG_MINOR -le 1 ) || ( $CLANG_MAJOR -eq 3 && $CLANG_MINOR -le 1 )
]] ; then ]] ; then
echo "clang version required >= 3.1, got $CLANG_VERSION" echo "clang version required >= $REQUIRE_CLANG_VERSION, got $CLANG_VERSION"
return 1 return 1
fi fi
else else
@ -241,7 +243,7 @@ check_factor_exists() {
find_os() { find_os() {
if [[ -n $OS ]] ; then return; fi if [[ -n $OS ]] ; then return; fi
$ECHO "Finding OS..." $ECHO "Finding OS..."
uname_s=`uname -s` uname_s=$(uname -s)
check_ret uname check_ret uname
case $uname_s in case $uname_s in
CYGWIN_NT-5.2-WOW64) OS=windows;; CYGWIN_NT-5.2-WOW64) OS=windows;;
@ -258,7 +260,7 @@ find_os() {
find_architecture() { find_architecture() {
if [[ -n $ARCH ]] ; then return; fi if [[ -n $ARCH ]] ; then return; fi
$ECHO "Finding ARCH..." $ECHO "Finding ARCH..."
uname_m=`uname -m` uname_m=$(uname -m)
check_ret uname check_ret uname
case $uname_m in case $uname_m in
i386) ARCH=x86;; i386) ARCH=x86;;
@ -275,7 +277,7 @@ find_architecture() {
find_num_cores() { find_num_cores() {
$ECHO "Finding num cores..." $ECHO "Finding num cores..."
NUM_CORES=7ZZ NUM_CORES=7ZZ
uname_s=`uname -s` uname_s=$(uname -s)
check_ret uname check_ret uname
case $uname_s in case $uname_s in
CYGWIN_NT-5.2-WOW64 | *CYGWIN_NT* | *CYGWIN* | MINGW32*) NUM_CORES=$NUMBER_OF_PROCESSORS;; CYGWIN_NT-5.2-WOW64 | *CYGWIN_NT* | *CYGWIN* | MINGW32*) NUM_CORES=$NUMBER_OF_PROCESSORS;;
@ -283,20 +285,19 @@ find_num_cores() {
esac esac
} }
write_test_program() { echo_test_program() {
#! Must be 'echo' #! Must be 'echo'
echo "#include <stdio.h>" > $C_WORD.c echo -e "int main(){ return (long)(8*sizeof(void*)); }"
echo "int main(){printf(\"%ld\", (long)(8*sizeof(void*))); return 0; }" >> $C_WORD.c
} }
c_find_word_size() { c_find_word_size() {
$ECHO "Finding WORD..." $ECHO "Finding WORD..."
C_WORD=factor-word-size C_WORD="factor-word-size"
write_test_program echo_test_program | $CC -o $C_WORD -xc -
$CC -o $C_WORD $C_WORD.c check_ret $CC
WORD=$(./$C_WORD) ./$C_WORD
check_ret $C_WORD WORD=$?
$DELETE -f $C_WORD* $DELETE -f $C_WORD
} }
intel_macosx_word_size() { intel_macosx_word_size() {
@ -403,9 +404,9 @@ set_build_info() {
parse_build_info() { parse_build_info() {
ensure_program_installed cut ensure_program_installed cut
$ECHO "Parsing make target from command line: $1" $ECHO "Parsing make target from command line: $1"
OS=`echo $1 | cut -d '-' -f 1` OS=$(echo $1 | cut -d '-' -f 1)
ARCH=`echo $1 | cut -d '-' -f 2` ARCH=$(echo $1 | cut -d '-' -f 2)
WORD=`echo $1 | cut -d '-' -f 3` WORD=$(echo $1 | cut -d '-' -f 3)
if [[ $OS == linux && $ARCH == ppc ]] ; then WORD=32; fi if [[ $OS == linux && $ARCH == ppc ]] ; then WORD=32; fi
if [[ $OS == linux && $ARCH == arm ]] ; then WORD=32; fi if [[ $OS == linux && $ARCH == arm ]] ; then WORD=32; fi
@ -433,7 +434,7 @@ find_build_info() {
} }
invoke_git() { invoke_git() {
git $* git "$@"
check_ret git check_ret git
} }
@ -443,12 +444,12 @@ git_clone() {
} }
update_script_name() { update_script_name() {
$ECHO `dirname $0`/_update.sh $ECHO "$(dirname $0)/_update.sh"
} }
update_script() { update_script() {
update_script=`update_script_name` local -r update_script=$(update_script_name)
bash_path=`which bash` local -r bash_path=$(which bash)
$ECHO "#!$bash_path" >"$update_script" $ECHO "#!$bash_path" >"$update_script"
$ECHO "git pull \"$GIT_URL\" master" >>"$update_script" $ECHO "git pull \"$GIT_URL\" master" >>"$update_script"
$ECHO "if [[ \$? -eq 0 ]]; then exec \"$0\" $SCRIPT_ARGS; else echo \"git pull failed\"; exit 2; fi" \ $ECHO "if [[ \$? -eq 0 ]]; then exec \"$0\" $SCRIPT_ARGS; else echo \"git pull failed\"; exit 2; fi" \
@ -460,13 +461,13 @@ update_script() {
} }
update_script_changed() { update_script_changed() {
invoke_git diff --stat `invoke_git merge-base HEAD FETCH_HEAD` FETCH_HEAD | grep 'build\.sh' >/dev/null invoke_git diff --stat "$(invoke_git merge-base HEAD FETCH_HEAD)" FETCH_HEAD | grep 'build\.sh' >/dev/null
} }
git_fetch_factorcode() { git_fetch_factorcode() {
$ECHO "Fetching the git repository from factorcode.org..." $ECHO "Fetching the git repository from factorcode.org..."
rm -f `update_script_name` rm -f "$(update_script_name)"
invoke_git fetch "$GIT_URL" master invoke_git fetch "$GIT_URL" master
if update_script_changed; then if update_script_changed; then
@ -479,7 +480,7 @@ git_fetch_factorcode() {
} }
cd_factor() { cd_factor() {
cd factor cd "factor"
check_ret cd check_ret cd
} }
@ -519,7 +520,7 @@ check_makefile_exists() {
invoke_make() { invoke_make() {
check_makefile_exists check_makefile_exists
$MAKE $MAKE_OPTS $* $MAKE $MAKE_OPTS "$@"
check_ret $MAKE check_ret $MAKE
} }
@ -543,13 +544,13 @@ current_git_branch() {
check_url() { check_url() {
if [[ $DOWNLOADER_NAME == 'wget' ]]; then if [[ $DOWNLOADER_NAME == 'wget' ]]; then
if [[ `wget -S --spider $1 2>&1 | grep 'HTTP/1.1 200 OK'` ]]; then if [[ $(wget -S --spider $1 2>&1 | grep 'HTTP/1.1 200 OK') ]]; then
return 0 return 0
else else
return 1 return 1
fi fi
elif [[ $DOWNLOADER_NAME == 'curl' ]]; then elif [[ $DOWNLOADER_NAME == 'curl' ]]; then
code=`curl -sL -w "%{http_code}\\n" "$1" -o /dev/null` code=$(curl -sL -w "%{http_code}\\n" "$1" -o /dev/null)
if [[ $code -eq 200 ]]; then return 0; else return 1; fi if [[ $code -eq 200 ]]; then return 0; else return 1; fi
else else
$ECHO "error: wget or curl required in check_url" $ECHO "error: wget or curl required in check_url"
@ -589,9 +590,9 @@ update_boot_image() {
$DELETE temp/staging.*.image > /dev/null 2>&1 $DELETE temp/staging.*.image > /dev/null 2>&1
if [[ -f $BOOT_IMAGE ]] ; then if [[ -f $BOOT_IMAGE ]] ; then
get_url $CHECKSUM_URL get_url $CHECKSUM_URL
factorcode_md5=`cat checksums.txt|grep $BOOT_IMAGE|cut -f2 -d' '` factorcode_md5=$(cat checksums.txt | grep $BOOT_IMAGE | cut -f2 -d' ')
set_md5sum set_md5sum
disk_md5=`$MD5SUM $BOOT_IMAGE|cut -f1 -d' '` disk_md5=$($MD5SUM $BOOT_IMAGE | cut -f1 -d' ')
$ECHO "Factorcode md5: $factorcode_md5"; $ECHO "Factorcode md5: $factorcode_md5";
$ECHO "Disk md5: $disk_md5"; $ECHO "Disk md5: $disk_md5";
if [[ "$factorcode_md5" == "$disk_md5" ]] ; then if [[ "$factorcode_md5" == "$disk_md5" ]] ; then
@ -665,12 +666,12 @@ net_bootstrap_no_pull() {
} }
refresh_image() { refresh_image() {
./$FACTOR_BINARY -script -e="USING: vocabs.loader vocabs.refresh system memory ; refresh-all save 0 exit" ./$FACTOR_BINARY -e="USING: vocabs.loader vocabs.refresh system memory ; refresh-all save 0 exit"
check_ret factor check_ret factor
} }
make_boot_image() { make_boot_image() {
./$FACTOR_BINARY -script -e="\"$MAKE_IMAGE_TARGET\" USING: system bootstrap.image memory ; make-image save 0 exit" ./$FACTOR_BINARY -e="\"$MAKE_IMAGE_TARGET\" USING: system bootstrap.image memory ; make-image save 0 exit"
check_ret factor check_ret factor
} }