Index: xdocs/downloads.xml =================================================================== --- xdocs/downloads.xml (revision 520340) +++ xdocs/downloads.xml (working copy) @@ -66,8 +66,10 @@
JAVA_HOME to the root directory
- of the distribution, and put the bin/ directory on your PATH.
+ Note
+
+ The safest way is to set JAVA_HOME to the root directory
+ of the distribution, and put the bin/ directory on your PATH.
JAVA_HOME to the root directory
-of the distribution, and put the bin/ directory on your PATH.
+ The JRE lets you run your Java programs.
+ Note
+The safest way is to set JAVA_HOME to the root directory
+of the distribution, and put the bin/ directory on your PATH.
Example
diff -u http_main.c.orig http_main.c >> patchfile.txt- Note that the
diff command only shows differences for text files, and
- not binary files. So even if you did svn add on a binary file (gif, jar,
- png etc.), it won't show up in the patch, and will fail to apply. The
- key string to look out for in the patch is:
- Cannot display: file marked as a binary type.+
Note
+The diff command only shows differences for
+ text files, and not binary files. So even if you did svn add on
+ a binary file (gif, jar, png etc.), it won't show up in the patch, and will fail
+ to apply. The key string to look out for in the patch is:
+
Cannot display: file marked as a binary type.If you see that, you'll also need to attach the binary files that have changed separately to the issue. To get a list of such files in
file.patch, run:
grep -B 2 "Cannot display" file.patchIndex: xdocs/hdk.xml =================================================================== --- xdocs/hdk.xml (revision 520340) +++ xdocs/hdk.xml (working copy) @@ -38,22 +38,20 @@ An HDK contains all the header files and binaries, both native and Java, required for a Harmony classlib developer to build against. The directory structure for an HDK is as follows: -
- <hdkbase> - | - |---build - | |---make - | |---patternsets - | \---test - | - |---jdk - | |---jre - | \---include - | - |---include - | - \---lib -+
<hdkbase> + | + |---build + | |---make + | |---patternsets + | \---test + | + |---jdk + | |---jre + | \---include + | + |---include + | + \---libThe directories laid out above are used in the following manner: @@ -97,16 +95,14 @@
- - Note: The HDK and relevant build system changes are work in progress. +
Note
+The HDK and relevant build system changes are work in progress.
Not all of the Ant targets/properties described exist yet, and thus not
all of what is described below currently works. This disclaimer will be
- removed once work on the HDK is completed.
-
-
+ removed once work on the HDK is completed.
The Harmony Class Library can be built at the global or modular level. - At the modular level, there are three ways to build: + At the modular level, there are three ways to build:
ant -DHY.HDK=path/to/hdk -DHY.TARGET=path/to/target
The luni Java and native code will be built against the HDK location specified, and all produced binaries placed under the target directory, laid out in the HDK structure described at the top of this page. -
+