r8381 - in trunk/BOOK: . introduction/welcome x/lib

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sat Apr 3 06:19:44 PDT 2010


Author: randy
Date: 2010-04-03 07:19:44 -0600 (Sat, 03 Apr 2010)
New Revision: 8381

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/xulrunner.xml
Log:
Minor tweaks to the Xulrunner instructions

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2010-04-02 13:50:55 UTC (rev 8380)
+++ trunk/BOOK/general.ent	2010-04-03 13:19:44 UTC (rev 8381)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2010">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "April &day;nd, &year;">
+<!ENTITY releasedate  "April &day;rd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "6.5">          <!-- version|testing|unstable|development] -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2010-04-02 13:50:55 UTC (rev 8380)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2010-04-03 13:19:44 UTC (rev 8381)
@@ -42,6 +42,15 @@
 -->
 
     <listitem>
+      <para>April 3rd, 2010</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Minor tweaks to the Xulrunner instructions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 2nd, 2010</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/x/lib/xulrunner.xml
===================================================================
--- trunk/BOOK/x/lib/xulrunner.xml	2010-04-02 13:50:55 UTC (rev 8380)
+++ trunk/BOOK/x/lib/xulrunner.xml	2010-04-03 13:19:44 UTC (rev 8381)
@@ -34,7 +34,7 @@
     applications, and forms the major part of the <application>Mozilla</application>
     codebase.  In particular, it provides the gecko engine together with pkgconfig
     files so that applications such as <application>Epiphany</application> and
-    <application>Yelp</application> can use it.</para>
+    <application>Yelp</application> can find and use it.</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -43,15 +43,15 @@
       </listitem>
       <listitem>
         <para>Download (FTP): <ulink url="&xulrunner-download-ftp;"/></para>
-	<tip><para>When a new version of <application>firefox</application> is
+	<tip><para>When a new version of <application>Firefox</application> is
 	released, sometimes a corresponding new version of
-	<application>xulrunner</application> appears at the same time. At other
+	<application>Xulrunner</application> appears at the same time. At other
 	times it appears several days later or not at all. So far in the
-	<application>firefox-3.x</application> series, every new release has
+	<application>Firefox-3.x</application> series, every new release has
 	created xulrunner libraries with a corresponding new version. Whenever
-	a separate xulrunner tarball has been released, it has been bitwise
-	identical to the corresponding firefox tarball. So, we will use the
-	<application>firefox</application> tarball to save downloading this
+	a separate Xulrunner tarball has been released, it has been bitwise
+	identical to the corresponding Firefox tarball. Use the
+	<application>Firefox</application> tarball to save downloading this
 	large package twice.</para></tip>
       </listitem>
       <listitem>
@@ -108,11 +108,12 @@
     (for gnome integration),
     <xref linkend="lcms"/>,
     <xref linkend="libpng"/> (patched for apng support),
+    <!-- Redundant as NSS requires this
     <xref linkend="nspr"/> (recommended if you build any other Mozilla.org
-    packages),
+    packages), -->
     <xref linkend="nss"/> (recommended if you build any other Mozilla.org
     packages),
-    <xref linkend="startup-notification"/>.
+    <xref linkend="startup-notification"/>,
     <xref linkend="unzip"/>,
     <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing the
     jemalloc code), and
@@ -136,9 +137,10 @@
     download the file instead of creating it by typing or cut-and-pasting, you
     can find it at
     <ulink url="&files-anduin;/xulrunner-&xulrunner-version;-mozconfig"/>
-    (the file must be installed in the root of the source tree
-    <filename class='directory'>mozilla</filename> directory, and named
-    <filename>.mozconfig</filename>).</para>
+    (the file must be installed in the root of the source tree,
+    <!-- directory name changes depending on version of Xulrunner
+    <filename class='directory'>mozilla</filename> directory,--> and named
+    <filename>.mozconfig</filename> or <filename>mozconfig</filename>).</para>
 
 <screen><?dbfo keep-together="auto"?><userinput>cat > .mozconfig << "EOF"
 <literal># This file contains the options used in the Xulrunner build. You may
