Commit d5171076 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Some netWare build tweaks. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1169809 13f79535-47bb-0310-9956-ffa450edef68
parent 3b84958b

NWGNUmakefile

+38 −36
Changes for NWGNUmakefile: 38 added lines, 36 removed lines.
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ XINCDIRS += \ 
			$(APR)/include \

			$(APRUTIL)/include \

			$(AP_WORK)/include \

			$(AP_WORK)/modules/filters/ \

			$(AP_WORK)/modules/generators/ \

			$(AP_WORK)/modules/http/ \

			$(AP_WORK)/modules/loggers/ \

			$(AP_WORK)/modules/mappers/ \

			$(AP_WORK)/modules/proxy/ \

			$(AP_WORK)/modules/filters \

			$(AP_WORK)/modules/generators \

			$(AP_WORK)/modules/http \

			$(AP_WORK)/modules/loggers \

			$(AP_WORK)/modules/mappers \

			$(AP_WORK)/modules/proxy \

			$(AP_WORK)/server/mpm/NetWare \

			$(PCRE) \

			$(NWOS) \
@@ -343,38 +343,40 @@ nlms :: libs $(TARGET_nlm) 
# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)

#

install :: nlms FORCE

	-copy $(OBJDIR)\Apache2.nlm     $(INSTALL)\Apache2\*.*

	-copy ABOUT_APACHE              $(INSTALL)\Apache2\*.*

	-copy README                    $(INSTALL)\Apache2\*.*

	-copy STATUS                    $(INSTALL)\Apache2\*.*

	-copy LICENSE                   $(INSTALL)\Apache2\*.*

	-copy CHANGES                   $(INSTALL)\Apache2\*.*

	-copy support\dbmmanage.in      $(INSTALL)\Apache2\bin\dbmmanage.pl

	-copy support\logresolve.pl.in  $(INSTALL)\Apache2\bin\logresolve.pl

	-copy support\check_forensic    $(INSTALL)\Apache2\bin\check_forensic

	-awk  -f build\mkconfnw.awk docs\conf\httpd-std.conf.in >$(INSTALL)\Apache2\conf\httpd.conf

	-copy docs\conf\magic           $(INSTALL)\Apache2\conf\magic

	-copy docs\conf\mime.types      $(INSTALL)\Apache2\conf\mime.types

	-copy docs\cgi-examples\printenv $(INSTALL)\Apache2\cgi-bin\printenv.pl

	@echo rem copying the docs directories > xc.bat

	@echo xcopy docs\error $(INSTALL)\Apache2\error $(XCOPYSW) >> xc.bat

	@echo xcopy docs\docroot $(INSTALL)\Apache2\htdocs $(XCOPYSW) >> xc.bat

	@echo xcopy docs\icons $(INSTALL)\Apache2\icons $(XCOPYSW) >> xc.bat

	@echo xcopy docs\man $(INSTALL)\Apache2\man $(XCOPYSW) >> xc.bat

	@echo xcopy docs\manual $(INSTALL)\Apache2\manual $(XCOPYSW) >> xc.bat

	$(CMD) xc.bat

	$(DEL) xc.bat





	-copy $(OBJDIR)\$(NLM_NAME).nlm  $(INSTALL)\$(BASEDIR)\*.*

	-copy ABOUT_APACHE               $(INSTALL)\$(BASEDIR)\*.*

	-copy CHANGES                    $(INSTALL)\$(BASEDIR)\*.*

	-copy LICENSE                    $(INSTALL)\$(BASEDIR)\*.*

	-copy README                     $(INSTALL)\$(BASEDIR)\*.*

	-copy VERSIONING                 $(INSTALL)\$(BASEDIR)\*.*

