From aa6bd2819c2ee1c83fcb946a928dc32de5bb4701 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 14 Aug 2014 08:03:31 -0700 Subject: [PATCH] Update the Build document - Add build46 - Mention shorewall-pkg.config Signed-off-by: Tom Eastep --- docs/Build.xml | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/docs/Build.xml b/docs/Build.xml index ec8adc231..1fbd83496 100644 --- a/docs/Build.xml +++ b/docs/Build.xml @@ -164,7 +164,7 @@
build - This is the script that builds Shorewall 4.4 packages from + This is the script that builds Shorewall 4.6 packages from Git. The script copies content from Git using the git @@ -220,7 +220,7 @@ You should ensure that you have the latest scripts. The scripts change periodically as we move through the release cycles. - The build44 script may need to be modified to fit your particular + 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: @@ -270,10 +270,12 @@ 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 build script. + directory per major release. - The general form of the build command is: + 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 ] @@ -401,13 +403,13 @@
- build45 + build45 and build46 - This is the script that builds Shorewall 4.5 packages from - Git. + These are the scripts that respectively build Shorewall 4.5 and + 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 + The scripts copy content from Git using the git + archive command. They then use that content to build the packages. In addition to the usual Gnu utilities, the following software is required: @@ -451,7 +453,7 @@ Required to convert the XML manpages to manpages. Be sure - that you have a recent version; I use 0.0.23. + that you have a recent version; I use 0.0.25. @@ -459,7 +461,7 @@ You should ensure that you have the latest scripts. The scripts change periodically as we move through the release cycles. - The build44 script may need to be modified to fit your particular + The scripts 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: @@ -509,14 +511,17 @@ 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 build script. + directory per major release. Each build directory should + contain the empty file shorewall-pkg.config; that + file is no longer used but has been retained just as a guard against + initiating a build in an unintended directory. To build a release, you + cd to the appropriate directory and run the build script. The general form of the build command is:
- build [ -options ] - release [ prior + build4x [ -options + ] release [ prior release ]
@@ -632,8 +637,8 @@ - Example 1 - Build Shorewall 4.3.7 and generate patches against - 4.3.6: + Example 1 - Build Shorewall 4.5.7 and generate patches against + 4.5.6:
build45 4.5.7 4.5.6