| 1 |
jkt 10/07/06 11:51:28 |
| 2 |
|
| 3 |
Modified: java.xml |
| 4 |
Log: |
| 5 |
#325885, speak about the system VM and the merge VM. Patch by Caster. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.49 xml/htdocs/doc/en/java.xml |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/java.xml?rev=1.49&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/java.xml?rev=1.49&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/java.xml?r1=1.48&r2=1.49 |
| 13 |
|
| 14 |
Index: java.xml |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v |
| 17 |
retrieving revision 1.48 |
| 18 |
retrieving revision 1.49 |
| 19 |
diff -u -r1.48 -r1.49 |
| 20 |
--- java.xml 31 Mar 2010 23:38:40 -0000 1.48 |
| 21 |
+++ java.xml 6 Jul 2010 11:51:28 -0000 1.49 |
| 22 |
@@ -1,5 +1,5 @@ |
| 23 |
<?xml version="1.0" encoding="UTF-8"?> |
| 24 |
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v 1.48 2010/03/31 23:38:40 nightmorph Exp $ --> |
| 25 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v 1.49 2010/07/06 11:51:28 jkt Exp $ --> |
| 26 |
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd"> |
| 27 |
|
| 28 |
<guide> |
| 29 |
@@ -24,8 +24,8 @@ |
| 30 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
| 31 |
<license/> |
| 32 |
|
| 33 |
-<version>0.22</version> |
| 34 |
-<date>2009-12-23</date> |
| 35 |
+<version>0.23</version> |
| 36 |
+<date>2010-07-06</date> |
| 37 |
|
| 38 |
<chapter> |
| 39 |
<title>What is Java?</title> |
| 40 |
@@ -259,33 +259,31 @@ |
| 41 |
</body> |
| 42 |
</section> |
| 43 |
<section id="preferred-vm"> |
| 44 |
-<title>Preferred VM</title> |
| 45 |
+<title>Preferred Build VM</title> |
| 46 |
<body> |
| 47 |
|
| 48 |
<p> |
| 49 |
-While merging Java packages, the VM can and will be switched as necessary. |
| 50 |
+While merging Java packages, the VM used for building can sometimes be different |
| 51 |
+from the one currently set as the system VM. |
| 52 |
</p> |
| 53 |
|
| 54 |
<p> |
| 55 |
-Because of the wide variety of available VMs, we do not have the resources to |
| 56 |
-test and verify every package works on all of them. So to ensure that every |
| 57 |
-packages merges smoothly, we have defined a list of <e>default/supported |
| 58 |
-VMs</e> per arch. You can find them in |
| 59 |
-<path>/usr/share/java-config-2/config/jdk-defaults.conf</path>. When you are |
| 60 |
-merging a Java package, and it detects one of the VM in that file is installed, |
| 61 |
-it will automatically use that VM, instead of the system-vm. |
| 62 |
+This merge time VM switching is needed when, for example, your system-vm is |
| 63 |
+set to a 1.6 VM and the package you are merging requires a 1.5 VM. While merging |
| 64 |
+it will select and use a 1.5 VM, leaving your system-vm choice intact. |
| 65 |
</p> |
| 66 |
|
| 67 |
<p> |
| 68 |
-The merge time VM switching is also needed when, for example, your system-vm is |
| 69 |
-set a 1.4 VM and the package you are merging requires a 1.5 VM. While merging |
| 70 |
-it will use the preferred 1.5 VM, leaving your system-vm choice intact. |
| 71 |
+To define which VM is selected when a switch is needed, we have created a list of <e>default/supported |
| 72 |
+VMs</e> per arch. You can find them in |
| 73 |
+<path>/usr/share/java-config-2/config/jdk-defaults.conf</path>. |
| 74 |
</p> |
| 75 |
|
| 76 |
<p> |
| 77 |
-Of course, Gentoo is all about choice, so you can override these defaults in |
| 78 |
+Of course, Gentoo is all about choice, so you can override these defaults (and even your |
| 79 |
+selected system VM) in |
| 80 |
<path>/etc/java-config-2/build/jdk.conf</path> and have complete control over |
| 81 |
-which VM will get used. Some examples: |
| 82 |
+which VM will get used for merging. Some examples: |
| 83 |
</p> |
| 84 |
|
| 85 |
<pre caption="Example /etc/java-config-2/build/jdk.conf"> |
| 86 |
@@ -307,8 +305,10 @@ |
| 87 |
|
| 88 |
<warn> |
| 89 |
You do not <e>have</e> to edit this file. If you change these options to use a |
| 90 |
-unsupported VM, things could possibly break. Bugs reported with a unsupported VM |
| 91 |
-won't be prioritized as much as bugs present within supported VMs. |
| 92 |
+unsupported VM, things could possibly break. Because of the wide variety of available |
| 93 |
+VMs, we do not have the resources to test and verify every package works on all of them. |
| 94 |
+Bugs reported with a unsupported VM won't be prioritized as much as bugs present within |
| 95 |
+supported VMs. |
| 96 |
</warn> |
| 97 |
|
| 98 |
</body> |
Archives