#	$(CHK) STATUS copy STATUS        $(INSTALL)\$(BASEDIR)\*.*

	-copy STATUS                     $(INSTALL)\$(BASEDIR)\*.*

	-copy support\dbmmanage.in       $(INSTALL)\$(BASEDIR)\bin\dbmmanage.pl

	-copy support\logresolve.pl.in   $(INSTALL)\$(BASEDIR)\bin\logresolve.pl

	-copy support\split-logfile.in   $(INSTALL)\$(BASEDIR)\bin\split-logfile.pl

	-copy support\check_forensic     $(INSTALL)\$(BASEDIR)\bin\check_forensic.sh

	-copy docs\conf\magic            $(INSTALL)\$(BASEDIR)\conf\magic

	-copy docs\conf\mime.types       $(INSTALL)\$(BASEDIR)\conf\mime.types

	-copy docs\conf\charset.conv     $(INSTALL)\$(BASEDIR)\conf\charset.conv

	-copy docs\cgi-examples\printenv $(INSTALL)\$(BASEDIR)\cgi-bin\printenv.pl

	-$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -f build\mkconfnw.awk docs\conf\httpd-std.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf

ifeq "$(WITH_MOD_SSL)" "1"

	-$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -f build\mkconfnw.awk docs\conf\ssl-std.conf.in >$(INSTALL)\$(BASEDIR)\conf\ssl.conf

endif

	@xcopy $(XCOPYSW) docs\error     $(INSTALL)\$(BASEDIR)\error

	@xcopy $(XCOPYSW) docs\docroot   $(INSTALL)\$(BASEDIR)\htdocs

	@xcopy $(XCOPYSW) docs\icons     $(INSTALL)\$(BASEDIR)\icons

	@xcopy $(XCOPYSW) docs\man       $(INSTALL)\$(BASEDIR)\man

	@xcopy $(XCOPYSW) docs\manual    $(INSTALL)\$(BASEDIR)\manual



installdev :: FORCE

	-copy $(subst /,\,$(AP_WORK))\include\*.h           $(INSTALL)\Apache2\include\*.*

	-copy $(subst /,\,$(AP_WORK))\os\netware\*.h        $(INSTALL)\Apache2\include\*.*

	-copy $(subst /,\,$(NWOS))\*.imp                    $(INSTALL)\Apache2\lib\*.*

	-copy $(subst /,\,$(APR))\include\*.h               $(INSTALL)\Apache2\include\*.*

	-copy $(subst /,\,$(APRUTIL))\include\*.h           $(INSTALL)\Apache2\include\*.*

	-copy $(subst /,\,$(APR))\*.imp                     $(INSTALL)\Apache2\lib\*.*

	-copy $(subst /,\,$(NWOS))\*.xdc                    $(INSTALL)\Apache2\lib\*.*

	-copy $(subst /,\,$(AP_WORK))\include\*.h  $(INSTALL)\$(BASEDIR)\include\*.*

	-copy $(subst /,\,$(NWOS))\*.h             $(INSTALL)\$(BASEDIR)\include\*.*

	-copy $(subst /,\,$(APR))\include\*.h      $(INSTALL)\$(BASEDIR)\include\*.*

	-copy $(subst /,\,$(APRUTIL))\include\*.h  $(INSTALL)\$(BASEDIR)\include\*.*

	-copy $(subst /,\,$(APR))\*.imp            $(INSTALL)\$(BASEDIR)\lib\*.*

	-copy $(subst /,\,$(NWOS))\*.imp           $(INSTALL)\$(BASEDIR)\lib\*.*

	-copy $(subst /,\,$(NWOS))\*.xdc           $(INSTALL)\$(BASEDIR)\lib\*.*



#

# Any specialized rules here

build/NWGNUenvironment.inc

+33 −18
Changes for build/NWGNUenvironment.inc: 33 added lines, 18 removed lines.
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ LINK = mwldnlm 
LIB	= mwldnlm -type library -w nocmdline

WIN_CC	= mwcc



# Setup build tools

AWK	= awk



NOVI	= $(NOVELLLIBC)\imports



