fuankg | 1 Apr 01:53 2011
Picon

svn commit: r1087510 [2/3] - in /httpd/httpd/branches/2.2.x: ./ build/ modules/ modules/aaa/ modules/cache/ modules/database/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/debug/ modules/echo/ modules/experimental/ modules/filters/ module...

Modified: httpd/httpd/branches/2.2.x/modules/database/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/database/NWGNUmakefile?rev=1087510&r1=1087509&r2=1087510&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/database/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/database/NWGNUmakefile Thu Mar 31 23:53:41 2011
 <at>  <at>  -10,7 +10,7  <at>  <at>  SUBDIRS = \
 # paths to tools
 #
 
-include $(AP_WORK)\build\NWGNUhead.inc
+include $(AP_WORK)/build/NWGNUhead.inc
 
 #
 # build this level's files
 <at>  <at>  -115,7 +115,7  <at>  <at>  NLM_THREAD_NAME	= DBD Module
 
 #
 # If this is specified, it will override VERSION value in 
-# $(AP_WORK)\build\NWGNUenvironment.inc
+# $(AP_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION	=
 
 <at>  <at>  -128,12 +128,12  <at>  <at>  NLM_STACK_SIZE	= 8192
 #
 # If this is specified it will be used by the link '-entry' directive
 #
-NLM_ENTRY_SYM	= _LibCPrelude
+NLM_ENTRY_SYM	=
 
(Continue reading)

fuankg | 1 Apr 01:53 2011
Picon

svn commit: r1087510 [3/3] - in /httpd/httpd/branches/2.2.x: ./ build/ modules/ modules/aaa/ modules/cache/ modules/database/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/debug/ modules/echo/ modules/experimental/ modules/filters/ module...

