summaryrefslogtreecommitdiff
path: root/objective-c
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-06-30 16:58:50 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-06-30 16:58:50 +0200
commitcca0a663c888dba18b319cf7b2017ec46347cf05 (patch)
treed99c5b95bbdc77bb343585265c4c579193edd247 /objective-c
parentFixed ICE-8194 - Ice/objects crash with Ice debug library (diff)
downloadice-cca0a663c888dba18b319cf7b2017ec46347cf05.tar.bz2
ice-cca0a663c888dba18b319cf7b2017ec46347cf05.tar.xz
ice-cca0a663c888dba18b319cf7b2017ec46347cf05.zip
Fixed documentation files to use 80 columns
Diffstat (limited to 'objective-c')
-rw-r--r--objective-c/BuildInstructions.md34
1 files changed, 18 insertions, 16 deletions
diff --git a/objective-c/BuildInstructions.md b/objective-c/BuildInstructions.md
index 1700ec611d5..b07c5f58bcd 100644
--- a/objective-c/BuildInstructions.md
+++ b/objective-c/BuildInstructions.md
@@ -13,27 +13,28 @@ our [supported platforms][2].
## Building Ice for Objective-C
-The build of Ice for Objective-C requires that you first build Ice for C++ in the
-`cpp` subdirectory for the same configuration(s) and platform(s).
+The build of Ice for Objective-C requires that you first build Ice for C++ in
+the `cpp` subdirectory for the same configuration(s) and platform(s).
-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.
+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.
Change to the Ice for Objective-C source subdirectory:
```
cd objective-c
```
-Run `make` to build the Ice Objective-C libraries and test suite. Set `V=1` to get
-a more detailed build output. You can build only the libraries with the `srcs`
-target, or only the tests with the `tests` target. For example:
+Run `make` to build the Ice Objective-C libraries and test suite. Set `V=1` to
+get a more detailed build output. You can build only the libraries with the
+`srcs` target, or only the tests with the `tests` target. For example:
```
make V=1 -j8 srcs
```
### Build configurations and platforms
-The Objective-C source tree supports multiple build configurations and platforms.
-To see the supported configurations and platforms:
+The Objective-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
@@ -42,9 +43,9 @@ To build all the supported configurations and platforms:
```
make CONFIGS=all PLATFORMS=all -j8
```
-The `arc-` configurations (for [Automatic Reference Counting][3]) apply only to the
-test suite; the Ice libraries don't use these configurations, and the same Ice for
-Objective-C library can be used with and without ARC.
+The `arc-` configurations (for [Automatic Reference Counting][3]) apply only to
+the test suite; the Ice libraries don't use these configurations, and the same
+Ice for Objective-C library can be used with and without ARC.
### Ice Xcode SDK
@@ -74,7 +75,7 @@ configuration(s) you selected.
However, in order to run the test suite on `iphoneos`, you need to build the
Objective-C Controller app from Xcode:
- Open the Objective-C Test Controller project located in the
- `objective-c\test\ios\controller` directory.
+ `objective-c/test/ios/controller` directory.
- Build the `Objective-C Controller` or `Objective-C ARC Controller` app.
## Running the Test Suite
@@ -93,13 +94,14 @@ of `ok` messages. In case of a failure, the tests abort with `failed`.
python allTests.py --config=xcodesdk --platform=iphonesimulator --controller-app
```
### iOS
- - Start the `Objective-C Controller` or `Objective-C ARC Controller` app on your iOS
- device, from Xcode.
+ - Start the `Objective-C Controller` or `Objective-C ARC Controller` app on
+ your iOS device, from Xcode.
- On your Mac:
```
python allTests.py --config=xcodesdk --platform=iphoneos
```
- All the test clients and servers run on the iOS device, not on your Mac computer.
+ 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