diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/BuildInstructionsMacOS.md | 104 |
1 files changed, 63 insertions, 41 deletions
diff --git a/cpp/BuildInstructionsMacOS.md b/cpp/BuildInstructionsMacOS.md index 6cee5e069a6..f0b7a8e64ab 100644 --- a/cpp/BuildInstructionsMacOS.md +++ b/cpp/BuildInstructionsMacOS.md @@ -18,44 +18,43 @@ Ice has dependencies on a number of third-party libraries: - [bzip][3] 1.0 - [Expat][4] 2.1 - - [LMDB][5] 0.9.16 (LMDB is not required with the C++11 mapping) + - [LMDB][5] 0.9 (LMDB is not required with the C++11 mapping) - [mcpp][6] 2.7.2 (with patches) Expat and bzip are included with your system. You can install LMDB and mcpp using [Homebrew][7]: - +``` brew install lmdb mcpp - +``` ## Building Ice -From the top-level source directory, edit `config/Make.rules` to establish your -build configuration. The comments in the file provide more information. Pay -particular attention to the variables that define the locations of the third-party -libraries. +Review the top-level [config/Make.rules](../config/Make.rules) in your build tree and +update the configuration if needed. The comments in the file provide more information. In a command window, change to the `cpp` subdirectory: - - cd cpp - -Now you're ready to build Ice: - - make - -This will build the Ice core libraries, services, and tests. +``` + cd cpp +``` +Run `make` to build the Ice C++ libraries, services and test suite. Set `V=1` to get +a more detailed build output. You can build only the libraries and services with the +`srcs` target, or only the tests with the `tests` target. For example: +``` + make V=1 -j8 srcs +``` ### Build configurations and platforms The C++ source tree supports multiple build configurations and platforms. To see the supported configurations and platforms: - +``` make print V=supported-configs make print V=supported-platforms - +``` To build all the supported configurations and platforms: - - make CONFIGS=all PLATFORMS=all - +``` + make CONFIGS=all PLATFORMS=all -j8 +``` ### C++11 mapping The C++ source tree supports two different language mappings (C++98 and C++11). @@ -65,17 +64,17 @@ that uses new language features. To build the C++11 mapping, use build configurations that are prefixed with `cpp11`, for example: - make CONFIGS=cpp11-shared + make CONFIGS=cpp11-shared -j8 ### Ice Xcode SDK The build system supports building Xcode SDKs for Ice. These SDKs allow you to easily develop Ice applications with Xcode. To build Xcode SDKs, use the `xcodesdk` configurations: - - make CONFIGS=xcodesdk # Build the C++98 mapping Xcode SDK - make CONFIGS=cpp11-xcodesdk # Build the C++11 mapping Xcode SDK - +``` + make CONFIGS=xcodesdk -j8 srcs # Build the C++98 mapping Xcode SDK + make CONFIGS=cpp11-xcodesdk -j8 srcs # Build the C++11 mapping Xcode SDK +``` The Xcode SDKs are built into `ice/IceSDK`. ## Installing a C++ Source Build @@ -102,27 +101,50 @@ during compilation with the `-D` option (for example `clang++ The Ice Xcode SDKs are installed in `<prefix>/lib/IceSDK`. +## Building the Test Suite + +`make all` or `make tests` builds the test suite for the platform(s) and +configuration(s) you selected. + +However, in order to run the test suite on `iphoneos`, you need to build the +C++98 Test Controller app or C++11 Test Controller app from Xcode: + - Build the test suite with `make` for the `xcodedsk` or `cpp11-xcodesdk` configuration, + and the `iphoneos` platform. + - Open the C++ Test Controller project located in the + `cpp\test\ios\controller` directory. + - Build the `C++98 Test Controller` or the `C++11 Test Controller` app (it must match + the configuration(s) selected when building the test suite). + ## Running the Test Suite Python is required to run the test suite. Additionally, the Glacier2 tests require the Python module `passlib`, which you can install with the command: - +``` pip install passlib - -After a successful source build, you can run the tests as follows: - - make test - -This command is equivalent to: - - python allTests.py - -For the C++11 mapping it also includes the `--c++11` argument: - - $ python allTests.py --c++11 - -If everything worked out, you should see lots of `ok` messages. In case of a -failure, the tests abort with `failed`. +``` +After a successful source build, you can run the tests as shown below. If everything +worked out, you should see lots of `ok` messages. In case of a failure, the tests abort +with `failed`. + +### macOS +``` + python allTests.py # default config and default platform + python allTests --config=... --platform=... # use the specified config and platform +``` +### iOS Simulator +``` + python allTests.py --config=xcodesdk --platform=iphonesimulator --controller-app + python allTests.py --config=cpp11-xcodesdk --platform=iphonesimulator --controller-app +``` +### iOS + - Start the `C++98 Test Controller` or the `C++11 Test Controller` app on your iOS + device, from Xcode. + - On your Mac: + ``` + python allTests.py --config=xcodesdk --platform=iphoneos # C++98 controller + python allTests.py --confg=cpp11-xcodesdk --platform=iphoneos # C++11 controller + ``` + All the test clients and servers run on the iOS device, not on your Mac computer. [1]: https://doc.zeroc.com/display/Rel/Using+the+macOS+Binary+Distribution+for+Ice+3.7.0 [2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.0 |