Add a target to build the prebuild utilities on NetWare

Submitted by: Guenter Knauf <fuankg@apache.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152957 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/NWGNUmakefile b/NWGNUmakefile
index ee85d857e5008d71b64e95ec807d07bacb44cc36..0c521c7309342f2e2815aff9869f5829e396db99 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -350,6 +350,16 @@ installdev :: FORCE
        -copy $(subst /,\,$(APR))\*.imp                     $(INSTALL)\Apache2\lib\*.*
        -copy $(subst /,\,$(NWOS))\*.xdc                    $(INSTALL)\Apache2\lib\*.*
     
+prebuild :: FORCE
+       $(MAKE) -C server -f NWGNUMakefile
+       $(MAKE) -C srclib/pcre -f NWGNUMakefile
+       $(MAKE) -C $(APU_WORK)/uri -f NWGNUMakefile
+       $(CHKNOT) $(PREBUILD_INST)\nul          mkdir $(PREBUILD_INST)
+       -copy $(AP_WORK)\server\$(OBJDIR)\*.nlm $(PREBUILD_INST)\*.*
+       -copy $(AP_WORK)\srclib\pcre\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.*
+       -copy $(APU_WORK)\uri\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.*
+
+
 #
 # Any specialized rules here
 #

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 8ff634a1772dd97e118f5061590a13cf75492a38..15f3b4143a3250057c415337cca1461ffe40fd37 100644 (file)
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -276,6 +276,7 @@ PCRE                = $(AP_WORK)/srclib/pcre
 APRTEST                = $(APR_WORK)/test
 HTTPD          = $(AP_WORK)/modules/http
 XML            = $(APU_WORK)/xml
+PREBUILD_INST   = $(AP_WORK)\nwprebuild
 
 #
 # Internal Libraries

diff --git a/build/NWGNUhead.inc b/build/NWGNUhead.inc
index dbb3f9597fd56c6863877219168a629115515b66..cdbaf2728fd97ab755847a0c740340f5eedfdb67 100644 (file)
--- a/build/NWGNUhead.inc
+++ b/build/NWGNUhead.inc
@@ -68,10 +68,14 @@ help :
        @echo You can also specify RELEASE=debug, RELEASE=noopt, or RELEASE=optimized
        @echo The default is RELEASE=optimized
 
-clobber_all :: clean clobber_install
+clobber_all :: clean clobber_install clobber_prebuild
 
 clobber_install ::
        -$(DELTREE) $(INSTALL) 2>NUL
+        
+clobber_prebuild ::
+       $(CHK) $(PREBUILD_INST)\*.* $(DEL) $(PREBUILD_INST)\*.*
+       -$(DELTREE) $(PREBUILD_INST) 2> NUL
 
 #
 # build recursive targets

diff --git a/docs/manual/platform/netware.xml b/docs/manual/platform/netware.xml
index 500c75db16f0fe07459de78bab8c2ad02e514bad..8436217dbf34f749f1b58aea865c83d68980f9e7 100644 (file)
--- a/docs/manual/platform/netware.xml
+++ b/docs/manual/platform/netware.xml
@@ -516,28 +516,14 @@
         <li>Download the source code and unzip to an appropriate directory on
         your workstation.</li>
 
-        <li>Change directory to <code>\httpd-2.0\srclib\apr-util\uri</code> and build
-        <code>GENURI.nlm</code> by running "<code>gmake -f nwgnumakefile</code>".</li>
-
-        <li>Copy the file <code>GENURI.nlm</code> to the <code>SYS:</code> volume
-        of a NetWare server and run using the following command:
-          <example>SYS:\genuri &gt; sys:\uri_delims.h</example>
+        <li>Change directory to <code>\httpd-2.0</code> and build the prebuild utilities
+        by running "<code>gmake -f nwgnumakefile prebuild</code>". This target will create
+        the directory <code>\httpd-2.0\nwprebuild</code> and copy each of the utilities 
+        to this location that are necessary to complete the following build steps.
         </li>
 
-        <li>Copy the file <code>uri_delims.h</code> to the directory
-        <code>\httpd-2.0\srclib\apr-util\uri</code> on the build machine.</li>
-
-        <li>Change directory to <code>\httpd-2.0\srclib\apr</code> and build APR
-        by running "<code>gmake -f nwgnumakefile</code>"</li>
-
-        <li>Change directory to <code>\httpd-2.0\srclib\pcre</code> and build
-        <code>DFTABLES.nlm</code> by running "<code>gmake -f nwgnumakefile</code>"</li>
-
-        <li>Change directory to <code>\httpd-2.0\server</code> and build
-        <code>GENCHARS.nlm</code> by running "<code>gmake -f nwgnumakefile</code>"</li>
-
-        <li>Copy the files <code>GENCHARS.nlm</code> and <code>DFTABLES.nlm</code>
-        from their respective directories to the <code>SYS:</code> volume of a
+        <li>Copy the files <code>\httpd-2.0\nwprebuild\GENCHARS.nlm</code> and 
+        <code>\httpd-2.0\nwprebuild\DFTABLES.nlm</code> to the <code>SYS:</code> volume of a
         NetWare server and run them using the following commands:
           <example>
             SYS:\genchars &gt; sys:\test_char.h<br />
@@ -572,12 +558,15 @@
         distribution with binaries, docs and additional support files in a
         <code>\dist\Apache2</code> directory.</p></li>
 
+        <li><code>gmake -f nwgnumakefile prebuild</code><p>Builds all of the prebuild utilities
+        and copies them to the <code>\nwprebuild</code> directory.</p></li>
+
         <li><code>gmake -f nwgnumakefile installdev</code><p>Same as install but also creates a
         <code>\lib</code> and <code>\include</code> directory in the destination directory
         and copies headers and import files.</p></li>
 
         <li><code>gmake -f nwgnumakefile clean</code><p>Cleans all object files and binaries
-        from the <code>\release</code> or <code>\debug</code> build areas depending on whether
+        from the <code>\release.o</code> or <code>\debug.o</code> build areas depending on whether
         <code>DEBUG</code> has been defined.</p></li>
 
         <li><code>gmake -f nwgnumakefile clobber_all</code><p>Same as clean and also deletes