Permalink
Browse files

moving build-support/factor.(sh|cmd) to ./build.(sh|cmd).

  • Loading branch information...
1 parent 4f0a72f commit 5dd6435511af441cac3af51ce609b818cd017326 @mrjbq7 mrjbq7 committed Mar 15, 2016
View
@@ -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
@@ -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
@@ -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
}
@@ -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
@@ -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 )
<process>
- 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 ;
@@ -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 ;
File renamed without changes.

0 comments on commit 5dd6435

Please sign in to comment.