Changeset 58cba7f0


Ignore:
Timestamp:
03/04/2015 10:17:44 PM (8 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 7.10, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/inkscape-core-mods, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
Children:
80dbc4c8
Parents:
8ddea36
Message:

Split JAVA configuration from the other pages, and rearrange order

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15607 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • general/prog/apache-ant.xml

    r8ddea36 r58cba7f0  
    208208
    209209      <para>Some packages will require <command>ant</command> to be in the
    210       search path and the <envar>$ANT_HOME</envar> environment variable
    211       defined. Satisfy these requirements by adding the following lines to
    212       <filename>/etc/profile</filename> or to individual user's
    213       <filename>~/.profile</filename> or <filename>~/.bashrc</filename> files:</para>
    214 
    215 <screen><literal>export PATH=$PATH:/opt/ant/bin
    216 export ANT_HOME=/opt/ant</literal></screen>
     210      search path and the <envar>ANT_HOME</envar> environment variable
     211      defined. Satisfy these requirements by issuing, as the <systemitem
     212      class="username">root</systemitem> user:</para>
     213
     214<screen role="root"><userinput>cat &gt;&gt; /etc/profile.d/extrapaths.sh &lt;&lt; EOF
     215<literal># Begin Apache-ant addition
     216pathappend /opt/ant/bin
     217export ANT_HOME=/opt/ant
     218# End Apache-ant addition</literal>
     219EOF</userinput></screen>
     220
     221      <para>The above instrutions assume you have configured your system as
     222      described in <xref linkend="postlfs-config-profile"/>.</para>
    217223
    218224    </sect3>

  • general/prog/java.xml

    r8ddea36 r58cba7f0  
    137137chown -R root:root /opt/OpenJDK-&openjdk-version;-bin</userinput></screen>
    138138
     139<!--
    139140    <para>Configure the temporary <application>OpenJDK</application>
    140141    installation by issuing the following commands (note that if you logout
    … …  
    150151    logout and login back, or to source the profile file after
    151152    modification.</para>
     153-->
    152154
     155    <para>
     156      The binary version is now installed. You may create a symlink to that
     157      version by issuing, as the <systemitem class="username">root</systemitem>
     158      user:
     159    </para>
    153160
    154     <para>The binary version is now installed. If you don't want to compile the
    155     sources, skip ahead to the <xref linkend='openjdk-config'/> section.
     161<screen role="root"><userinput>ln -sf OpenJDK-&openjdk-version;-bin /opt/jdk</userinput></screen>
     162
     163    <para>
     164      You may now proceed to <xref linkend="ojdk-conf"/>, where the
     165      instructions assume that the above link exists.
     166    </para>
     167
     168<!--
     169If you don't want to compile the
     170      sources, skip ahead to the <xref linkend='openjdk-config'/> section.
    156171    Otherwise, continue to the <xref linkend='apache-ant'/>,
    157172    <xref linkend='junit'/>, and <xref linkend='openjdk'/> sections.</para>
     173-->
    158174   
    159175  </sect2>

  • general/prog/junit.xml

    r8ddea36 r58cba7f0  
    126126   
    127127    <para>
    128       Finally, update the <envar>CLASSPATH</envar> variable:
     128      If you have followed the instructions in <xref linkend="ojdk-conf"/>,
     129      there is nothing more to do: the <envar>CLASSPATH</envar> variable
     130      whould be automatically updated.
    129131    </para>
    130132
    131 <screen><userinput>export CLASSPATH=$CLASSPATH:/usr/share/java/junit-&junit-version;</userinput></screen>
    132133  </sect2>
    133134

  • general/prog/openjdk.xml

    r8ddea36 r58cba7f0  
    454454chown -R root:root /opt/OpenJDK-&openjdk-version;</userinput></screen>
    455455
     456    <para>
     457      There are now two <application>OpenJDK</application> SDKs installed
     458      in <filename class="directory">/opt</filename>. You should decide on
     459      which one you would like to use as the default. Normally, you would opt
     460      for the just installed <application>OpenJDK</application>. If so, do
     461      the following as the <systemitem class="username">root</systemitem>
     462      user:
     463    </para>
     464
     465<screen role="root"><userinput>ln -v -nsf OpenJDK-&openjdk-version; /opt/jdk</userinput></screen>
     466
    456467    <para>If desired, you may install a .desktop file corresponding to an entry
    457468    in a desktop menu for <command>policytool</command>. First, you need to
    … …  
    575586      <title>Configuration Information</title>
    576587
    577       <para>
    578         There are now two <application>OpenJDK</application> SDKs installed
    579         in <filename class="directory">/opt</filename>. You should decide on
    580         which one you would like to use as the default. For example if you
    581         decide to use the precompiled <application>OpenJDK</application>, do
    582         the following as the <systemitem class="username">root</systemitem>
    583         user:
    584       </para>
    585 
    586 <screen role="root"><userinput>ln -v -nsf OpenJDK-&openjdk-version;-bin /opt/jdk</userinput></screen>
    587 
    588       <para>The information below assumes your system is set up using the
    589       instructions found in <quote><xref
    590       linkend="postlfs-config-profile"/></quote>. You may need to extract the
    591       relevant information below and incorporate it into your system's startup
    592       files if your system is set up differently.</para>
    593 
    594       <para>Add the following <filename>openjdk.sh</filename> shell startup
    595       file to the <filename>/etc/profile.d</filename> directory with the
    596       following commands as the <systemitem class="username">root</systemitem>
    597       user:</para>
    598 
    599 <screen role="root"><userinput>cat &gt; /etc/profile.d/openjdk.sh &lt;&lt; "EOF"
    600 <literal># Begin /etc/profile.d/openjdk.sh
    601 
    602 # Set JAVA_HOME directory
    603 JAVA_HOME=/opt/jdk
    604 
    605 # Set ANT_HOME directory
    606 ANT_HOME=/opt/ant
    607 
    608 # Adjust PATH
    609 pathappend $JAVA_HOME/bin PATH
    610 pathappend $ANT_HOME/bin PATH
    611 
    612 # Auto Java CLASSPATH
    613 # Copy jar files to, or create symlinks in this directory
    614 
    615 AUTO_CLASSPATH_DIR=/usr/share/java
    616 
    617 pathprepend . CLASSPATH
    618 
    619 for dir in `find ${AUTO_CLASSPATH_DIR} -type d 2>/dev/null`; do
    620     pathappend $dir CLASSPATH
    621 done
    622 
    623 for jar in `find ${AUTO_CLASSPATH_DIR} -name "*.jar" 2>/dev/null`; do
    624     pathappend $jar CLASSPATH
    625 done
    626 
    627 export JAVA_HOME ANT_HOME CLASSPATH
    628 unset AUTO_CLASSPATH_DIR dir jar
    629 
    630 # End /etc/profile.d/openjdk.sh</literal>
    631 EOF</userinput></screen>
    632 
    633     <para>Finally, add the man pages to <application>man_db</application>'s
    634     configuration. As the <systemitem class="username">root</systemitem>
    635     user:</para>
    636 
    637 <screen role="root"><userinput>cat >> /etc/profile.d/extrapaths.sh &lt;&lt; "EOF" &amp;&amp;
    638 <literal># Begin Java addition
    639 pathappend /opt/jdk/man       MANPATH
    640 # End Java addition</literal>
    641 EOF
    642 
    643 
    644 cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF" &amp;&amp;
    645 <literal># Begin Java addition
    646 MANDATORY_MANPATH     /opt/jdk/man
    647 MANPATH_MAP           /opt/jdk/bin     /opt/jdk/man
    648 MANDB_MAP             /opt/jdk/man     /var/cache/man/jdk
    649 # End Java addition</literal>
    650 EOF
    651 
    652 mkdir -p /var/cache/man
    653 mandb -c /opt/jdk/man</userinput></screen>
     588    <para>Normally, the JAVA environment has been configured after installing
     589    the binary version, and can be used with the just built package as well.
     590    Review <xref linkend="ojdk-conf"/> in case you want to modify
     591    something.</para>
    654592
    655593    <para>To test if the man pages are correctly installed, issue
    … …  
    659597    </sect3>
    660598
    661     <sect3 id='ojdk-certs'>
     599    <sect3 id='ojdk-certs' xreflabel='JRE Certificate Authorithy Certificates'>
    662600      <title>Install or update the JRE Certificate Authority Certificates
    663601      (cacerts) file</title>

  • general/prog/prog.xml

    r8ddea36 r58cba7f0  
    6666  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-java.xml"/>
    6767  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="java.xml"/>
     68  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjdk.xml"/>
     69  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ojdk-conf.xml"/>
    6870  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apache-ant.xml"/>
    6971  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="junit.xml"/>
    70   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjdk.xml"/>
    7172
    7273</chapter>

  • introduction/welcome/changelog.xml

    r8ddea36 r58cba7f0  
    4848      <para>March 4th, 2015</para>
    4949      <itemizedlist>
     50        <listitem>
     51          <para>[pierre] - Split the JAVA environment configuration from
     52          the other pages. Put the Apache-ant and JUnit pages
     53          after OpenJDK, since they are not needed anymore for OpenJDK.</para>
     54        </listitem>
    5055        <listitem>
    5156          <para>[fernando] - Fix Xorg-Server-1.17.1: do not build
Note: See TracChangeset for help on using the changeset viewer.