apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r596840 - /apr/apr-util/branches/1.2.x/Makefile.win
Date Tue, 20 Nov 2007 22:00:11 GMT
Author: wrowe
Date: Tue Nov 20 14:00:10 2007
New Revision: 596840

URL: http://svn.apache.org/viewvc?rev=596840&view=rev
Log:
This strategy did not work for .dsp's as expected, and the
path resolution did not work out using some versions of nmake.
Note issues and back out the path-fixup until a better solution
can be determined.

Also provide 1.2-looking examples.

Backport: 596839

Modified:
    apr/apr-util/branches/1.2.x/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=596840&r1=596839&r2=596840&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/Makefile.win (original)
+++ apr/apr-util/branches/1.2.x/Makefile.win Tue Nov 20 14:00:10 2007
@@ -23,12 +23,14 @@
 #     ARCH="x64 Release"
 #     ARCH="x64 Debug"
 #
-# Provide the APR_PATH, API_PATH and APU_PATH all as absolute paths, 
-# or all as paths RELATIVE TO ONE ANOTHER!
-#
-#     APR_PATH=..\apr-1.3.0
-#     API_PATH=..\apr-iconv-1.3.0
-#     APU_PATH=..\apr-util-1.3.0
+# Provide the APR_PATH, API_PATH and APU_PATH entirely relative 
+# to one another!  At this time, building the libraries themselves
+# is only expected to work if the defaults (../apr, ../apr-iconv 
+# and ../apr-util) are used, or if they are built with USEMAK=1.
+#
+#     APR_PATH=..\apr-1.2.12
+#     API_PATH=..\apr-iconv-1.2.1
+#     APU_PATH=..\apr-util-1.2.12
 #
 # For example;
 #
@@ -229,16 +231,14 @@
 	cd $(APU_PATH)
 
 checkapu:
-        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
+	cd test
 	 $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=static \
 		OUTDIR=$(LIBSPATH) APROUTDIR=$(LIBSOSPATH) \
-		APR_PATH=%FOUND_APR% API_PATH=%FOUND_APR% check
+		APR_PATH=..\$(APR_PATH) API_PATH=..\$(API_PATH) check
 	 $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=dynamic \
-		OUTDIR=$(LIBSPATH) APROUTDIR=$(ARCHOSPATH) \
-		APR_PATH=%FOUND_APR% API_PATH=%FOUND_APR% check
+		OUTDIR=$(ARCHPATH) APROUTDIR=$(ARCHOSPATH) \
+		APR_PATH=..\$(APR_PATH) API_PATH=..\$(API_PATH) check
 	cd ..
 
 checkall: checkapr checkapu



Mime
View raw message