Skip to content

Commit

Permalink
Slight simplication
Browse files Browse the repository at this point in the history
  • Loading branch information
bernardnormier committed Feb 13, 2019
1 parent e4098e5 commit 717877e
Showing 1 changed file with 29 additions and 22 deletions.
51 changes: 29 additions & 22 deletions cpp11/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,14 @@ for the ZeroC [Chat Demo][2].

### Prerequisites

The makefiles require GNU make 3.80 or later.
The makefiles require GNU make.

On macOS, the command-line demos require the Xcode Command Line Tools to be
installed (use `xcode-select --install` to install them). The Xcode sample
program for iOS require the [Ice Builder for Xcode][3].
On macOS, the command-line demos require the Xcode Command Line Tools (use
`xcode-select --install` to install them). The Xcode sample program for iOS
require the [Ice Builder for Xcode][3].

If you've installed Ice in a non-standard location, you'll need to set the
`ICE_HOME` environment variable with the path name of the
installation directory:
If you install Ice in a non-standard location, you need to set the `ICE_HOME`
environment variable to the installation directory, for example:
```
export ICE_HOME=~/testing/ice
```
Expand All @@ -43,19 +42,19 @@ export ICE_HOME=~/testing/ice
Review the settings in `../make/Make.rules`. For example, set `OPTIMIZE=yes`
to build with optimization.

When you're ready to start the build, run `make`, for example:
When you are ready to start the build, run `make`, for example:
```
make V=1
```

`V=1` in the example above turns on verbose output.
`V=1` turns on verbose output.

The `clean` and `distclean` targets allow you clean all the demos. `clean`
removes the binary files created by the build; `distclean` removes all these
files plus the C++ files generated by slice2cpp.
files plus the C++ source files generated by slice2cpp.

Note that `make clean` only removes the binary files for the configuration and
platform specified with the `CONFIGS` and `PLATFORMS` variables in `Make.rules`.
platform specified by the `CONFIGS` and `PLATFORMS` variables in `Make.rules`.

You can also build or clean a single demo with `make <demo-path>[_clean|_distclean]`,
for example:
Expand All @@ -74,10 +73,10 @@ Refer to the README.md file in each demo directory for usage instructions.

### Prerequisites

Visual Studio 2017 users need to either:
- install the Windows 10 SDK (10.0.14393.0) component using the Visual Studio 2017
installer, or
- retarget the solution to a version of the Windows 10 SDK already installed
If you are using Visual Studio 2017, you need to either:
- install the following optional component of the `Desktop development with C++` workload:
`Windows 8.1 SDK and UCRT SDK`
- or retarget the solution to a version of the Windows 10 SDK already installed
(using `Project > Retarget solution`)

Failure to perform this step results in error MSB8036 when building any project:
Expand Down Expand Up @@ -109,17 +108,21 @@ select `Build`.
* Open a Visual Studio command prompt
```
cd ice-demos\cpp11
MSBuild /p:IceHome=<Ice dist path> /p:Configuration=<Release or Debug> msbuild\ice.proj"
MSBuild /p:IceHome=<Ice dist path> /p:Configuration=<Release or Debug> msbuild\ice.proj
```
`Ice dist path` represents a source tree where you built Ice for C++.

- Build from Visual Studio
* Open a Visual Studio command prompt
```
cd ice-demos\cpp11
MSBuild /p:IceHome=<Ice dist path> /p:Configuration=<Release or Debug> /t:InstallLocalPackages msbuild\ice.proj"
MSBuild /p:IceHome=<Ice dist path> /p:Configuration=<Release or Debug> /t:InstallLocalPackages msbuild\ice.proj
```
The command above creates NuGet packages for the source tree designated by
`Ice dist path` (and first builds this source tree if needed), and then installs these
NuGet packages in the `ice-demos\cpp11\packages` folder.

* Start Visual Studio and open `C++11 demos.sln` solution file, select your target
* Start Visual Studio, open the `C++11 demos.sln` solution, and select your target
configuration (Debug or Release) and platform (Win32 or x64). Right click on the
desired demo in the Solution Explorer window and select `Build`.

Expand Down Expand Up @@ -161,7 +164,7 @@ and are very large (about 300 MB compressed for each compiler). As a result, the
first restore can take a long time; subsequent restores on the same computer are
faster as they use the local NuGet cache.

Then select your target configuration (Debug or Release), and platform (Win32 or x64).
Next, select your target configuration (Debug or Release), and platform (Win32 or x64).
Right click on the desired demo in the Solution Explorer window and select `Build`.

#### Building the demos using an Ice source build:
Expand All @@ -170,17 +173,21 @@ Right click on the desired demo in the Solution Explorer window and select `Buil
* Open a Visual Studio command prompt
```
cd ice-demos\cpp11
MSBuild /p:IceHome=<Ice dist path> /p:Configuration=<Release or Debug> /t:UWPBuild msbuild\ice.proj"
MSBuild /p:IceHome=<Ice dist path> /p:Configuration=<Release or Debug> /t:UWPBuild msbuild\ice.proj
```
`Ice dist path` represents a source tree where you built Ice for C++.

- Build from Visual Studio
* Open a Visual Studio command prompt
```
cd ice-demos\cpp11
MSBuild /p:IceHome=<Ice dist path> /p:Configuration=<Release or Debug> /t:UWPInstallLocalPackages msbuild\ice.proj"
MSBuild /p:IceHome=<Ice dist path> /p:Configuration=<Release or Debug> /t:UWPInstallLocalPackages msbuild\ice.proj
```
The command above creates NuGet packages for the source tree designated by
`Ice dist path` (and first builds this source tree if needed), and then installs these
NuGet packages in the `ice-demos\cpp11\packages` folder.

* Start Visual Studio and open `C++11 demos (Universal Windows).sln` solution file,
* Start Visual Studio, open the `C++11 demos (Universal Windows).sln` solution, and
select your target configuration (Debug or Release) and platform (Win32 or x64).
Right click on the desired demo in the Solution Explorer window and select `Build`.

Expand Down

0 comments on commit 717877e

Please sign in to comment.