Changeset 495ebe07 for xsoft/graphweb/firefox.xml

Timestamp:

05/14/2012 02:51:06 PM (12 years ago)

Author:

Andrew Benton <andy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

ebd7993

Parents:

6c17af3

Message:

Added --disable-debug-symbols to the xulrunner mozconfig
Added the option to use xulrunner back into the firefox page
Added --disable-debug-symbols to the seamonkey mozconfig

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

File:

• xsoft/graphweb/firefox.xml (modified) (10 diffs)

xsoft/graphweb/firefox.xml

@@ -104 +104 @@
       <xref linkend="wireless_tools"/>,
       <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
-      the jemalloc code) and
-      <xref linkend="wget"/>
+      the jemalloc code),
+      <xref linkend="wget"/> and
+      <xref linkend="xulrunner"/>
     </para>
 
@@ -144 +145 @@
 ac_add_options --disable-libnotify
 
+# If you have installed xulrunner uncomment these two lines:
+# ac_add_options --with-system-libxul
+# ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-&xulrunner-version;
+
 # Uncomment these if you have installed them:
 # ac_add_options --enable-startup-notification
@@ -154 +159 @@
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir
+ac_add_options --enable-official-branding
+ac_add_options --prefix=/usr
+
+# The rest of these options have no effect if you're
+# building against an already installed xulrunner:
 ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
@@ -160 +170 @@
 ac_add_options --disable-tests
 ac_add_options --disable-updater
-ac_add_options --enable-official-branding
 ac_add_options --enable-shared
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-ffi
-ac_add_options --prefix=/usr
 ac_add_options --with-pthreads
 ac_add_options --with-system-jpeg
@@ -180 +188 @@
 sed -i '/sys\/time\.h/a#include &lt;unistd.h&gt;' ipc/chromium/src/base/time_posix.cc &amp;&amp;
 sed -i 's# ""##' browser/base/Makefile.in &amp;&amp;
-make -f client.mk &amp;&amp;
-make -C firefox-build-dir/browser/installer</userinput></screen>
+make -f client.mk</userinput></screen>
 
     <para>
@@ -188 +195 @@
 
     <para>
-      Now, as the <systemitem class="username">root</systemitem> user install
-      <application>Firefox</application>:
+      If you have <emphasis>not</emphasis> linked
+      <application>Firefox</application> against an installed
+      <application>Xulrunner</application>:
+    </para>
+
+<screen><userinput>make -C firefox-build-dir/browser/installer</userinput></screen>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user, if you
+      have <emphasis>not</emphasis> linked <application>Firefox</application>
+      against an installed <application>Xulrunner</application>, install the
+      package:
     </para>
 
@@ -200 +217 @@
 chown -R -v root:root /usr/lib/firefox-&firefox-version;</userinput></screen>
 
+    <para>
+      If you <emphasis>have</emphasis> linked against an already installed
+      <application>Xulrunner</application>, as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -C firefox-build-dir install &amp;&amp;
+rm /usr/bin/firefox &amp;&amp;
+cat &gt; /usr/bin/firefox &lt;&lt; "HERE_DOC" &amp;&amp;
+#!/bin/bash
+/usr/lib/xulrunner-&xulrunner-version;/xulrunner /usr/lib/firefox-&firefox-version;application.ini "${@}"
+HERE_DOC
+chmod 755 /usr/bin/firefox &amp;&amp;
+mkdir -p /usr/lib/mozilla/plugins &amp;&amp;
+ln -sv ../mozilla/plugins /usr/lib/firefox-&firefox-version; &amp;&amp;
+chown -R -v root:root /usr/lib/firefox-&firefox-version;</userinput></screen>
+
     <bridgehead renderas="sect3" id="npapi-firefox" xreflabel="Firefox">
       NPAPI Headers
@@ -213 +247 @@
 <screen role="root"><userinput>mkdir /usr/include/npapi
 cp dom/plugins/base/*.h /usr/include/npapi</userinput></screen>
-
-    <bridgehead renderas="sect3" id="devel-firefox" xreflabel="Firefox">
-      All the Development Libraries and Headers
-    </bridgehead>
-    <para>
-      If you want to install the full <application>Firefox</application>
-      development environment (Note, this installs more than half a gigabyte of
-      extra files), as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C firefox-build-dir install</userinput></screen>
   </sect2>
 
@@ -263 +286 @@
       'firefox' directory from the filenames, allowing us to untar it
       into a versioned directory.
+    </para>
+
+     <para>
+      <command>make -C firefox-build-dir install</command>: This runs
+      <command>make install</command> in firefox-build-dir.
     </para>
 
@@ -284 +312 @@
       default, we make the symbolic link to keep all the plugins installed in
       one folder.
-    </para>
-
-    <para>
-      <command>make -C firefox-build-dir install</command>: This runs
-      <command>make install</command> in
-      <filename class="directory">firefox-build-dir</filename>.
     </para>
   </sect2>