JBoss Native SVN: r3114 - in trunk/httpd/httpd-2.2: modules/advertise and 18 other directories.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2013-06-13 09:54:00 -0400 (Thu, 13 Jun 2013)
New Revision: 3114
Modified:
trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/advertise/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/cache/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/database/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/dav/main/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/generators/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/http/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/ldap/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/loggers/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/mappers/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/metadata/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/ssl/NMAKEmakefile
trunk/httpd/httpd-2.2/support/NMAKEmakefile
Log:
Fix httpd nmakefile dependencies
Modified: trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,25 +31,28 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEauthbasic \
- $(SRCDIR)\NMAKEauthdigest \
- $(SRCDIR)\NMAKEauthnanon \
- $(SRCDIR)\NMAKEauthndbd \
- $(SRCDIR)\NMAKEauthndbm \
- $(SRCDIR)\NMAKEauthndefault \
- $(SRCDIR)\NMAKEauthnfile \
- $(SRCDIR)\NMAKEauthnzldap \
- $(SRCDIR)\NMAKEauthzdbm \
- $(SRCDIR)\NMAKEauthzdefault \
- $(SRCDIR)\NMAKEauthzgroupfile \
- $(SRCDIR)\NMAKEauthzhost \
- $(SRCDIR)\NMAKEauthzuser
+ $(SRCDIR)\NMAKEauthbasic\~ \
+ $(SRCDIR)\NMAKEauthdigest\~ \
+ $(SRCDIR)\NMAKEauthnanon\~ \
+ $(SRCDIR)\NMAKEauthndbd\~ \
+ $(SRCDIR)\NMAKEauthndbm\~ \
+ $(SRCDIR)\NMAKEauthndefault\~ \
+ $(SRCDIR)\NMAKEauthnfile\~ \
+ $(SRCDIR)\NMAKEauthnzldap\~ \
+ $(SRCDIR)\NMAKEauthzdbm\~ \
+ $(SRCDIR)\NMAKEauthzdefault\~ \
+ $(SRCDIR)\NMAKEauthzgroupfile\~ \
+ $(SRCDIR)\NMAKEauthzhost\~ \
+ $(SRCDIR)\NMAKEauthzuser\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building aaa modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) PREFIX=$(PREFIX) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
- @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/advertise/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/advertise/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/advertise/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,13 +31,16 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEadvertise
+ $(SRCDIR)\NMAKEadvertise\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building aaa modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) PREFIX=$(PREFIX) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
- @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,13 +31,16 @@
!include <..\..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEisapi
+ $(SRCDIR)\NMAKEisapi\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building win32 modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
- @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/cache/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/cache/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/cache/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,13 +31,16 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEcache \
- $(SRCDIR)\NMAKEdiskcache \
- $(SRCDIR)\NMAKEfilecache \
- $(SRCDIR)\NMAKEmemcache
+ $(SRCDIR)\NMAKEcache\~ \
+ $(SRCDIR)\NMAKEdiskcache\~ \
+ $(SRCDIR)\NMAKEfilecache\~ \
+ $(SRCDIR)\NMAKEmemcache\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building cache modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
Modified: trunk/httpd/httpd-2.2/modules/database/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/database/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/database/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,13 +31,16 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEdbd
+ $(SRCDIR)\NMAKEdbd\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building database modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
install: $(WORKDIR) $(MODULES)
- @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,12 +31,16 @@
!include <..\..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEdavfs
+ $(SRCDIR)\NMAKEdavfs\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building dav fs modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/dav/main/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/dav/main/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/dav/main/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,13 +31,16 @@
!include <..\..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEdav
+ $(SRCDIR)\NMAKEdav\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building dav modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
- @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,17 +31,20 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEdeflate \
- $(SRCDIR)\NMAKEcharsetlite \
- $(SRCDIR)\NMAKEfilter \
- $(SRCDIR)\NMAKEextfilter \
- $(SRCDIR)\NMAKEinclude
+ $(SRCDIR)\NMAKEdeflate\~ \
+ $(SRCDIR)\NMAKEcharsetlite\~ \
+ $(SRCDIR)\NMAKEfilter\~ \
+ $(SRCDIR)\NMAKEextfilter\~ \
+ $(SRCDIR)\NMAKEinclude\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building filter modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
- @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/generators/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/generators/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/generators/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,17 +31,20 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEasis \
- $(SRCDIR)\NMAKEautoindex \
- $(SRCDIR)\NMAKEcgi \
- $(SRCDIR)\NMAKEinfo \
- $(SRCDIR)\NMAKEstatus
+ $(SRCDIR)\NMAKEasis\~ \
+ $(SRCDIR)\NMAKEautoindex\~ \
+ $(SRCDIR)\NMAKEcgi\~ \
+ $(SRCDIR)\NMAKEinfo\~ \
+ $(SRCDIR)\NMAKEstatus\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building generator modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) PREFIX=$(PREFIX) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
- @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/http/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/http/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/http/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,13 +31,16 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEmime
+ $(SRCDIR)\NMAKEmime\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building http modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
- @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,13 +31,16 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEmodjk
+ $(SRCDIR)\NMAKEmodjk\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building mod_jk module ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
- @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/ldap/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/ldap/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/ldap/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,13 +31,16 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEldap
+ $(SRCDIR)\NMAKEldap\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building ldap modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
- @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/loggers/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/loggers/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/loggers/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,15 +31,19 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKElogconfig \
- $(SRCDIR)\NMAKElogforensic \
- $(SRCDIR)\NMAKElogio
+ $(SRCDIR)\NMAKElogconfig\~ \
+ $(SRCDIR)\NMAKElogforensic\~ \
+ $(SRCDIR)\NMAKElogio\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building logger modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
- @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
+install: all
+ @xcopy "$(SRCDIR)\*.h" "$(BUILDINC)" /I /Y /Q
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/mappers/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/mappers/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/mappers/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,21 +31,24 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEactions \
- $(SRCDIR)\NMAKEalias \
- $(SRCDIR)\NMAKEdir \
- $(SRCDIR)\NMAKEimagemap \
- $(SRCDIR)\NMAKEnegotiation \
- $(SRCDIR)\NMAKErewrite \
- $(SRCDIR)\NMAKEspeling \
- $(SRCDIR)\NMAKEuserdir \
- $(SRCDIR)\NMAKEvhostalias
+ $(SRCDIR)\NMAKEactions\~ \
+ $(SRCDIR)\NMAKEalias\~ \
+ $(SRCDIR)\NMAKEdir\~ \
+ $(SRCDIR)\NMAKEimagemap\~ \
+ $(SRCDIR)\NMAKEnegotiation\~ \
+ $(SRCDIR)\NMAKErewrite\~ \
+ $(SRCDIR)\NMAKEspeling\~ \
+ $(SRCDIR)\NMAKEuserdir\~ \
+ $(SRCDIR)\NMAKEvhostalias\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building mapper modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
- @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/metadata/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/metadata/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/metadata/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,22 +31,25 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEcernmeta \
- $(SRCDIR)\NMAKEenv \
- $(SRCDIR)\NMAKEexpires \
- $(SRCDIR)\NMAKEheaders \
- $(SRCDIR)\NMAKEident \
- $(SRCDIR)\NMAKEmimemagic \
- $(SRCDIR)\NMAKEsetenvif \
- $(SRCDIR)\NMAKEuniqueid \
- $(SRCDIR)\NMAKEusertrack \
- $(SRCDIR)\NMAKEversion
+ $(SRCDIR)\NMAKEcernmeta\~ \
+ $(SRCDIR)\NMAKEenv\~ \
+ $(SRCDIR)\NMAKEexpires\~ \
+ $(SRCDIR)\NMAKEheaders\~ \
+ $(SRCDIR)\NMAKEident\~ \
+ $(SRCDIR)\NMAKEmimemagic\~ \
+ $(SRCDIR)\NMAKEsetenvif\~ \
+ $(SRCDIR)\NMAKEuniqueid\~ \
+ $(SRCDIR)\NMAKEusertrack\~ \
+ $(SRCDIR)\NMAKEversion\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building metadata modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
+install: all
@xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,13 +31,16 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEmanager
+ $(SRCDIR)\NMAKEmanager\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building manager module ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
+install: all
@xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,13 +31,16 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEslotmem
+ $(SRCDIR)\NMAKEslotmem\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building slotmem module ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
+install: all
@xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -39,11 +39,23 @@
$(SRCDIR)\NMAKEproxybalancer \
$(SRCDIR)\NMAKEproxycluster
+MODULES = \
+ $(SRCDIR)\NMAKEproxy\~ \
+ $(SRCDIR)\NMAKEproxyajp\~ \
+ $(SRCDIR)\NMAKEproxyhttp\~ \
+ $(SRCDIR)\NMAKEproxyftp\~ \
+ $(SRCDIR)\NMAKEproxyconnect\~ \
+ $(SRCDIR)\NMAKEproxybalancer\~ \
+ $(SRCDIR)\NMAKEproxycluster\~
+
+all: $(WORKDIR) $(MODULES)
+ @echo Building proxy modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
-install: $(WORKDIR) $(MODULES)
- @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/ssl/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/ssl/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/modules/ssl/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,17 +31,20 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEssl
+ $(SRCDIR)\NMAKEssl\~
+all: $(WORKDIR) $(MODULES)
+ @echo Building ssl modules ...
+
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $(@D) install
$(WORKDIR):
@$(MAKEWORKDIR)
!IF DEFINED(WITH_OPENSSL) && "$(WITH_OPENSSL)" != "no"
install: $(WORKDIR) $(MODULES)
- @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL
!ELSE
install:
@echo *** OpenSSL libraries are not defined or are disabled.
Modified: trunk/httpd/httpd-2.2/support/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/support/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113)
+++ trunk/httpd/httpd-2.2/support/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114)
@@ -31,20 +31,22 @@
!include <..\NMAKEhttpd.inc>
UTILS = \
- $(SRCDIR)\NMAKEhtdbm \
- $(SRCDIR)\NMAKEhtcacheclean \
- $(SRCDIR)\NMAKEhtdigest \
- $(SRCDIR)\NMAKEhtpasswd \
- $(SRCDIR)\NMAKElogresolve \
- $(SRCDIR)\NMAKErotatelogs \
- $(SRCDIR)\NMAKEab
+ $(SRCDIR)\NMAKEhtdbm\~ \
+ $(SRCDIR)\NMAKEhtcacheclean\~ \
+ $(SRCDIR)\NMAKEhtdigest\~ \
+ $(SRCDIR)\NMAKEhtpasswd\~ \
+ $(SRCDIR)\NMAKElogresolve\~ \
+ $(SRCDIR)\NMAKErotatelogs\~ \
+ $(SRCDIR)\NMAKEab\~
+all: $(WORKDIR) $(UTILS)
+ @echo Building support utilities
-$(UTILS):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
-
$(WORKDIR):
@$(MAKEWORKDIR)
-all: $(WORKDIR) $(UTILS)
- @xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /Y /Q 2>NUL
+$(UTILS):
+ @$(MAKE) -nologo -f $(@D) PREFIX=$(PREFIX) install
+
+install: all
+ @xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /I /Y /Q 2>NUL
11 years, 6 months
JBoss Native SVN: r3113 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-13 09:53:36 -0400 (Thu, 13 Jun 2013)
New Revision: 3113
Modified:
trunk/build/unix/util/applypatch.sh
Log:
lsb_release is no always installed :-(
Modified: trunk/build/unix/util/applypatch.sh
===================================================================
--- trunk/build/unix/util/applypatch.sh 2013-06-13 13:45:44 UTC (rev 3112)
+++ trunk/build/unix/util/applypatch.sh 2013-06-13 13:53:36 UTC (rev 3113)
@@ -46,8 +46,18 @@
filename=$basefilename.rhel.patch
else
if [ $BUILD_SYS = "linux2" ]; then
- dist=`lsb_release -i -s`
- ver=`lsb_release -r -s`
+ dist=""
+ ver=""
+ if [ -f /etc/redhat-release ]; then
+ dist=RedHatEnterpriseES
+ grep "release 4" /etc/redhat-release
+ if [ $? -eq 0 ]; then
+ ver=4
+ fi
+ fi
+ # lsb_release is not always installed :-(
+ #dist=`lsb_release -i -s`
+ #ver=`lsb_release -r -s`
if [ -f $xbap_build_top/../patch/$basefilename.$dist.$ver.patch ]; then
filename=$basefilename.$dist.$ver.patch
fi
11 years, 6 months
JBoss Native SVN: r3112 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-13 09:45:44 -0400 (Thu, 13 Jun 2013)
New Revision: 3112
Modified:
trunk/build/unix/buildbin.mod_cluster.windows.sh
Log:
silence nmake :D
Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.windows.sh 2013-06-13 13:32:15 UTC (rev 3111)
+++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2013-06-13 13:45:44 UTC (rev 3112)
@@ -70,9 +70,9 @@
echo "Running nmake at `pwd`"
echo "nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} all and install"
echo "nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} all" > make.bat
- nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} all || exit 1
+ nmake -s -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} all || exit 1
echo "nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} install" >> make.bat
- nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} install || exit 1
+ nmake -s -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} install || exit 1
) || exit 1
# Also build the java part.
11 years, 6 months
JBoss Native SVN: r3111 - trunk/httpd/httpd-2.2/srclib/apr-util.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2013-06-13 09:32:15 -0400 (Thu, 13 Jun 2013)
New Revision: 3111
Modified:
trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile
Log:
Fix dependency rule
Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2013-06-13 13:26:08 UTC (rev 3110)
+++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2013-06-13 13:32:15 UTC (rev 3111)
@@ -36,8 +36,8 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEapu \
- $(SRCDIR)\NMAKEapuldap
+ $(SRCDIR)\NMAKEapu\~ \
+ $(SRCDIR)\NMAKEapuldap\~
$(MODULES):
@$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
11 years, 6 months
JBoss Native SVN: r3110 - trunk/httpd/httpd-2.2/srclib/apr-util.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2013-06-13 09:26:08 -0400 (Thu, 13 Jun 2013)
New Revision: 3110
Modified:
trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile
Log:
Try with tab
Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2013-06-13 13:07:01 UTC (rev 3109)
+++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2013-06-13 13:26:08 UTC (rev 3110)
@@ -40,7 +40,7 @@
$(SRCDIR)\NMAKEapuldap
$(MODULES):
- @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+ @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
$(WORKDIR):
@$(MAKEWORKDIR)
11 years, 6 months
JBoss Native SVN: r3109 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-13 09:07:01 -0400 (Thu, 13 Jun 2013)
New Revision: 3109
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
trace the right file name...
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2013-06-13 13:03:26 UTC (rev 3108)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2013-06-13 13:07:01 UTC (rev 3109)
@@ -361,7 +361,7 @@
do
nfile=`echo $file | sed 's:\.sl:\.so:'`
cp -p $file ../../target/$nfile
- echo "Copying $file to ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules"
+ echo "Copying $file to ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules/$nfile"
cp -p $file ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules/$nfile
done
else
11 years, 6 months
JBoss Native SVN: r3108 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-13 09:03:26 -0400 (Thu, 13 Jun 2013)
New Revision: 3108
Modified:
trunk/build/unix/buildbin.mod_cluster.windows.sh
Log:
Guessing that a make all is needed before the make install...
Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.windows.sh 2013-06-13 11:51:19 UTC (rev 3107)
+++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2013-06-13 13:03:26 UTC (rev 3108)
@@ -68,8 +68,10 @@
(cd $native_sources
echo "Running nmake at `pwd`"
- echo "nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} install"
- echo "nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} install" > make.bat
+ echo "nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} all and install"
+ echo "nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} all" > make.bat
+ nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} all || exit 1
+ echo "nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} install" >> make.bat
nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} install || exit 1
) || exit 1
11 years, 6 months
JBoss Native SVN: r3107 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-13 07:51:19 -0400 (Thu, 13 Jun 2013)
New Revision: 3107
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
need .so not .sl
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2013-06-13 11:40:53 UTC (rev 3106)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2013-06-13 11:51:19 UTC (rev 3107)
@@ -362,7 +362,7 @@
nfile=`echo $file | sed 's:\.sl:\.so:'`
cp -p $file ../../target/$nfile
echo "Copying $file to ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules"
- cp -p $file ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules
+ cp -p $file ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules/$nfile
done
else
cp *.so ../../target
11 years, 6 months
JBoss Native SVN: r3106 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-13 07:40:53 -0400 (Thu, 13 Jun 2013)
New Revision: 3106
Modified:
trunk/build/unix/build.sh
Log:
typo.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-06-13 10:28:41 UTC (rev 3105)
+++ trunk/build/unix/build.sh 2013-06-13 11:40:53 UTC (rev 3106)
@@ -1177,9 +1177,9 @@
fi
fi
fi
- echo "function applypatch patch file could be $build_top/../patch/$ilename"
+ echo "function applypatch patch file could be $build_top/../patch/$filename"
- if [ -f $build_top/../patch/$ilename ]; then
+ if [ -f $build_top/../patch/$filename ]; then
(cd $DIR
echo "Applying patch $build_top/../patch/$filename in $DIR"
$patch -tf -p0 -i $build_top/../patch/$filename
11 years, 6 months
JBoss Native SVN: r3105 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-13 06:28:41 -0400 (Thu, 13 Jun 2013)
New Revision: 3105
Modified:
trunk/build/unix/build.sh
Log:
Log the internal apply (broken).
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-06-13 09:59:33 UTC (rev 3104)
+++ trunk/build/unix/build.sh 2013-06-13 10:28:41 UTC (rev 3105)
@@ -1165,6 +1165,7 @@
isrhel=$2
basefilename=`basename $DIR`
filename=$basefilename.patch
+ echo "function applypatch for ${DIR}"
if $isrhel; then
filename=$basefilename.rhel.patch
else
@@ -1176,12 +1177,15 @@
fi
fi
fi
+ echo "function applypatch patch file could be $build_top/../patch/$ilename"
if [ -f $build_top/../patch/$ilename ]; then
(cd $DIR
echo "Applying patch $build_top/../patch/$filename in $DIR"
$patch -tf -p0 -i $build_top/../patch/$filename
) || return 1
+ else
+ echo "function applypatch no patch for ${DIR}"
fi
}
@@ -1197,6 +1201,7 @@
src_dir=$1-$2
src_url=$3
src_url_back=$4
+ echo "Downloading and patching for ${src_dir}"
cd $build_cache_dir
if [ ! -d ${src_dir} ]; then
downloadtaredsrc $src_url $src_url_back
@@ -1212,6 +1217,7 @@
mkdir -p ${package_src_dir}/srclib/common
cp ${build_top}/../../srclib/common/* ${package_src_dir}/srclib/common
cd $build_top
+ echo "Downloading and patching for ${src_dir} done"
return 0
}
11 years, 6 months