From commits-return-9182-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Thu Nov 08 18:27:53 2007 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 19483 invoked from network); 8 Nov 2007 18:27:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Nov 2007 18:27:53 -0000 Received: (qmail 41201 invoked by uid 500); 8 Nov 2007 18:27:41 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 41157 invoked by uid 500); 8 Nov 2007 18:27:41 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 41145 invoked by uid 99); 8 Nov 2007 18:27:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2007 10:27:41 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2007 18:27:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 645BB1A9832; Thu, 8 Nov 2007 10:27:32 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r593241 - in /apr/apr-util/trunk: Makefile.win test/Makefile.win Date: Thu, 08 Nov 2007 18:27:32 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071108182732.645BB1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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