[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/doc/sgml
BUILD.sgml, 1.1.4.3.4.3, 1.1.4.3.4.4 defs.ent, 1.1.4.4.2.3,
1.1.4.4.2.4
Keith Packard
xorg-commit at pdx.freedesktop.org
Tue Apr 6 20:31:10 PDT 2004
Committed by: keithp
Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml
In directory pdx:/tmp/cvs-serv32469/programs/Xserver/hw/xfree86/doc/sgml
Modified Files:
Tag: XORG-RELEASE-1
BUILD.sgml defs.ent
Log Message:
2004-04-06 Keith Packard <keithp at keithp.com>
* programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml:
Oops. File names for .tgz were missing the 'R'.
WORLDOPTS is "" by default now. Switch sense
of the documentation to match.
* programs/Xserver/hw/xfree86/doc/sgml/defs.ent
Hah! CVS fight. I prefer lower case tags,
so I've changed the documentation to use the
original name (xo_6_7_0) and tagged the tree.
Note that the branch still isn't created; we'll want
to do that soon somehow.
Index: BUILD.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml,v
retrieving revision 1.1.4.3.4.3
retrieving revision 1.1.4.3.4.4
diff -u -d -r1.1.4.3.4.3 -r1.1.4.3.4.4
--- a/BUILD.sgml 6 Apr 2004 21:16:09 -0000 1.1.4.3.4.3
+++ b/BUILD.sgml 7 Apr 2004 03:31:07 -0000 1.1.4.3.4.4
@@ -16,7 +16,7 @@
<abstract>
This document describes how to build the X Window System from the
-X.org monolithic <bf>source</bf>
+X.Org monolithic <bf>source</bf>
distribution and is designed to
be used in conjunction with the operating system (OS) specific README files.
</abstract>
@@ -58,13 +58,13 @@
<item>The X11R&relvers; source is contained in the files:
<quote><tt>
- X11&fullrelvers;-src1.tar.gz<newline>
- X11&fullrelvers;-src2.tar.gz<newline>
- X11&fullrelvers;-src3.tar.gz<newline>
- X11&fullrelvers;-src4.tar.gz<newline>
- X11&fullrelvers;-src5.tar.gz<newline>
- X11&fullrelvers;-src6.tar.gz<newline>
- X11&fullrelvers;-src7.tar.gz<newline>
+ X11R&fullrelvers;-src1.tar.gz<newline>
+ X11R&fullrelvers;-src2.tar.gz<newline>
+ X11R&fullrelvers;-src3.tar.gz<newline>
+ X11R&fullrelvers;-src4.tar.gz<newline>
+ X11R&fullrelvers;-src5.tar.gz<newline>
+ X11R&fullrelvers;-src6.tar.gz<newline>
+ X11R&fullrelvers;-src7.tar.gz<newline>
</tt></quote>
These can be found at <htmlurl
@@ -74,30 +74,30 @@
name="http://freedesktop.org/~xorg/X11R&relvers;/src/"
url="http://freedesktop.org/~xorg/X11R&relvers;/src/">
and similar locations on X.org mirror sites.
- <tt>X11&fullrelvers;-src4.tgz</tt> and
- <tt>X11&fullrelvers;-src5.tar.gz</tt> contains the fonts.
- <tt>X11&fullrelvers;-src6.tar.gz</tt> contains the documentation
- source. <tt>X11&fullrelvers;-src7.tar.gz</tt> contains the
- hardcopy documentation. <tt>X11&fullrelvers;-src1.tar.gz</tt>,
- <tt>X11&fullrelvers;-src2.tar.gz</tt> and
- <tt>X11&fullrelvers;-src3.tar.gz</tt> contains everything
+ <tt>X11R&fullrelvers;-src4.tgz</tt> and
+ <tt>X11R&fullrelvers;-src5.tar.gz</tt> contains the fonts.
+ <tt>X11R&fullrelvers;-src6.tar.gz</tt> contains the documentation
+ source. <tt>X11R&fullrelvers;-src7.tar.gz</tt> contains the
+ hardcopy documentation. <tt>X11R&fullrelvers;-src1.tar.gz</tt>,
+ <tt>X11R&fullrelvers;-src2.tar.gz</tt> and
+ <tt>X11R&fullrelvers;-src3.tar.gz</tt> contains everything
else. If you don't need the docs or fonts you can get by with
- only <tt>X11&fullrelvers;-src1.tar.gz</tt>,
- <tt>X11&fullrelvers;-src2.tar.gz</tt> and
- <tt>X11&fullrelvers;-src3.tar.gz</tt>.
+ only <tt>X11R&fullrelvers;-src1.tar.gz</tt>,
+ <tt>X11R&fullrelvers;-src2.tar.gz</tt> and
+ <tt>X11R&fullrelvers;-src3.tar.gz</tt>.
<item>Extract each of these files by running the following from a directory
on a filesystem containing enough space (the full source requires
around 305MB, and a similar amount is required in addition to this
for the compiled binaries):
<quote><tt>
- gzip -d < X11&fullrelvers;-src1.tar.gz | tar vxf -<newline>
- gzip -d < X11&fullrelvers;-src2.tar.gz | tar vxf -<newline>
- gzip -d < X11&fullrelvers;-src3.tar.gz | tar vxf -<newline>
- gzip -d < X11&fullrelvers;-src4.tar.gz | tar vxf -<newline>
- gzip -d < X11&fullrelvers;-src5.tar.gz | tar vxf -<newline>
- gzip -d < X11&fullrelvers;-src6.tar.gz | tar vxf -<newline>
- gzip -d < X11&fullrelvers;-src7.tar.gz | tar vxf -<newline>
+ gzip -d < X11R&fullrelvers;-src1.tar.gz | tar vxf -<newline>
+ gzip -d < X11R&fullrelvers;-src2.tar.gz | tar vxf -<newline>
+ gzip -d < X11R&fullrelvers;-src3.tar.gz | tar vxf -<newline>
+ gzip -d < X11R&fullrelvers;-src4.tar.gz | tar vxf -<newline>
+ gzip -d < X11R&fullrelvers;-src5.tar.gz | tar vxf -<newline>
+ gzip -d < X11R&fullrelvers;-src6.tar.gz | tar vxf -<newline>
+ gzip -d < X11R&fullrelvers;-src7.tar.gz | tar vxf -<newline>
</tt></quote>
]]>
@@ -127,15 +127,15 @@
<p>
Alternatively you can download the source for the X11R&relvers; &relvers;
snapshot as a tarball from <htmlurl
-name="ftp://ftp.freedesktop.org/xorg/R&relvers;/src/X11&fullrelvers;.tar.gz"
-url="ftp://ftp.freedesktop.org/xorg/R&relvers;/src/X11&fullrelvers;.tar.gz">
+name="ftp://ftp.freedesktop.org/xorg/R&relvers;/src/X11R&fullrelvers;.tar.gz"
+url="ftp://ftp.freedesktop.org/xorg/R&relvers;/src/X11R&fullrelvers;.tar.gz">
and <htmlurl
-name="http://freedesktop.org/~xorg/R&relvers;/src/X11&fullrelvers;.tar.gz"
-url="http://freedesktop.org/~xorg/R&relvers;/src/X11&fullrelvers;.tar.gz">.
+name="http://freedesktop.org/~xorg/R&relvers;/src/X11R&fullrelvers;.tar.gz"
+url="http://freedesktop.org/~xorg/R&relvers;/src/X11R&fullrelvers;.tar.gz">.
This can be extracted by running:
<quote><tt>
- gzip -d < X11&fullrelvers;.tar.gz | tar vxf -<newline>
+ gzip -d < X11R&fullrelvers;.tar.gz | tar vxf -<newline>
</tt></quote>
]]>
@@ -164,9 +164,9 @@
-->
<![ %notsnapshot; [
-If you are using just the <tt>X11&fullrelvers;-src1.tar.gz</tt>,
-<tt>X11&fullrelvers;-src2.tar.gz</tt> and
-<tt>X11&fullrelvers;-src3.tar.gz</tt> parts of the source dist, you
+If you are using just the <tt>X11R&fullrelvers;-src1.tar.gz</tt>,
+<tt>X11R&fullrelvers;-src2.tar.gz</tt> and
+<tt>X11R&fullrelvers;-src3.tar.gz</tt> parts of the source dist, you
will need to define <bf>BuildFonts</bf> to <bf>NO</bf>.
]]>
@@ -255,24 +255,24 @@
<p>
When the build is finished, you should check the <tt/World.Log/ file to
see if there were any problems. If there weren't any then you can
-install the binaries. By default the "make World" process will ignore
-errors and build as much as possible. If there were problems and they
-are not corrected at this stage, the installation process will fail.
+install the binaries. By default the "make World" process will exit
+at the first error.
To restart the build process after correcting the problems, just
run 'make'. If Imakefiles or part of the build configuration was
changed as part of correcting the problem, either re-run "make World",
or run "make Everything".
-If you would prefer "make World" to exit at the first error, run it in the
+If you would prefer "make World" to ignore errors and build as much as
+possible, run it in the
following way instead of the way described above:
for Bourne-like shells:
<quote><tt>
-make WORLDOPTS= World > World.log 2>&1
+make WORLDOPTS=-k World > World.log 2>&1
</tt></quote>
for C-shell variants:
<quote><tt>
-make WORLDOPTS= World >& World.log
+make WORLDOPTS=-k World >& World.log
</tt></quote>
To do the install, run "<tt/make install/" and "<tt/make install.man/".
Index: defs.ent
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent,v
retrieving revision 1.1.4.4.2.3
retrieving revision 1.1.4.4.2.4
diff -u -d -r1.1.4.4.2.3 -r1.1.4.4.2.4
--- a/defs.ent 6 Apr 2004 22:56:33 -0000 1.1.4.4.2.3
+++ b/defs.ent 7 Apr 2004 03:31:07 -0000 1.1.4.4.2.4
@@ -16,8 +16,8 @@
<!ENTITY prevfullsrcvers CDATA "660">
<!ENTITY whichfullrel CDATA "seventh">
<!ENTITY whichupdaterel CDATA "none">
-<!ENTITY reltag CDATA "XORG-6_7_0">
-<!ENTITY relbranchtag CDATA "XORG-6_7-branch">
+<!ENTITY reltag CDATA "xo-6_7_0">
+<!ENTITY relbranchtag CDATA "xo-6_7-branch">
<!ENTITY rcnum CDATA "0">
<!-- Version of the most recent 3.3.x release -->
More information about the xorg-commit-diffs
mailing list