INCDIRS	= $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;$(NOVELLLIBC)\include\winsock;
@@ -202,6 +205,19 @@ INSTALL = $(AP_WORK)\Dist 
INSTDIRS = $(AP_WORK)\Dist

endif



ifndef BASEDIR

BASEDIR = Apache2

export BASEDIR

endif



ifndef PORT

PORT = 80

endif



ifndef SSLPORT

SSLPORT = 443

endif



# Add support for building IPV6 alongside

ifneq "$(IPV6)" ""

DEFINES += -DNW_BUILD_IPV6
@@ -223,21 +239,21 @@ endif 


INSTDEVDIRS := \

	$(INSTDIRS) \

	$(INSTALL)\Apache2\include \

	$(INSTALL)\Apache2\lib \

	$(INSTALL)\$(BASEDIR)\include \

	$(INSTALL)\$(BASEDIR)\lib \



INSTDIRS += \

	$(INSTALL)\Apache2 \

	$(INSTALL)\Apache2\bin \

	$(INSTALL)\Apache2\cgi-bin \

	$(INSTALL)\Apache2\conf \

	$(INSTALL)\Apache2\error \

	$(INSTALL)\Apache2\htdocs \

	$(INSTALL)\Apache2\icons \

	$(INSTALL)\Apache2\logs \

	$(INSTALL)\Apache2\man \

	$(INSTALL)\Apache2\manual \

	$(INSTALL)\Apache2\modules \

	$(INSTALL)\$(BASEDIR) \

	$(INSTALL)\$(BASEDIR)\bin \

	$(INSTALL)\$(BASEDIR)\cgi-bin \

	$(INSTALL)\$(BASEDIR)\conf \

	$(INSTALL)\$(BASEDIR)\error \

	$(INSTALL)\$(BASEDIR)\htdocs \

	$(INSTALL)\$(BASEDIR)\icons \

	$(INSTALL)\$(BASEDIR)\logs \

	$(INSTALL)\$(BASEDIR)\man \

	$(INSTALL)\$(BASEDIR)\manual \

	$(INSTALL)\$(BASEDIR)\modules \



#

# Declare Command and tool macros here
@@ -250,21 +266,20 @@ endif 


ifeq "$(OS)" "Windows_NT"

CMD = cmd /C

CHK=cmd /C if exist

CHKNOT=cmd /C if not exist

DEL = del /F

DELTREE = cmd /C rd /s/q

DELTREE = rd /s/q

WINNT = 1

XCOPYSW = /E

else

CMD = command /C

CHK=command /C if exist

CHKNOT=command /C if not exist

DEL = del

DELTREE = deltree /y

XCOPYSW = /E /Y

endif



CHK = $(CMD) if exist

CHKNOT = $(CMD) if not exist





#

# Setup base C compiler flags

build/NWGNUtail.inc

+2 −1
Changes for build/NWGNUtail.inc: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ NLM_SCREEN_NAME = DEFAULT 
endif



ifndef NLM_COPYRIGHT

NLM_COPYRIGHT = Copyright 2006 The Apache Software Foundation. Licensed under the Apache License Version 2.0.

NLM_COPYRIGHT = Licensed under the Apache License Version 2.0.

endif



#
@@ -226,6 +226,7 @@ endif 
	@echo -l $(NWOS) >> $@

	@echo -l $(AP)/$(OBJDIR) >> $@

	@echo -l $(APR)/$(OBJDIR) >> $@

	@echo -l $(APR) >> $@

	@echo -l $(APRUTIL)/$(OBJDIR) >> $@

	@echo -l $(PCRE)/$(OBJDIR) >> $@

	@echo -l $(HTTPD)/$(OBJDIR) >> $@

build/mkconfNW.awk

+26 −4
Changes for build/mkconfNW.awk: 26 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -15,8 +15,9 @@ 