@@ -150,11 +152,11 @@
 # 'ac_add_options --some-option-you-need'.  Be aware that some accepted
 # options, such as '--with-system-bz2', do not affect the build.
 
-# specify that we want to build xulrunner
+# specify that Xulrunner should be built.
 ac_add_options --enable-application=xulrunner
 
-# Create an object directory and specify to build the package in that
-# directory. If desired, modify the location of the object directory
+# Build the package in an object directory as recommended by the developers.
+# If desired, modify the location of the object directory
 # to a directory inside the source tree by removing '../' from the
 # line below.
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../xulrunner-build
@@ -164,7 +166,7 @@
 # your needs (the config will always be written to /etc/gre.d)
 ac_add_options --prefix=/usr
 
-# apply a minimal level of optimization (-O)
+# apply the default optimizations recommended by the developers (-O)
 ac_add_options --enable-optimize
 
 # These options are used so that the Xulrunner binaries are linked to
@@ -179,7 +181,7 @@
 ac_add_options --enable-system-sqlite
 
 # Comment this only if you want to use whatever patched version of cairo
-# is in the shipped mozilla tree, together with the system headers.
+# is in the shipped Mozilla tree, together with the system headers.
 ac_add_options --enable-system-cairo
 
 # Comment this if you have not installed lcms.
@@ -210,14 +212,14 @@
 # binaries. Comment out this option if you require a11y support.
 ac_add_options --disable-accessibility
 
-# Uncomment this if you did not build curl.
+# Uncomment this if you did not build cURL.
 #ac_add_options --disable-crashreporter
 
-# Comment this if you have built dbus-glib.
+# Comment this if you have built D-Bus-GLib.
 ac_add_options --disable-dbus
 
-# Comment this if you have gnome-vfs and libgnomeui, and wish to
-# integrate xulrunner into your gnome desktop
+# Comment this if you have Gnome-VFS and libgnomeui, and wish to
+# integrate Xulrunner into your Gnome desktop.
 ac_add_options --disable-gnomevfs
 
 # Comment this if you have wireless-tools installed and wish to use the new
@@ -232,17 +234,13 @@
 # If you enable javaxpcom, you must have a java compiler installed.
 ac_add_options --disable-javaxpcom
 
-# This option is added so that test libraries and programs are not
-# built. These would only be required for debugging purposes.
+# This option is added so that test libraries and programs used for debugging
+# are not built.
 ac_add_options --disable-tests
 
 # Disable the updater, which is not appropriate if you build from source
 ac_add_options --disable-updater
 
-# (options to add extra parts of the package)
-# Use the anti-phishing measures (a blacklist of sites).
-ac_add_options --enable-safe-browsing
-
 # This option is used so that the debugging symbols are removed from
 # the installed binaries during the installation process. Comment out
 # this option if you may have a need to retain the debugging symbols
@@ -250,13 +248,17 @@
 # bigger).
 ac_add_options --enable-strip
 
+# (Options to add extra parts of the package)
+# Use the anti-phishing measures (a blacklist of sites).
+ac_add_options --enable-safe-browsing
+
 # Uncomment this option if you desire support for dual-monitor
 # display using the X-Window Xinerama libraries.
 #ac_add_options --enable-xinerama
 
 # This option identifies the default binary directory of the Xulrunner
 # installation and is used to locate Xulrunner's installed files. This
-# option is is only used for development purposes.
+# option is only used for development purposes.
 #ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner-&xulrunner-version;</literal>
 
 EOF</userinput></screen>
@@ -267,7 +269,7 @@
 
 <screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-provide_system_nss_nspr-1.patch</userinput></screen>
 
-    <para>Compile <application>Xulrunner</application> by issuing the
+    <para>Install <application>Xulrunner</application> by issuing the
     following commands:</para>
 
 <screen><userinput>sed 's at stable@unstable@' \
