From 5dd6435511af441cac3af51ce609b818cd017326 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Tue, 15 Mar 2016 03:16:33 -0700 Subject: [PATCH] moving build-support/factor.(sh|cmd) to ./build.(sh|cmd). --- README.md | 5 ++--- build-support/factor.cmd => build.cmd | 6 +++--- build-support/factor.sh => build.sh | 4 ++-- extra/build-support/build-support-tests.factor | 2 +- extra/build-support/build-support.factor | 6 ++---- extra/mason/child/child.factor | 2 +- {build-support => misc}/http-get.vbs | 0 7 files changed, 11 insertions(+), 14 deletions(-) rename build-support/factor.cmd => build.cmd (90%) rename build-support/factor.sh => build.sh (99%) rename {build-support => misc}/http-get.vbs (100%) diff --git a/README.md b/README.md index 06d0491c9d..6c042a9004 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,8 @@ To check out Factor: To build the latest complete Factor system from git: -* Windows: `build-support\factor.cmd` -* Unix: `./build-support/factor.sh update` +* Windows: `build.cmd` +* Unix: `./build.sh update` Now you should have a complete Factor system ready to run. @@ -112,7 +112,6 @@ You can also write scripts that can be run from the terminal, by putting The Factor source tree is organized as follows: -* `build-support/` - scripts used for compiling Factor (not present in binary packages) * `vm/` - Factor VM source code (not present in binary packages) * `core/` - Factor core library * `basis/` - Factor basis library, compiler, tools diff --git a/build-support/factor.cmd b/build.cmd similarity index 90% rename from build-support/factor.cmd rename to build.cmd index b14f4dbe1e..b0430bbfb7 100644 --- a/build-support/factor.cmd +++ b/build.cmd @@ -56,7 +56,7 @@ nmake /nologo /f Nmakefile %_target% if errorlevel 1 goto fail echo Fetching %_bootimage_version% boot image... -cscript /nologo build-support\http-get.vbs http://downloads.factorcode.org/images/%_bootimage_path%/%_bootimage% %_bootimage% +cscript /nologo misc\http-get.vbs http://downloads.factorcode.org/images/%_bootimage_path%/%_bootimage% %_bootimage% if errorlevel 1 goto fail echo Bootstrapping... @@ -75,7 +75,7 @@ echo Build failed. goto :EOF :wrongdir -echo build-support\factor.cmd must be run from the root of the Factor source tree. +echo build.cmd must be run from the root of the Factor source tree. goto :EOF :nocl @@ -84,7 +84,7 @@ echo Make sure you're running within the Visual Studio or Windows SDK environmen goto :EOF :usage -echo Usage: build-support\factor.cmd [latest/clean] +echo Usage: build.cmd [latest/clean] echo Updates the working copy, cleans and builds the vm using nmake, echo fetches a boot image, and bootstraps factor. echo If latest is specified, then the working copy is updated to the diff --git a/build-support/factor.sh b/build.sh similarity index 99% rename from build-support/factor.sh rename to build.sh index 7a64fb52a2..da76c3cc18 100755 --- a/build-support/factor.sh +++ b/build.sh @@ -474,7 +474,7 @@ update_script() { } update_script_changed() { - invoke_git diff --stat `invoke_git merge-base HEAD FETCH_HEAD` FETCH_HEAD | grep 'build-support.factor\.sh' >/dev/null + invoke_git diff --stat `invoke_git merge-base HEAD FETCH_HEAD` FETCH_HEAD | grep 'build\.sh' >/dev/null } git_fetch_factorcode() { @@ -526,7 +526,7 @@ check_makefile_exists() { $ECHO "***GNUmakefile not found***" $ECHO "You are likely in the wrong directory." $ECHO "Run this script from your factor directory:" - $ECHO " ./build-support/factor.sh" + $ECHO " ./build.sh" exit_script 6 fi } diff --git a/extra/build-support/build-support-tests.factor b/extra/build-support/build-support-tests.factor index c635418ab2..e1561502bd 100644 --- a/extra/build-support/build-support-tests.factor +++ b/extra/build-support/build-support-tests.factor @@ -3,4 +3,4 @@ USING: build-support sequences tools.test ; IN: build-support.tests -{ f } [ factor.sh-make-target empty? ] unit-test +{ f } [ build-make-target empty? ] unit-test diff --git a/extra/build-support/build-support.factor b/extra/build-support/build-support.factor index 7d32b2da53..15ab8c7ab5 100644 --- a/extra/build-support/build-support.factor +++ b/extra/build-support/build-support.factor @@ -4,10 +4,8 @@ USING: accessors arrays calendar io io.backend io.encodings.utf8 io.launcher ; IN: build-support -CONSTANT: factor.sh-path "resource:build-support/factor.sh" - -: factor.sh-make-target ( -- string ) +: build-make-target ( -- string ) - factor.sh-path normalize-path "make-target" 2array >>command + "resource:build.sh" normalize-path "make-target" 2array >>command 10 seconds >>timeout utf8 [ readln ] with-process-reader ; diff --git a/extra/mason/child/child.factor b/extra/mason/child/child.factor index 08dd65fd4b..b97a2e5124 100644 --- a/extra/mason/child/child.factor +++ b/extra/mason/child/child.factor @@ -9,7 +9,7 @@ IN: mason.child ! Make sure we call the build directory's factor.cmd : nmake-cmd ( -- args ) - "./build-support/factor.cmd" absolute-path + "./build.cmd" absolute-path "latest" target-cpu get name>> "." split "-" join 3array ; diff --git a/build-support/http-get.vbs b/misc/http-get.vbs similarity index 100% rename from build-support/http-get.vbs rename to misc/http-get.vbs -- 2.34.1