Author: wrowe
Date: Thu Nov 8 10:28:13 2007
New Revision: 593242
URL: http://svn.apache.org/viewvc?rev=593242&view=rev
Log:
Inject APROUTDIR into the process so that the DebugNT|ReleaseNT
models pick up the appropriate apr-specific directories, and
begin to try building a non apr .. apr-util .. apr-iconv tree
structure with additional path hints to apr and apr-util.
Backport: r593241
Modified:
apr/apr-util/branches/1.2.x/Makefile.win
apr/apr-util/branches/1.2.x/test/Makefile.win
Modified: apr/apr-util/branches/1.2.x/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/Makefile.win?rev=593242&r1=593241&r2=593242&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/Makefile.win (original)
+++ apr/apr-util/branches/1.2.x/Makefile.win Thu Nov 8 10:28:13 2007
@@ -18,8 +18,8 @@
#
# ARCH="Win32 Release"
# ARCH="Win32 Debug"
-# ARCH="Win32 Release9x"
-# ARCH="Win32 Debug9x"
+# ARCH="Win32 ReleaseNT"
+# ARCH="Win32 DebugNT"
# ARCH="x64 Release"
# ARCH="x64 Debug"
#
@@ -83,18 +83,18 @@
LIBSPATH=LibD
ARCHOSPATH=Debug
LIBSOSPATH=LibD
-!ELSEIF "$(ARCH)" == "Win32 Release9x"
-SLNARCH=Release9x|Win32
+!ELSEIF "$(ARCH)" == "Win32 ReleaseNT"
+SLNARCH=ReleaseNT|Win32
ARCHPATH=Release
LIBSPATH=LibR
-ARCHOSPATH=9x\Release
-LIBSOSPATH=9x\LibR
-!ELSEIF "$(ARCH)" == "Win32 Debug9x"
-SLNARCH=Debug9x|Win32
+ARCHOSPATH=NT\Release
+LIBSOSPATH=NT\LibR
+!ELSEIF "$(ARCH)" == "Win32 DebugNT"
+SLNARCH=DebugNT|Win32
ARCHPATH=Debug
LIBSPATH=LibD
-ARCHOSPATH=9x\Debug
-LIBSOSPATH=9x\LibD
+ARCHOSPATH=NT\Debug
+LIBSOSPATH=NT\LibD
!ELSEIF "$(ARCH)" == "x64 Release"
SLNARCH=Release|x64
ARCHPATH=x64\Release
@@ -137,6 +137,12 @@
all: buildall checkall
+# To help win32 pick up the locations where they don't fall in the usual
+# path locations. This may not be completely effective for USESLN/USEDSP
+# oriented builds, just yet
+#
+LIB=$(APR_PATH)\$(ARCHOSPATH);$(APR_PATH)\$(LIBSOSPATH);$(API_PATH)\$(ARCHPATH);$(API_PATH)\$(LIBSPATH);$(APU_PATH)\$(ARCHPATH);$(APU_PATH)\$(LIBSPATH);$(LIB)
+INCLUDE=$(APR_PATH)\include;$(API_PATH)\include;$(INCLUDE)
!IF $(USEMAK) == 1
@@ -176,10 +182,10 @@
!ELSEIF $(USESLN) == 1
clean:
- -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project aprutil
- -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_app
-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libaprutil
-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libapr_app
+ -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project aprutil
+ -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_app
cd $(API_PATH)
$(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
BUILD_MODE="$(ARCH)" BIND_MODE=shared API_SOURCE=.
@@ -195,10 +201,10 @@
# $(USEDSP) == 1
clean:
- -msdev aprutil.dsw /USEENV /MAKE "aprutil - $(ARCH)" /CLEAN
- -msdev aprutil.dsw /USEENV /MAKE "apr_app - $(ARCH)" /CLEAN
-msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)" /CLEAN
-msdev aprutil.dsw /USEENV /MAKE "libapr_app - $(ARCH)" /CLEAN
+ -msdev aprutil.dsw /USEENV /MAKE "aprutil - $(ARCH)" /CLEAN
+ -msdev aprutil.dsw /USEENV /MAKE "apr_app - $(ARCH)" /CLEAN
cd $(API_PATH)
$(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
BUILD_MODE="$(ARCH)" BIND_MODE=shared API_SOURCE=.
@@ -223,12 +229,17 @@
cd $(APU_PATH)
checkapu:
- cd $(APU_PATH)\test
+ for /f %p in ('cd $(APR_PATH) && pwd') do set FOUND_APR=%p
+ for /f %p in ('cd $(API_PATH) && pwd') do set FOUND_API=%p
+ cd $(APU_PATH)
+ cd test
$(MAKE) $(MAKEOPT) -f Makefile.win MODEL=static \
- OUTDIR=$(LIBSPATH) check
+ OUTDIR=$(LIBSPATH) APROUTDIR=$(LIBSOSPATH) \
+ APR_PATH=%FOUND_APR% API_PATH=%FOUND_APR% check
$(MAKE) $(MAKEOPT) -f Makefile.win MODEL=dynamic \
- OUTDIR=$(ARCHPATH) check
- cd ..
+ OUTDIR=$(LIBSPATH) APROUTDIR=$(ARCHOSPATH) \
+ APR_PATH=%FOUND_APR% API_PATH=%FOUND_APR% check
+ cd ..
checkall: checkapr checkapu
Modified: apr/apr-util/branches/1.2.x/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/test/Makefile.win?rev=593242&r1=593241&r2=593242&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/test/Makefile.win (original)
+++ apr/apr-util/branches/1.2.x/test/Makefile.win Thu Nov 8 10:28:13 2007
@@ -22,6 +22,8 @@
MODEL=dynamic
!ENDIF
+APROUTDIR=OUTDIR
+
!IFNDEF OUTDIR
!IF "$(MODEL)" == "static"
OUTDIR=LibR
@@ -77,15 +79,17 @@
APR_PATH = ..\..\apr
API_PATH = ..\..\apr-iconv
+APROUTDIR=$(OUTDIR)
+
!IF "$(MODEL)" == "static"
PROGRAM_DEPENDENCIES = \
- $(APR_PATH)\$(OUTDIR)\apr-1.lib \
+ $(APR_PATH)\$(APROUTDIR)\apr-1.lib \
$(API_PATH)\$(OUTDIR)\apriconv-1.lib \
..\$(OUTDIR)\aprutil-1.lib
STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC
!ELSE
PROGRAM_DEPENDENCIES = \
- $(APR_PATH)\$(OUTDIR)\libapr-1.lib \
+ $(APR_PATH)\$(APROUTDIR)\libapr-1.lib \
$(API_PATH)\$(OUTDIR)\libapriconv-1.lib \
..\$(OUTDIR)\libaprutil-1.lib
STATIC_CFLAGS =
@@ -143,7 +147,7 @@
@if EXIST %d\. rmdir /s /q %d
-PATH=$(OUTDIR);..\$(OUTDIR);$(API_PATH)\$(OUTDIR);$(APR_PATH)\$(OUTDIR);$(PATH)
+PATH=$(OUTDIR);..\$(OUTDIR);$(API_PATH)\$(OUTDIR);$(APR_PATH)\$(APROUTDIR);$(PATH)
APR_ICONV1_PATH=$(API_PATH)\$(OUTDIR)\iconv
check: $(PROGRAMS) $(OTHER_PROGRAMS)
|