@@ -277,15 +279,16 @@
 
     <para>This package does not come with a test suite.</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user,
-    install the package:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make -f client.mk install &&
-mkdir /usr/lib/mozilla &&
-ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins \
-    /usr/lib/mozilla/plugins &&
-chown -R root:root /usr/lib/xulrunner-* /usr/bin/xulrunner &&
-ln -sfv xulrunner-devel-&xulrunner-version;/lib/lib{xul,xpcom,mozjs}.so /usr/lib</userinput></screen>
+install -v -m644    /usr/lib/mozilla &&
+ln -sv              /usr/lib/xulrunner-&xulrunner-version;/plugins \
+                    /usr/lib/mozilla &&
+chown -Rv root:root /usr/lib/xulrunner-* \
+                    /usr/bin/xulrunner &&
+ln -sfv             xulrunner-devel-&xulrunner-version;/lib/lib{xul,xpcom,mozjs}.so \
+                    /usr/lib</userinput></screen>
 
     <para>If you've elected to use the included NSPR and NSS, while still the 
     <systemitem class="username">root</systemitem> user, complete the
@@ -295,7 +298,7 @@
     libnss3.so libnssutil3.so libsmime3.so libssl3.so libsoftokn3.so \
     libplds4.so libplc4.so libnspr4.so
 do
-    ln -sv xulrunner-&xulrunner-version;/$DL /usr/lib/$DL
+    ln -sv xulrunner-&xulrunner-version;/$DL /usr/lib
 done</userinput></screen>
 
   </sect2>
@@ -303,9 +306,10 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>echo "Requires: nspr" >>xulrunner/installer/libxul-embedding.pc.in</command>
-    : If you try to build <application>Yelp</application> without this, the
-    prtypes header from nspr will not be found.  It is arguable whose error this
+    <para><command>echo "Requires: nspr"
+    >>xulrunner/installer/libxul-embedding.pc.in</command>: If you try to build
+    <application>Yelp</application> without this, the
+    prtypes header from NSPR will not be found.  It is arguable whose error this
     is (the code presumably works on earlier geckos), but this fix is unlikely
     to cause any damage in other packages.</para>
 
@@ -319,22 +323,25 @@
     <command>configure</command> script and compiles the package or installs
     the package.</para>
 
-    <para><command>for DL in ...</command>: The nspr and nss libraries shipped
-    with this package are installed into /usr/lib/xulrunner-&xulrunner-version;
+    <para><command>for DL in ...</command>: The NSPR and NSS libraries shipped
+    with this package are installed into
+    <filename class='directory'>/usr/lib/xulrunner-&xulrunner-version;</filename>
     which means they will not be found at runtime.  By using symbolic links from
-    <filename class="directory">/usr/lib</filename> they will be found and we can
-    easily change the links to point to a newer version when we upgrade.</para>
+    <filename class="directory">/usr/lib</filename> the libraries will be found
+    and the links can be easily changed to point to a newer version during an
+    upgrade.</para>
 
     <para><command>ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins
-    /usr/lib/mozilla/plugins</command>: Some packages will install browser plugins
-    into /usr/lib/mozilla/plugins. By creating this as a symlink to the basic
-    plugins we keep them all together.</para>
+    /usr/lib/mozilla</command>: Some packages will install browser plugins
+    into <filename class='directory'>/usr/lib/mozilla/plugins</filename>.
+    Creating this as a symlink to the <application>Xulrunner</application>
+    plugins keeps additional plugins in a common directory.</para>
 
-   <tip>
-    <para>When you upgrade xulrunner, remember to update the symlinks and to
-    copy any additional plugins compiled agaisnt this series of xulrunner to the
-    new plugin directory.</para>
-   </tip>
+   <note>
+     <para>When you upgrade Xulrunner, remember to update the symlinks and to
+     copy any additional plugins compiled against this series of Xulrunner to the
+     new plugin directory.</para>
+   </note>
 
   </sect2>
 




More information about the blfs-book mailing list