Modified: httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmodversion
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmodversion?rev=1087510&r1=1087509&r2=1087510&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmodversion (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmodversion Thu Mar 31 23:53:41 2011
 <at>  <at>  -8,7 +8,7  <at>  <at> 
 #

 ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
+include $(AP_WORK)/build/NWGNUhead.inc
 endif

 #
 <at>  <at>  -107,7 +107,7  <at>  <at>  NLM_THREAD_NAME	= Version Module

 #
 # If this is specified, it will override VERSION value in 
-# $(AP_WORK)\build\NWGNUenvironment.inc
+# $(AP_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION	=

 <at>  <at>  -120,12 +120,12  <at>  <at>  NLM_STACK_SIZE	= 8192
 #
 # If this is specified it will be used by the link '-entry' directive
 #
-NLM_ENTRY_SYM	= _LibCPrelude
+NLM_ENTRY_SYM	=

(Continue reading)

fuankg | 1 Apr 01:53 2011
Picon

svn commit: r1087510 [1/3] - in /httpd/httpd/branches/2.2.x: ./ build/ modules/ modules/aaa/ modules/cache/ modules/database/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/debug/ modules/echo/ modules/experimental/ modules/filters/ module...

Author: fuankg
Date: Thu Mar 31 23:53:41 2011
New Revision: 1087510

URL: http://svn.apache.org/viewvc?rev=1087510&view=rev
Log:
NetWare build overhaul in order to compile on Linux.

Backport of (hopefully) all recent HEAD changes to the
NetWare build system related to building on Linux.

Modified:
    httpd/httpd/branches/2.2.x/NWGNUmakefile
    httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
    httpd/httpd/branches/2.2.x/build/NWGNUhead.inc
    httpd/httpd/branches/2.2.x/build/NWGNUmakefile
    httpd/httpd/branches/2.2.x/build/NWGNUscripts.inc
    httpd/httpd/branches/2.2.x/build/NWGNUtail.inc
    httpd/httpd/branches/2.2.x/build/make_nw_export.awk
    httpd/httpd/branches/2.2.x/modules/NWGNUmakefile
    httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthbasc
    httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthdigt
    httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnalias
    httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnano
    httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndbd
    httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndbm
    httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndef
    httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnfil
    httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnzldap
    httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzdbm
(Continue reading)

fuankg | 1 Apr 01:56 2011
Picon

svn commit: r1087513 - /httpd/httpd/branches/2.2.x/modules/dav/main/dav.imp

Author: fuankg
Date: Thu Mar 31 23:56:39 2011
New Revision: 1087513

URL: http://svn.apache.org/viewvc?rev=1087513&view=rev
Log:
Removed exports file which is now generated.

Removed:
    httpd/httpd/branches/2.2.x/modules/dav/main/dav.imp

fuankg | 1 Apr 03:15 2011
Picon

svn commit: r1087537 - /httpd/httpd/branches/2.2.x/NWGNUmakefile

Author: fuankg
Date: Fri Apr  1 01:15:26 2011
New Revision: 1087537

URL: http://svn.apache.org/viewvc?rev=1087537&view=rev
Log:
Fixed install target; prepared for external PCRE.

Modified:
    httpd/httpd/branches/2.2.x/NWGNUmakefile

Modified: httpd/httpd/branches/2.2.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/NWGNUmakefile?rev=1087537&r1=1087536&r2=1087537&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/NWGNUmakefile Fri Apr  1 01:15:26 2011
 <at>  <at>  -213,6 +213,7  <at>  <at>  TARGET_nlm = \
 # If there is an LIB target, put it here
 #
 TARGET_lib = \
+	$(PCRELIB) \
 	$(EOLIST)

 #
 <at>  <at>  -251,7 +252,6  <at>  <at>  FILES_nlm_objs = \
 	$(OBJDIR)/modules.o \
 	$(OBJDIR)/mpm_common.o \
 	$(OBJDIR)/mpm_netware.o \
-	$(OBJDIR)/pcre.o \
 	$(OBJDIR)/protocol.o \
(Continue reading)

fuankg | 1 Apr 04:15 2011
Picon

svn commit: r1087555 - in /httpd/httpd/branches/2.2.x: NWGNUmakefile build/NWGNUenvironment.inc modules/dav/fs/NWGNUmakefile modules/dav/lock/NWGNUmakefile modules/dav/main/NWGNUmakefile modules/ssl/NWGNUmakefile support/NWGNUmakefile

Author: fuankg
Date: Fri Apr  1 02:15:34 2011
New Revision: 1087555

URL: http://svn.apache.org/viewvc?rev=1087555&view=rev
Log:
NetWare build overhaul in order to compile on Linux.

the remaining bits ...

Modified:
    httpd/httpd/branches/2.2.x/NWGNUmakefile
    httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
    httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile
    httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile
    httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile
    httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile
    httpd/httpd/branches/2.2.x/support/NWGNUmakefile

Modified: httpd/httpd/branches/2.2.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/NWGNUmakefile?rev=1087555&r1=1087554&r2=1087555&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/NWGNUmakefile Fri Apr  1 02:15:34 2011
 <at>  <at>  -412,8 +412,6  <at>  <at>  installdev :: FORCE
 	$(call COPY,$(NWOS)/*.h,                                       $(INSTALLBASE)/include/)
 	$(call COPY,$(APR)/include/*.h,                                $(INSTALLBASE)/include/)
 	$(call COPY,$(APRUTIL)/include/*.h,                            $(INSTALLBASE)/include/)
-	$(call COPY,$(STDMOD)/core/mod_so.h,                           $(INSTALLBASE)/include/)
-	$(call COPY,$(STDMOD)/core/mod_watchdog.h,                     $(INSTALLBASE)/include/)
(Continue reading)

fuankg | 1 Apr 04:33 2011
Picon

svn commit: r1087561 - /httpd/httpd/trunk/NWGNUmakefile

Author: fuankg
Date: Fri Apr  1 02:33:27 2011
New Revision: 1087561

URL: http://svn.apache.org/viewvc?rev=1087561&view=rev
Log:
Fixed lib target for old PCRE.

With older PCRE chartables.c is included from pcre.c.

Modified:
    httpd/httpd/trunk/NWGNUmakefile

Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?rev=1087561&r1=1087560&r2=1087561&view=diff
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Fri Apr  1 02:33:27 2011
 <at>  <at>  -218,7 +218,7  <at>  <at>  TARGET_nlm = \
 # If there is an LIB target, put it here
 #
 TARGET_lib = \
-	$(OBJDIR)/pcre.lib \
+	$(PCRELIB) \
 	$(EOLIST)

 #
 <at>  <at>  -369,14 +369,11  <at>  <at>  FILES_lib_objs = \
 	$(OBJDIR)/pcre_tables.o \
 	$(OBJDIR)/pcre_try_flipped.o \
(Continue reading)

fuankg | 1 Apr 05:07 2011
Picon

svn commit: r1087563 - in /httpd/httpd: branches/2.2.x/build/NWGNUenvironment.inc branches/2.2.x/modules/ssl/NWGNUmakefile trunk/build/NWGNUenvironment.inc

Author: fuankg
Date: Fri Apr  1 03:07:06 2011
New Revision: 1087563

URL: http://svn.apache.org/viewvc?rev=1087563&view=rev
Log:
Added TOUCH macro to kill Win32 dependency on external touch command.

Modified:
    httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
    httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile
    httpd/httpd/trunk/build/NWGNUenvironment.inc

Modified: httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc?rev=1087563&r1=1087562&r2=1087563&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc Fri Apr  1 03:07:06 2011
 <at>  <at>  -132,7 +132,6  <at>  <at>  WIN_CC	= mwcc

 # Setup build tools
 AWK	= awk
-TOUCH	= touch

 # Setup distribution tools
 ZIP	= zip -qr9
 <at>  <at>  -149,6 +148,7  <at>  <at>  MKDIR	= mkdir -p $1
 COPY	= -cp -afv $1 $2
 #COPYR	= -cp -afr $1/* $2
 COPYR	= -rsync -aC $1/* $2
(Continue reading)

fuankg | 1 Apr 05:20 2011
Picon

svn commit: r1087566 - /httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile

Author: fuankg
Date: Fri Apr  1 03:20:19 2011
New Revision: 1087566

URL: http://svn.apache.org/viewvc?rev=1087566&view=rev
Log:
Explain TOUCH macro and refer to docs.

Modified:
    httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile

Modified: httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile?rev=1087566&r1=1087565&r2=1087566&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile Fri Apr  1 03:20:19 2011
 <at>  <at>  -279,6 +279,9  <at>  <at>  install :: nlms FORCE
 vpath %.c $(AP_WORK)/modules/arch/netware

 # Make sure that the build doesn't attempt to regenerate the shipping files.
+# On Windows we use 'copy /b file.ext +,,' to assign the current time and date
+# to a file without modifying the file (the TOUCH macro uses this) - see also:
+# http://technet.microsoft.com/en-us/library/bb490886.aspx
 ssl_expr_parse.h : ssl_expr_parse.y
 	$(call TOUCH, $ <at> )

fuankg | 1 Apr 05:38 2011
Picon

svn commit: r1087572 - in /httpd/httpd: branches/2.2.x/build/NWGNUenvironment.inc trunk/build/NWGNUenvironment.inc

Author: fuankg
Date: Fri Apr  1 03:38:42 2011
New Revision: 1087572

URL: http://svn.apache.org/viewvc?rev=1087572&view=rev
Log:
Make our Windows touch silent.

Modified:
    httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
    httpd/httpd/trunk/build/NWGNUenvironment.inc

Modified: httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc?rev=1087572&r1=1087571&r2=1087572&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc Fri Apr  1 03:38:42 2011
 <at>  <at>  -164,7 +164,7  <at>  <at>  ECHONL	= $(ComSpec) /c echo.
 MKDIR	= $(shell if not exist $(subst /,\,$1)\NUL md 2>NUL $(subst /,\,$1))
 COPY	= -copy /y 2>NUL $(subst /,\,$1) $(subst /,\,$2)
 COPYR	= -xcopy /q /y /e 2>NUL $(subst /,\,$1) $(subst /,\,$2)
-TOUCH	= -copy /b 2>NUL $1 +,,
+TOUCH	= -copy /b 2>&1>NUL $(subst /,\,$1) +,,
 CAT	= type
 endif

Modified: httpd/httpd/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUenvironment.inc?rev=1087572&r1=1087571&r2=1087572&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUenvironment.inc (original)
(Continue reading)


Gmane