diff --git a/docs/Build.xml b/docs/Build.xml
index 1fbd83496..07367be07 100644
--- a/docs/Build.xml
+++ b/docs/Build.xml
@@ -53,8 +53,10 @@
required to produce a directory that is suitable for the
install.sh script to run in.
+ My local git repositories are:
+
- trunk
+ trunk (clone of Code)
The development branch of each product is kept here.
@@ -97,14 +99,14 @@
- tools
+ tools (Clone of Tools)
This is where the release and build tools are kept. There are two
subordinate directories:
- trunk/tools/build
+ tools/build
Tools for building and uploading new releases.
@@ -112,7 +114,7 @@
- trunk/tools/web
+ tools/web
Tools for publishing web content
@@ -122,14 +124,14 @@
- web
+ web (Clone of Web)
The files from the web site that are maintained in HTML format.
are kept in this directory.
- release
+ release (Clone of Release)
Added in Shorewall 4.4.22, this directory contains the files that
contain release-dependent information (change.txt, releasenotes.txt,
@@ -142,7 +144,7 @@
Build Tools
As described above, the build tools are kept in trunk/tools/build. They are described in the
+ class="directory">tools/build. They are described in the
following sections.
@@ -161,247 +163,6 @@
version or a patch version.
-
- build
-
- This is the script that builds Shorewall 4.6 packages from
- Git.
-
- The script copies content from Git using the git
- archive command. It then uses that content to build the
- packages. In addition to the usual Gnu utilities, the following software
- is required:
-
-
-
- rpmbuild
-
-
- Required to build the RPM packages.
-
-
-
-
- xsltproc (libxslt)
-
-
- Required to convert the XML documents to other
- formats.
-
-
-
-
- Docbook XSL Stylesheets
-
-
- Required to convert the XML documents to other
- formats.
-
-
-
-
- Perl
-
-
- Required to massage some of the config files.
-
-
-
-
- xmlto
-
-
- Required to convert the XML manpages to manpages. Be sure
- that you have a recent version; I use 0.0.23.
-
-
-
-
- You should ensure that you have the latest scripts. The scripts
- change periodically as we move through the release cycles.
-
- The build46 script may need to be modified to fit your particular
- environment. There are a number of variables that are set near the top
- of the file:
-
-
-
- STYLESHEET
-
-
- Must point to the XHTML docbook.xsl stylesheet from your
- Docbook XSL Stylesheets installation.
-
-
-
-
- LOGDIR
-
-
- Directory where you want the build log placed. Defaults to
- the current working directory.
-
-
-
-
- RPMDIR
-
-
- Points to your RPM directory .
-
-
-
-
- DIR
-
-
- Directory where you want the release to be built. Defaults
- to the current working directory.
-
-
-
-
- GIT
-
-
- Shorewall GIT repository.
-
-
-
-
- The scripts assume that there will be a separate build
- directory per major release.
-
- To build a release, you cd to the appropriate directory and run
- the build46 script.
-
- The general form of the build46 command is:
-
-
- build [ -options ]
- release [ prior
- release ]
-
-
- where
-
-
-
- options
-
-
- are one or more of the following. If no options are given
- then all options are assumed
-
-
-
- t
-
-
- build tar files
-
-
-
-
- r
-
-
- build RPMs
-
-
-
-
- c
-
-
- Build the shorewall package.
-
-
-
-
- i
-
-
- Build the shorewall-init package.
-
-
-
-
- l
-
-
- Build the shorewall-lite package.
-
-
-
-
- 6
-
-
- Build the shorewall6 package.
-
-
-
-
- L
-
-
- Build the shorewall6-lite package.
-
-
-
-
- h
-
-
- Build the html document package.
-
-
-
-
- x
-
-
- Build the xml document package.
-
-
-
-
-
-
-
- release
-
-
- The release version to build. Must match the version in the
- associated Git path.
-
-
-
-
- prior release
-
-
- The release to be used to generate patch files.
-
-
-
-
- Example 1 - Build Shorewall 4.4.7 and generate patches against
- 4.4.6:
-
-
- build 4.4.7 4.4.6
-
-
- Example 2 - Build Shorewall 4.2.7.1 Shorewall and generate patches
- against 4.4.7:
-
-
- build -trc 4.4.7.1 4.4.7
-
-
-
build45 and build46
@@ -655,7 +416,7 @@
upload
- This script is used to upload a release to www1.shorewall.net. The
+ This script is used to upload a release to www.shorewall.org. The
command is run in the build directory for the minor release of the
product.
@@ -742,7 +503,7 @@
upload 4.3.7
- Example 2 - Upload shorewall-4.3.7.3:
+ Example 2 - Upload shorewall-core-4.3.7.3:
upload -c 4.3.7.3