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

factor.sh: Make net-bootstrap recompile the vm, add make_clean_factor function

Doug Coleman 2011-10-28 22:48:55 -07:00
parent bf56723840
commit e158dc19f4
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build-support/factor.sh
View File

@ -456,6 +456,11 @@ make_factor() {
invoke_make NO_UI=$NO_UI $MAKE_TARGET -j5 invoke_make NO_UI=$NO_UI $MAKE_TARGET -j5
} }
make_clean_factor() {
make_clean
make_factor
}
update_boot_images() { update_boot_images() {
$ECHO "Deleting old images..." $ECHO "Deleting old images..."
$DELETE checksums.txt* > /dev/null 2>&1 $DELETE checksums.txt* > /dev/null 2>&1
@ -510,7 +515,7 @@ copy_fresh_image() {
bootstrap() { bootstrap() {
./$FACTOR_BINARY -i=$BOOT_IMAGE ./$FACTOR_BINARY -i=$BOOT_IMAGE
copy_fresh_image copy_fresh_image
} }
install() { install() {
@ -523,13 +528,11 @@ install() {
bootstrap bootstrap
} }
update() { update() {
get_config_info get_config_info
git_fetch_factorcode git_fetch_factorcode
backup_factor backup_factor
make_clean make_clean_factor
make_factor
} }
update_bootstrap() { update_bootstrap() {
@ -537,6 +540,12 @@ update_bootstrap() {
bootstrap bootstrap
} }
net_bootstrap_no_pull() {
get_config_info
make_clean_factor
update_bootstrap
}
refresh_image() { refresh_image() {
./$FACTOR_BINARY -script -e="USING: vocabs.loader vocabs.refresh system memory ; refresh-all save 0 exit" ./$FACTOR_BINARY -script -e="USING: vocabs.loader vocabs.refresh system memory ; refresh-all save 0 exit"
check_ret factor check_ret factor
@ -545,7 +554,6 @@ refresh_image() {
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 -script -e="\"$MAKE_IMAGE_TARGET\" USING: system bootstrap.image memory ; make-image save 0 exit"
check_ret factor check_ret factor
} }
install_deps_linux() { install_deps_linux() {
@ -593,7 +601,7 @@ case "$1" in
quick-update) update; refresh_image ;; quick-update) update; refresh_image ;;
update) update; update_bootstrap ;; update) update; update_bootstrap ;;
bootstrap) get_config_info; bootstrap ;; bootstrap) get_config_info; bootstrap ;;
net-bootstrap) get_config_info; update_boot_images; bootstrap ;; net-bootstrap) net_bootstrap_no_pull ;;
make-target) FIND_MAKE_TARGET=true; ECHO=false; find_build_info; exit_script ;; make-target) FIND_MAKE_TARGET=true; ECHO=false; find_build_info; exit_script ;;
report) find_build_info ;; report) find_build_info ;;
*) usage ;; *) usage ;;