BEGIN {

    

    A["ServerRoot"] = "SYS:/APACHE2"

    A["Port"] = "80"

    A["ServerRoot"] = "SYS:/"BDIR

    A["Port"] = PORT

    A["SSLPort"] = SSLPORT

    A["cgidir"] = "cgi-bin"

    A["logfiledir"] = "logs"

    A["htdocsdir"] = "htdocs"
@@ -33,6 +34,9 @@ BEGIN { 
    B["errordir"] = A["ServerRoot"]"/"A["errordir"]

    B["proxycachedir"] = A["ServerRoot"]"/"A["proxycachedir"]

    B["cgidir"] = A["ServerRoot"]"/"A["cgidir"]

    B["logfiledir"] = A["logfiledir"]

    B["sysconfdir"] = A["sysconfdir"]

    B["runtimedir"] = A["runtimedir"]

    B["listen_stmt_1"] = "Listen "A["Port"]

    B["listen_stmt_2"] = ""

}
@@ -63,10 +67,25 @@ BEGIN { 
    print "#LoadModule usertrack_module modules/usertrk.nlm"

    print "#LoadModule version_module modules/modversion.nlm"

    print "#LoadModule vhost_alias_module modules/vhost.nlm"

    if (MODSSL) {

       print "#LoadModule ssl_module modules/mod_ssl.nlm"

    }

    print ""

    next

}



match ($0,/^#SSLSessionCache +"dbm:/) {

    sub(/^#/, "")

}



match ($0,/^SSLSessionCache +"shmcb:/) {

    sub(/^SSLSessionCache/, "#SSLSessionCache")

}



match ($0,/^SSLMutex +file:@exp_runtimedir@\/ssl_mutex/) {

    sub(/file:@exp_runtimedir@\/ssl_mutex/, "default")

}



match ($0,/@@.*@@/) {

    s=substr($0,RSTART+2,RLENGTH-4)

    sub(/@@.*@@/,A[s],$0)
@@ -93,7 +112,8 @@ match ($0,/@nonssl_.*@/) { 




END {

    print

    if ((ARGV[1] ~ /httpd-std.conf.in/) && !BSDSKT) { 

       print ""

       print "#"

       print "# SecureListen: Allows you to securely bind Apache to specific IP addresses "

       print "# and/or ports."
@@ -101,5 +121,7 @@ END { 
       print "# Change this to SecureListen on specific IP addresses as shown below to "

       print "# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)"

       print "#"

    print "#SecureListen 443 \"SSL CertificateDNS\""

       print "#SecureListen "SSLPORT" \"SSL CertificateDNS\""

       print ""

    }

}

build/nw_ver.awk

+13 −5
Changes for build/nw_ver.awk: 13 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -14,11 +14,15 @@ 
# limitations under the License.



BEGIN {



  # fetch Apache version numbers from input file and writes them to STDOUT

  # fetch Apache version numbers from input file and write them to STDOUT



  while ((getline < ARGV[1]) > 0) {

    if (match ($0, /^#define AP_SERVER_MAJORVERSION_NUMBER /)) {

    if (match ($0, /^#define AP_SERVER_COPYRIGHT \\/)) {

      if (((getline < ARGV[1]) > 0) && (split($0, c, "\"") == 3)) {

        copyright_str = c[2];

      }

    }

    else if (match ($0, /^#define AP_SERVER_MAJORVERSION_NUMBER /)) {

      ver_major = $3;

    }

    else if (match ($0, /^#define AP_SERVER_MINORVERSION_NUMBER /)) {
@@ -31,10 +35,14 @@ BEGIN { 
        ver_str_release = substr($3, 2, length($3) - 2);

    }

  }

  ver = ver_major "," ver_minor "," ver_patch;

  ver_nlm = ver_major "," ver_minor "," ver_patch;

  ver_str = ver_major "." ver_minor "." ver_patch ver_str_release;



  print "VERSION = " ver "";

  print "VERSION = " ver_nlm "";

  print "VERSION_STR = " ver_str "";

  print "VERSION_MAJMIN = " ver_major ver_minor "";

  print "COPYRIGHT_STR = " copyright_str "";



}