OS=
ARCH=
WORD=
-GIT_PROTOCOL=${GIT_PROTOCOL:="git"}
+GIT_PROTOCOL=${GIT_PROTOCOL:="https"}
GIT_URL=${GIT_URL:=$GIT_PROTOCOL"://github.com/factor/factor.git"}
SCRIPT_ARGS="$*"
}
check_ret() {
+ # Can't execute any commands before saving $?
+ # $1 is the name of the command we are checking
RET=$?
if [[ $RET -ne 0 ]] ; then
$ECHO $1 failed
}
set_cc() {
-
# on Cygwin we MUST use the MinGW "cross-compiler", therefore check these first
# furthermore, we prefer 64 bit over 32 bit versions if both are available
- test_programs_installed x86_64-w64-mingw32-gcc x86_64-w64-mingw32-g++
- if [[ $? -ne 0 ]] ; then
- [ -z "$CC" ] && CC=x86_64-w64-mingw32-gcc
- [ -z "$CXX" ] && CXX=x86_64-w64-mingw32-g++
- return
- fi
- test_programs_installed i686-w64-mingw32-gcc i686-w64-mingw32-g++
- if [[ $? -ne 0 ]] ; then
- [ -z "$CC" ] && CC=i686-w64-mingw32-gcc
- [ -z "$CXX" ] && CXX=i686-w64-mingw32-g++
- return
+ # we need this condition so we don't find a mingw32 compiler on linux
+ if [[ $OS == windows ]] ; then
+ test_programs_installed x86_64-w64-mingw32-gcc x86_64-w64-mingw32-g++
+ if [[ $? -ne 0 ]] ; then
+ [ -z "$CC" ] && CC=x86_64-w64-mingw32-gcc
+ [ -z "$CXX" ] && CXX=x86_64-w64-mingw32-g++
+ return
+ fi
+
+ test_programs_installed i686-w64-mingw32-gcc i686-w64-mingw32-g++
+ if [[ $? -ne 0 ]] ; then
+ [ -z "$CC" ] && CC=i686-w64-mingw32-gcc
+ [ -z "$CXX" ] && CXX=i686-w64-mingw32-g++
+ return
+ fi
fi
test_programs_installed clang clang++
check_libraries() {
case $OS in
- linux) check_X11_libraries
- check_gtk_libraries;;
- unix) check_gtk_libraries;;
+ linux) check_X11_libraries
+ check_gtk_libraries ;;
+ unix) check_gtk_libraries ;;
esac
}
local uname_s=$(uname -s)
check_ret uname
case $uname_s in
- CYGWIN_NT-5.2-WOW64) OS=windows;;
- *CYGWIN_NT*) OS=windows;;
- *CYGWIN*) OS=windows;;
- MINGW32*) OS=windows;;
- MSYS_NT*) OS=windows;;
- *darwin*) OS=macosx;;
- *Darwin*) OS=macosx;;
- *linux*) OS=linux;;
- *Linux*) OS=linux;;
- FreeBSD) OS=freebsd;;
+ CYGWIN_NT-5.2-WOW64) OS=windows ;;
+ *CYGWIN_NT*) OS=windows ;;
+ *CYGWIN*) OS=windows ;;
+ MINGW32*) OS=windows ;;
+ MINGW64*) OS=windows ;;
+ MSYS_NT*) OS=windows ;;
+ *darwin*) OS=macosx ;;
+ *Darwin*) OS=macosx ;;
+ *linux*) OS=linux ;;
+ *Linux*) OS=linux ;;
+ FreeBSD) OS=freebsd ;;
+ Haiku) OS=haiku ;;
esac
}
uname_m=$(uname -m)
check_ret uname
case $uname_m in
- i386) ARCH=x86;;
- i686) ARCH=x86;;
- i86pc) ARCH=x86;;
- amd64) ARCH=x86;;
- ppc64) ARCH=ppc;;
- *86) ARCH=x86;;
- *86_64) ARCH=x86;;
- "Power Macintosh") ARCH=ppc;;
+ i386) ARCH=x86 ;;
+ i686) ARCH=x86 ;;
+ i86pc) ARCH=x86 ;;
+ amd64) ARCH=x86 ;;
+ ppc64) ARCH=ppc ;;
+ *86) ARCH=x86 ;;
+ *86_64) ARCH=x86 ;;
+ aarch64) ARCH=arm64 ;;
+ arm64) ARCH=arm64 ;;
+ iPhone5*[3-9]) ARCH=arm64 ;;
+ iPhone[6-9]*) ARCH=arm64 ;;
+ iPhone[1-9][0-9]*) ARCH=arm64 ;;
+ iPad[4-9]*) ARCH=arm64 ;;
+ iPad[1-9][0-9]*) ARCH=arm64 ;;
+ AppleTV[5-9]*) ARCH=arm64 ;;
+ AppleTV[1-9][0-9]*) ARCH=arm64 ;;
+ "Power Macintosh") ARCH=ppc ;;
esac
}
find_num_cores() {
- $ECHO "Finding num cores..."
+ $ECHO "Finding NUM_CORES..."
NUM_CORES=1
uname_s=$(uname -s)
check_ret uname
case $uname_s in
- CYGWIN_NT-5.2-WOW64 | *CYGWIN_NT* | *CYGWIN* | MINGW32*) NUM_CORES=$NUMBER_OF_PROCESSORS;;
- *darwin* | *Darwin* | *linux* | *Linux*) NUM_CORES=$(getconf _NPROCESSORS_ONLN);;
- freebsd) NUM_CORES=$(sysctl -n hw.ncpu);;
+ CYGWIN_NT-5.2-WOW64 | *CYGWIN_NT* | *CYGWIN* | MINGW32*) NUM_CORES=$NUMBER_OF_PROCESSORS ;;
+ *linux* | *Linux*) NUM_CORES=$(getconf _NPROCESSORS_ONLN || nproc) ;;
+ *darwin* | *Darwin* | freebsd) NUM_CORES=$(sysctl -n hw.ncpu) ;;
esac
}
-echo_test_program() {
- #! Must be 'echo'
- echo -e "int main(){ return (long)(8*sizeof(void*)); }"
+find_word_size() {
+ if [[ -n $WORD ]] ; then return; fi
+ $ECHO "Finding WORD..."
+ WORD=$(getconf LONG_BIT || find_word_size_cpp || find_word_size_c)
}
-c_find_word_size() {
- $ECHO "Finding WORD..."
+find_word_size_cpp() {
+ SIXTY_FOUR='defined(__aarch64__) || defined(__x86_64__) || defined(_M_AMD64) || defined(__PPC64__) || defined(__64BIT__)'
+ THIRTY_TWO='defined(i386) || defined(__i386) || defined(__i386__) || defined(_MIX86)'
+ $CC -E -xc <(echo -e "#if ${SIXTY_FOUR}\n64\n#elif ${THIRTY_TWO}\n32\n#endif") | tail -1
+}
+
+find_word_size_c() {
C_WORD="factor-word-size"
- echo_test_program | $CC -o $C_WORD -xc -
+ TEST_PROGRAM="int main(){ return (long)(8*sizeof(void*)); }"
+ echo $TEST_PROGRAM | $CC -o $C_WORD -xc -
check_ret $CC
./$C_WORD
- WORD=$?
- case $WORD in
+ WORD_OUT=$?
+ case $WORD_OUT in
32) ;;
64) ;;
*)
- echo "Word size should be 32/64, got $WORD"
- exit_script 15;;
+ echo "Word size should be 32/64, got '$WORD_OUT'"
+ exit_script 15 ;;
esac
-
$DELETE -f $C_WORD
-}
-
-intel_macosx_word_size() {
- ensure_program_installed sysctl
- $ECHO -n "Testing if your Intel Mac supports 64bit binaries..."
- sysctl machdep.cpu.extfeatures | grep EM64T >/dev/null
- if [[ $? -eq 0 ]] ; then
- WORD=64
- $ECHO "yes!"
- else
- WORD=32
- $ECHO "no."
- fi
-}
-
-find_word_size() {
- if [[ -n $WORD ]] ; then return; fi
- if [[ $OS == macosx && $ARCH == x86 ]] ; then
- intel_macosx_word_size
- else
- c_find_word_size
- fi
+ echo "$WORD_OUT"
}
set_factor_binary() {
case $OS in
- windows) FACTOR_BINARY=factor.com;;
- *) FACTOR_BINARY=factor;;
+ windows) FACTOR_BINARY=factor.com ;;
+ *) FACTOR_BINARY=factor ;;
esac
}
set_factor_library() {
case $OS in
- windows) FACTOR_LIBRARY=factor.dll;;
- macosx) FACTOR_LIBRARY=libfactor.dylib;;
- *) FACTOR_LIBRARY=libfactor.a;;
+ windows) FACTOR_LIBRARY=factor.dll ;;
+ macosx) FACTOR_LIBRARY=libfactor.dylib ;;
+ *) FACTOR_LIBRARY=libfactor.a ;;
esac
}
$ECHO MAKE_IMAGE_TARGET=$MAKE_IMAGE_TARGET
$ECHO GIT_PROTOCOL=$GIT_PROTOCOL
$ECHO GIT_URL=$GIT_URL
+ $ECHO CHECKSUM_URL=$CHECKSUM_URL
+ $ECHO BOOT_IMAGE_URL=$BOOT_IMAGE_URL
$ECHO DOWNLOADER=$DOWNLOADER
$ECHO CC=$CC
$ECHO CXX=$CXX
if [[ $OS == linux && $ARCH == ppc ]] ; then
MAKE_IMAGE_TARGET=linux-ppc.32
MAKE_TARGET=linux-ppc-32
+ elif [[ $OS == linux && $ARCH == arm64 ]] ; then
+ MAKE_IMAGE_TARGET=unix-arm.64
+ MAKE_TARGET=linux-arm-64
+ elif [[ $OS == macosx && $ARCH == arm64 ]] ; then
+ MAKE_IMAGE_TARGET=unix-arm.64
+ MAKE_TARGET=macosx-arm64
elif [[ $OS == windows && $ARCH == x86 && $WORD == 64 ]] ; then
MAKE_IMAGE_TARGET=windows-x86.64
MAKE_TARGET=windows-x86-64
set_factor_image
set_build_info
set_downloader
+ set_boot_image_vars
set_make
echo_build_info
}
update_script() {
local -r update_script=$(update_script_name)
local -r bash_path=$(which bash)
+ $ECHO "updating from ${CURRENT_BRANCH}"
$ECHO "#!$bash_path" >"$update_script"
- $ECHO "git pull \"$GIT_URL\" master" >>"$update_script"
+ $ECHO "git pull \"$GIT_URL\" ${CURRENT_BRANCH}" >>"$update_script"
$ECHO "if [[ \$? -eq 0 ]]; then exec \"$0\" $SCRIPT_ARGS; else echo \"git pull failed\"; exit 2; fi" \
>>"$update_script"
$ECHO "exit 0" >>"$update_script"
git_fetch() {
$ECHO "Fetching the git repository from github.com..."
- branch=$(current_git_branch)
+ set_current_branch
rm -f "$(update_script_name)"
- $ECHO git fetch "$GIT_URL" "$branch"
- invoke_git fetch "$GIT_URL" "$branch"
+ $ECHO git fetch "$GIT_URL" "${CURRENT_BRANCH}"
+ invoke_git fetch "$GIT_URL" "${CURRENT_BRANCH}"
if update_script_changed; then
$ECHO "Updating and restarting the build.sh script..."
update_script
else
$ECHO "Updating the working tree..."
- invoke_git pull "$GIT_URL" master
+ invoke_git pull "$GIT_URL" "${CURRENT_BRANCH}"
fi
}
set_copy() {
case $OS in
- windows) COPY=cp;;
- *) COPY=cp;;
+ windows) COPY=cp ;;
+ *) COPY=cp ;;
esac
}
set_delete() {
case $OS in
- windows) DELETE=rm;;
- *) DELETE=rm;;
+ windows) DELETE=rm ;;
+ *) DELETE=rm ;;
esac
}
# Otherwise, just use `master`
set_boot_image_vars() {
set_current_branch
- local url="http://downloads.factorcode.org/images/${CURRENT_BRANCH}/checksums.txt"
+ local url="https://downloads.factorcode.org/images/${CURRENT_BRANCH}/checksums.txt"
check_url $url
if [[ $? -eq 0 ]]; then
CHECKSUM_URL="$url"
- BOOT_IMAGE_URL="http://downloads.factorcode.org/images/${CURRENT_BRANCH}/${BOOT_IMAGE}"
+ BOOT_IMAGE_URL="https://downloads.factorcode.org/images/${CURRENT_BRANCH}/${BOOT_IMAGE}"
else
- CHECKSUM_URL="http://downloads.factorcode.org/images/master/checksums.txt"
- BOOT_IMAGE_URL="http://downloads.factorcode.org/images/master/${BOOT_IMAGE}"
+ $ECHO "boot image for branch \`${CURRENT_BRANCH}\` is not on server, trying master instead"
+ $ECHO " tried nonexistent url: ${url}"
+ CHECKSUM_URL="https://downloads.factorcode.org/images/master/checksums.txt"
+ BOOT_IMAGE_URL="https://downloads.factorcode.org/images/master/${BOOT_IMAGE}"
fi
}
bootstrap() {
./$FACTOR_BINARY -i=$BOOT_IMAGE
+ check_ret "./$FACTOR_BINARY bootstrap failed"
copy_fresh_image
}
}
make_boot_image() {
- ./$FACTOR_BINARY -e="\"$MAKE_IMAGE_TARGET\" USING: system bootstrap.image memory ; make-image save 0 exit"
+ ./$FACTOR_BINARY -run="bootstrap.image" "$MAKE_IMAGE_TARGET"
check_ret factor
}
}
install_deps_pkg() {
- sudo pkg install --yes git gmake gcc rlwrap ripgrep curl gmake x11-toolkits/gtk30 x11-toolkits/gtkglext pango cairo vim
+ sudo pkg install --yes bash git gmake gcc rlwrap ripgrep curl gmake x11-toolkits/gtk30 x11-toolkits/gtkglext pango cairo vim
}
$ECHO " deps-dnf - install required packages for Factor on Linux using dnf"
$ECHO " deps-pkg - install required packages for Factor on FreeBSD using pkg"
$ECHO " deps-macosx - install git on MacOSX using port"
+ $ECHO " self-bootstrap - make local boot image, bootstrap"
$ECHO " self-update - git pull, recompile, make local boot image, bootstrap"
$ECHO " quick-update - git pull, refresh-all, save"
$ECHO " update|latest - git pull, recompile, download a boot image, bootstrap"
$ECHO " net-bootstrap - recompile, download a boot image, bootstrap"
$ECHO " make-target - find and print the os-arch-cpu string"
$ECHO " report|info - print the build variables"
- $ECHO " update-boot-image - get the boot image for the current branch of for master"
+ $ECHO " full-report - print the build variables, check programs and libraries"
+ $ECHO " update-boot-image - get the boot image for the current branch"
$ECHO ""
$ECHO "If you are behind a firewall, invoke as:"
$ECHO "env GIT_PROTOCOL=http $0 <command>"
deps-macosx) install_deps_macosx ;;
deps-dnf) install_deps_dnf ;;
deps-pkg) install_deps_pkg ;;
- self-update) update; make_boot_image; bootstrap;;
+ self-bootstrap) get_config_info; make_boot_image; bootstrap ;;
+ self-update) update; make_boot_image; bootstrap ;;
quick-update) update; refresh_image ;;
update|latest) update; download_and_bootstrap ;;
compile) find_build_info; make_factor ;;
make-target) FIND_MAKE_TARGET=true; ECHO=false; find_build_info; exit_script ;;
report|info) find_build_info ;;
full-report) find_build_info; check_installed_programs; check_libraries ;;
- update-boot-image) find_build_info; check_installed_programs; update_boot_image;;
+ update-boot-image) find_build_info; check_installed_programs; update_boot_image ;;
*) usage ;;
esac
projects / factor.git / blobdiff