httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject svn commit: r152957 - in httpd/httpd/trunk: NWGNUmakefile build/NWGNUenvironment.inc build/NWGNUhead.inc docs/manual/platform/netware.xml
Date Tue, 08 Feb 2005 23:17:44 GMT
Author: bnicholes
Date: Tue Feb  8 15:17:38 2005
New Revision: 152957

URL: http://svn.apache.org/viewcvs?view=rev&rev=152957
Log:
Add a target to build the prebuild utilities on NetWare

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

Modified:
    httpd/httpd/trunk/NWGNUmakefile
    httpd/httpd/trunk/build/NWGNUenvironment.inc
    httpd/httpd/trunk/build/NWGNUhead.inc
    httpd/httpd/trunk/docs/manual/platform/netware.xml

Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/NWGNUmakefile?view=diff&r1=152956&r2=152957
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Tue Feb  8 15:17:38 2005
@@ -350,6 +350,16 @@
 	-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
 #

Modified: httpd/httpd/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/build/NWGNUenvironment.inc?view=diff&r1=152956&r2=152957
==============================================================================
--- httpd/httpd/trunk/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/trunk/build/NWGNUenvironment.inc Tue Feb  8 15:17:38 2005
@@ -276,6 +276,7 @@
 APRTEST		= $(APR_WORK)/test
 HTTPD		= $(AP_WORK)/modules/http
 XML		= $(APU_WORK)/xml
+PREBUILD_INST   = $(AP_WORK)\nwprebuild
 
 #
 # Internal Libraries

Modified: httpd/httpd/trunk/build/NWGNUhead.inc
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/build/NWGNUhead.inc?view=diff&r1=152956&r2=152957
==============================================================================
--- httpd/httpd/trunk/build/NWGNUhead.inc (original)
+++ httpd/httpd/trunk/build/NWGNUhead.inc Tue Feb  8 15:17:38 2005
@@ -68,10 +68,14 @@
 	@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

Modified: httpd/httpd/trunk/docs/manual/platform/netware.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/platform/netware.xml?view=diff&r1=152956&r2=152957
==============================================================================
--- httpd/httpd/trunk/docs/manual/platform/netware.xml (original)
+++ httpd/httpd/trunk/docs/manual/platform/netware.xml Tue Feb  8 15:17:38 2005
@@ -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



Mime
View raw message