apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r593241 - in /apr/apr-util/trunk: Makefile.win test/Makefile.win
Date Thu, 08 Nov 2007 18:27:32 GMT
Author: wrowe
Date: Thu Nov  8 10:27:30 2007
New Revision: 593241

URL: http://svn.apache.org/viewvc?rev=593241&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.

Modified:
    apr/apr-util/trunk/Makefile.win
    apr/apr-util/trunk/test/Makefile.win

Modified: apr/apr-util/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/Makefile.win?rev=593241&r1=593240&r2=593241&view=diff
==============================================================================
--- apr/apr-util/trunk/Makefile.win (original)
+++ apr/apr-util/trunk/Makefile.win Thu Nov  8 10:27:30 2007
@@ -144,6 +144,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
 
@@ -183,8 +189,8 @@
 !ELSEIF $(USESLN) == 1
 
 clean:
-	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project aprutil
 	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libaprutil
+	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project aprutil
 	cd $(API_PATH)
 	 $(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
 		BUILD_MODE="$(ARCH)" BIND_MODE=shared API_SOURCE=.
@@ -206,8 +212,8 @@
 	cd $(APU_PATH)
 
 buildall:
-	@msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)"
 	@msdev aprutil.dsw /USEENV /MAKE "aprutil - $(ARCH)"
+	@msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)"
 
 !ENDIF
 
@@ -222,12 +228,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/trunk/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/Makefile.win?rev=593241&r1=593240&r2=593241&view=diff
==============================================================================
--- apr/apr-util/trunk/test/Makefile.win (original)
+++ apr/apr-util/trunk/test/Makefile.win Thu Nov  8 10:27:30 2007
@@ -13,6 +13,8 @@
 # OUTDIR
 #   the library path of the libraries, and also the path within test/
 #   where all of the tests for that library will be built
+# APROUTDIR
+#   The library path of apr (if different from OUTDIR)
 # APR_PATH
 #   relative or absolute path to locate apr libs and includes
 # API_PATH
@@ -82,14 +84,16 @@
 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 \
 	..\$(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 \
 	..\$(OUTDIR)\libaprutil-1.lib 
 STATIC_CFLAGS = 
 !ENDIF
@@ -162,7 +166,7 @@
 
 
 !IF "$(MODEL)" == "static"
-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
 !ENDIF
 



Mime
View raw message