From 87741e57095c568535a7928b6ec46ba57eb592fc Mon Sep 17 00:00:00 2001 From: Richard Lander Date: Wed, 1 Apr 2015 11:28:06 -0700 Subject: [PATCH] Change pathing in documentation to match build update --- Linux-instructions.md | 10 +++++----- OS-X-instructions.md | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Linux-instructions.md b/Linux-instructions.md index 62a7cb6..2af2289 100644 --- a/Linux-instructions.md +++ b/Linux-instructions.md @@ -51,7 +51,7 @@ To build the runtime on Linux, run build.sh from the root of the coreclr reposit ellismg@linux:~/git/coreclr$ ./build.sh ``` -After the build is completed, there should some files placed in ```binaries/Product/linux.x64.debug```. The ones we are interested in are: +After the build is completed, there should some files placed in ```bin/Product/Linux.x64.Debug```. The ones we are interested in are: * ```corerun```: The command line host. This program loads and starts the CoreCLR runtime and passes the managed program you want to run to it. * ```libcoreclr.so```: The CoreCLR runtime itself. @@ -60,8 +60,8 @@ In order to keep everything tidy, let's create a new directory for the runtime a ``` ellismg@linux:~/git/coreclr$ mkdir -p ~/coreclr-demo/runtime -ellismg@linux:~/git/coreclr$ cp binaries/Product/linux.x64.debug/corerun ~/coreclr-demo/runtime -ellismg@linux:~/git/coreclr$ cp binaries/Product/linux.x64.debug/libcoreclr.so ~/coreclr-demo/runtime +ellismg@linux:~/git/coreclr$ cp bin/Product/Linux.x64.Debug/corerun ~/coreclr-demo/runtime +ellismg@linux:~/git/coreclr$ cp bin/Product/Linux.x64.Debug/libcoreclr.so ~/coreclr-demo/runtime ``` Build the Framework @@ -72,10 +72,10 @@ We don't _yet_ have support for building managed code on Linux, so you'll need a You will build ```mscorlib.dll``` out of the coreclr repository and the rest of the framework that out of the corefx repository. For mscorlib (from a regular command prompt window) run: ``` -D:\git\coreclr> build.cmd unixmscorlib +D:\git\coreclr> build.cmd linuxmscorlib ``` -The output is placed in ```binaries\intermediates\Unix.x64.Debug\mscorlib.dll```. You'll want to copy this to the runtime folder on your Linux machine. (e.g. ```~/coreclr-demo/runtime```) +The output is placed in ```bin\obj\Unix.x64.Debug\mscorlib.dll```. You'll want to copy this to the runtime folder on your Linux machine. (e.g. ```~/coreclr-demo/runtime```) For the rest of the framework, you need to pass some special parameters to build.cmd when building out of the CoreFX repository. diff --git a/OS-X-instructions.md b/OS-X-instructions.md index 583855c..299ec10 100644 --- a/OS-X-instructions.md +++ b/OS-X-instructions.md @@ -61,14 +61,14 @@ To Build CoreCLR, run build.sh from the root of the coreclr repo. [Lots of stuff before this] Repo successfully built. - Product binaries are available at /Users/richlander/git/coreclr/binaries/Product/mac.x64.debug + Product binaries are available at /Users/richlander/git/coreclr/bin/Product/mac.x64.debug Type `./build.sh -?` to see the full set of build options. Check the build output. - dotnet-mbp:coreclr richlander$ ls binaries/Product/mac.x64.debug/ + dotnet-mbp:coreclr richlander$ ls bin/Product/mac.x64.debug/ You will see several files. The interesting ones are: @@ -77,8 +77,8 @@ You will see several files. The interesting ones are: Copy the runtime and corerun into the demo directory. - dotnet-mbp:coreclr richlander$ cp binaries/Product/mac.x64.debug/corerun ~/coreclr-demo/runtime/ - dotnet-mbp:coreclr richlander$ cp binaries/Product/mac.x64.debug/libcoreclr.dylib ~/coreclr-demo/runtime/ + dotnet-mbp:coreclr richlander$ cp bin/Product/mac.x64.debug/corerun ~/coreclr-demo/runtime/ + dotnet-mbp:coreclr richlander$ cp bin/Product/mac.x64.debug/libcoreclr.dylib ~/coreclr-demo/runtime/ Build the Framework =================== @@ -94,11 +94,11 @@ Build mscorlb Build mscorlib.dll out of the coreclr repository: - C:\git\coreclr>build.cmd unixmscorlib + C:\git\coreclr>build.cmd osxmscorlib -The output is placed in `binaries\intermediates\Unix.x64.Debug`. Copy to the demo folder. +The output is placed in `bin\obj\Unix.x64.Debug`. Copy to the demo folder. - C:\git\coreclr>copy binaries\intermediates\Unix.x64.Debug\mscorlib.dll \coreclr-demo + C:\git\coreclr>copy bin\obj\Unix.x64.Debug\mscorlib.dll \coreclr-demo Build CoreFX ------------ -- 2.7.4