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

factor.cmd: Remove "call", not needed. Change line endings to unix

db4
Doug Coleman 2015-08-05 09:38:25 -07:00
parent aa8a5ac153
commit 86d0ffca84
1 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
build-support/factor.cmd
View File

@ -1,96 +1,96 @@
@echo off @echo off
setlocal setlocal
if "%1"=="/?" ( if "%1"=="/?" (
goto usage goto usage
) else if "%1"=="" ( ) else if "%1"=="" (
set _bootimage_version=latest set _bootimage_version=latest
) else if "%1"=="latest" ( ) else if "%1"=="latest" (
set _bootimage_version=latest set _bootimage_version=latest
) else if "%1"=="clean" ( ) else if "%1"=="clean" (
set _bootimage_version=clean set _bootimage_version=clean
) else goto usage ) else goto usage
if not exist Nmakefile goto wrongdir if not exist Nmakefile goto wrongdir
call cl 2>&1 | find "x86" >nul call cl 2>&1 | find "x86" >nul
if not errorlevel 1 ( if not errorlevel 1 (
echo x86-32 cl.exe detected. echo x86-32 cl.exe detected.
set _target=x86-32 set _target=x86-32
set _bootimage=boot.windows-x86.32.image set _bootimage=boot.windows-x86.32.image
) else ( ) else (
call cl 2>&1 | find "x64" >nul call cl 2>&1 | find "x64" >nul
if not errorlevel 1 ( if not errorlevel 1 (
echo x86-64 cl.exe detected. echo x86-64 cl.exe detected.
set _target=x86-64 set _target=x86-64
set _bootimage=boot.windows-x86.64.image set _bootimage=boot.windows-x86.64.image
) else goto nocl ) else goto nocl
) )
: Fun syntax : Fun syntax
for /f %%x in ('git describe --all') do set GIT_DESCRIBE=%%x for /f %%x in ('git describe --all') do set GIT_DESCRIBE=%%x
for /f %%y in ('git rev-parse HEAD') do call set GIT_ID=%%y for /f %%y in ('git rev-parse HEAD') do set GIT_ID=%%y
set git_label=%GIT_DESCRIBE%-%GIT_ID% set git_label=%GIT_DESCRIBE%-%GIT_ID%
set version=0.98 set version=0.98
if %_bootimage_version%==clean ( if %_bootimage_version%==clean (
set _git_branch=clean-windows-%_target% set _git_branch=clean-windows-%_target%
set _bootimage_path=clean/windows-%_target% set _bootimage_path=clean/windows-%_target%
) else ( ) else (
set _git_branch=master set _git_branch=master
set _bootimage_path=latest set _bootimage_path=latest
) )
echo Deleting staging images from temp/... echo Deleting staging images from temp/...
del temp\staging.*.image del temp\staging.*.image
echo Updating working copy from %_git_branch%... echo Updating working copy from %_git_branch%...
call git pull http://factorcode.org/git/factor.git %_git_branch% call git pull http://factorcode.org/git/factor.git %_git_branch%
if errorlevel 1 goto fail if errorlevel 1 goto fail
echo Building vm... echo Building vm...
nmake /nologo /f Nmakefile clean nmake /nologo /f Nmakefile clean
if errorlevel 1 goto fail if errorlevel 1 goto fail
nmake /nologo /f Nmakefile %_target% nmake /nologo /f Nmakefile %_target%
if errorlevel 1 goto fail if errorlevel 1 goto fail
echo Fetching %_bootimage_version% boot image... echo Fetching %_bootimage_version% boot image...
cscript /nologo build-support\http-get.vbs http://downloads.factorcode.org/images/%_bootimage_path%/%_bootimage% %_bootimage% cscript /nologo build-support\http-get.vbs http://downloads.factorcode.org/images/%_bootimage_path%/%_bootimage% %_bootimage%
if errorlevel 1 goto fail if errorlevel 1 goto fail
echo Bootstrapping... echo Bootstrapping...
.\factor.com -i=%_bootimage% .\factor.com -i=%_bootimage%
if errorlevel 1 goto fail if errorlevel 1 goto fail
echo Copying fresh factor.image to factor.image.fresh. echo Copying fresh factor.image to factor.image.fresh.
copy factor.image factor.image.fresh copy factor.image factor.image.fresh
if errorlevel 1 goto fail if errorlevel 1 goto fail
echo Build complete. echo Build complete.
goto :EOF goto :EOF
:fail :fail
echo Build failed. echo Build failed.
goto :EOF goto :EOF
:wrongdir :wrongdir
echo build-support\factor.cmd must be run from the root of the Factor source tree. echo build-support\factor.cmd must be run from the root of the Factor source tree.
goto :EOF goto :EOF
:nocl :nocl
echo Unable to detect cl.exe target platform. echo Unable to detect cl.exe target platform.
echo Make sure you're running within the Visual Studio or Windows SDK environment. echo Make sure you're running within the Visual Studio or Windows SDK environment.
goto :EOF goto :EOF
:usage :usage
echo Usage: build-support\factor.cmd [latest/clean] echo Usage: build-support\factor.cmd [latest/clean]
echo Updates the working copy, cleans and builds the vm using nmake, echo Updates the working copy, cleans and builds the vm using nmake,
echo fetches a boot image, and bootstraps factor. echo fetches a boot image, and bootstraps factor.
echo If latest is specified, then the working copy is updated to the echo If latest is specified, then the working copy is updated to the
echo upstream "master" branch and the boot image corresponding to the echo upstream "master" branch and the boot image corresponding to the
echo most recent factor build is downloaded. This is the default. echo most recent factor build is downloaded. This is the default.
echo If clean is specified, then the working copy is updated to the echo If clean is specified, then the working copy is updated to the
echo upstream "clean-windows-*" branch corresponding to the current echo upstream "clean-windows-*" branch corresponding to the current
echo platform and the corresponding boot image is downloaded. echo platform and the corresponding boot image is downloaded.
goto :EOF goto :EOF