Revert "Documented faster way to bootstrap-build Nim"

This commit is contained in:
Varriount 2015-01-17 19:16:04 -05:00
commit bc97493102
6 changed files with 17 additions and 39 deletions

View file

@ -1,22 +0,0 @@
if not exist "csources"(
git clone --depth 1 https://github.com/nim-lang/csources.git
)
cd "csources"
for /f "skip=1 delims=" %%x in ('wmic cpu get addresswidth') do if not defined AddressWidth set AddressWidth=%%x
if %AddressWidth%==64 (
call build64.bat
) else (
call build.bat
)
cd ".."
./bin/nim c koch
./koch boot -d:release
xcopy /Y install.bat.template install.bat
pause

0
build.sh Executable file → Normal file
View file

View file

@ -1,6 +0,0 @@
if not "%1"=="" (
./koch install %1
) else (
./koch install
)

View file

@ -17,7 +17,7 @@ works.
Then run the following command:: Then run the following command::
./build.sh sh build.sh
Unlike other software, Nim does not distribute its files over the whole file Unlike other software, Nim does not distribute its files over the whole file
hierarchy. This has the advantage that you can deinstall it by just deleting hierarchy. This has the advantage that you can deinstall it by just deleting

View file

@ -29,21 +29,23 @@ To build from source you will need:
If you are on a fairly modern *nix system, the following steps should work: If you are on a fairly modern *nix system, the following steps should work:
```bash ```
$ git clone git://github.com/Araq/Nim.git $ git clone git://github.com/Araq/Nim.git
$ cd Nim $ cd Nim
$ ./build.sh $ git clone --depth 1 git://github.com/nim-lang/csources
$ cd csources && sh build.sh
$ cd ..
$ bin/nim c koch
$ ./koch boot -d:release
``` ```
``./koch install [dir]`` may then be used to install Nim, or you can simply ``koch install [dir]`` may then be used to install Nim, or you can simply
add it to your PATH. More ``koch`` related options are documented in add it to your PATH. More ``koch`` related options are documented in
[doc/koch.txt](doc/koch.txt). [doc/koch.txt](doc/koch.txt).
The above steps can be performed on Windows in a similar fashion, use The above steps can be performed on Windows in a similar fashion, the
``build.bat`` instead of ``build.sh``. Make sure you have mingw and git in ``build.bat`` and ``build64.bat`` (for x86_64 systems) are provided to be used
your PATH. If you want to use different compiler, run script and then instead of ``build.sh``.
manually change `CC` and `LINKER` variables in `csources/build.bat` or
`csources/build64.bat`.
## Getting help ## Getting help
A [forum](http://forum.nim-lang.org/) is available if you have any A [forum](http://forum.nim-lang.org/) is available if you have any

View file

@ -24,7 +24,7 @@ like systems. Binary packages may be provided later.
Download `nim-0.10.2.zip <download/nim-0.10.2.zip>`_, extract it and follow Download `nim-0.10.2.zip <download/nim-0.10.2.zip>`_, extract it and follow
these instructions: these instructions:
* ./build.sh * sh build.sh
* Add ``$your_install_dir/bin`` to your PATH. * Add ``$your_install_dir/bin`` to your PATH.
There are other ways to install Nim (like using the ``install.sh`` script), There are other ways to install Nim (like using the ``install.sh`` script),
@ -39,7 +39,11 @@ Change the branch to suit your needs::
git clone -b master git://github.com/Araq/Nim.git git clone -b master git://github.com/Araq/Nim.git
cd Nim cd Nim
./build.sh git clone -b master --depth 1 git://github.com/nim-lang/csources
cd csources && sh build.sh
cd ..
bin/nim c koch
./koch boot -d:release
The ``master`` branch always contains the latest stable version of the compiler. The ``master`` branch always contains the latest stable version of the compiler.
If you want bleeding edge then switch to the ``devel`` branch and follow If you want bleeding edge then switch to the ``devel`` branch and follow