diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-12-06 12:31:44 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-26 09:11:40 +0100 |
| commit | 2250429dda5539466e2c3d1e33e555c4d66131e6 (patch) | |
| tree | 55712f35f2e51433b25b4bb3f52267e785076190 /odk/docs | |
| parent | 7a123cae332c99b047b3d6392b5df803d1aa2c79 (diff) | |
Related: #i121442# Add sed and cat as dependencies to odk
(cherry picked from commit 0a78e6e85d8e921705b7ea90038f822d47fb58ab)
Conflicts:
odk/cfgWin.js
odk/configure.pl
odk/docs/install.html
odk/setsdkenv_unix.sh.in
odk/setsdkenv_windows.template
odk/settings/std.mk
Change-Id: Ie124ffbb857e796923981e13dc3116c7af341056
Diffstat (limited to 'odk/docs')
| -rw-r--r-- | odk/docs/install.html | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/odk/docs/install.html b/odk/docs/install.html index efc82d2a8aa7..80cbdff0f6df 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -131,6 +131,16 @@ If you do not have these already, you can download them from <a target="_blank" href="http://www.info-zip.org" title="link to www.ubfi-zip.org (online)">http://www.info-zip.org</a>. Note: The cygwin zip.exe does not work for the build under the 4NT shell. You have to use the native w32 version.</td> </tr> + <tr valign="middle"> + <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td> + </tr> + <tr valign="top"> + <td><b>cat and sed tools<b></td> + <td class="content80">The cat and set tools are used to create some extensions. + <p><b>Note for Windows users</b>: If you do not have these already, you can download them from + <a target="_blank" href="http://sourceforge.net/projects/unxutils/files/latest/downloadg" title="link to UnxUtils (online)">http://sourceforge.net/projects/unxutils/files/latest/download</a>.</p> + </td> + </tr> <tr valign="middle"> <td colspan="2"><img class="line" src="images/sdk_line-1.gif"/></td> </tr> @@ -138,8 +148,8 @@ <td colspan="2"> <p>The SDK provides an implicit configuration mechanism, which configures the SDK build environment to your personal needs the first - time you use the SDK environment. This configuration step creates one - new setsdkenv_XXX script in the user's home directory:</p> + time you use the SDK environment. This configuration step creates a + new setsdkenv_XXX script in the user's home directory:</p> <ul> <li><b>$HOME/$OO_SDK_NAME/setsdkenv_unix.sh</b> -> for Unix</li> <li><b>C:\Documents and Settings\<username>\Application Data\%OO_SDK_NAME%\setsdkenv_windows.bat</b> -> for Windows2000/XP or later</li> @@ -222,6 +232,14 @@ <td class="cell20"><b>OO_SDK_ZIP_HOME</b></td> <td class="cell80">Path to the 'zip' tool.</td> </tr> + <tr> + <td class="cell20"><b>OO_SDK_CAT_HOME</b></td> + <td class="cell80">Path to the 'cat' tool.</td> + </tr> + <tr> + <td class="cell20"><b>OO_SDK_SED_HOME</b></td> + <td class="cell80">Path to the 'sed' tool.</td> + </tr> <tr> <td class="cell20"><b>OO_SDK_OUTPUT_DIR</b></td> <td class="cell80">Path to an existing directory where the example output |