apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r587606 - in /apr/apr-util/branches/1.2.x: Makefile.win aprutil.dsw test/testall.dsw
Date Tue, 23 Oct 2007 18:53:43 GMT
Author: wrowe
Date: Tue Oct 23 11:53:42 2007
New Revision: 587606

URL: http://svn.apache.org/viewvc?rev=587606&view=rev
Log:
Kill a whole bunch of noise, as we do in httpd, by
trusting apr(*.obj) -> apr-iconv(*.obj) -> apr-util
and dropping the double dependency on those lib objects.

Of course this is totally bogus, and solved for apr 1.3
with those preaprutil stubs, but we do what we gotta to
preserve the schema till we can finally axe 1.2.x.


Modified:
    apr/apr-util/branches/1.2.x/Makefile.win
    apr/apr-util/branches/1.2.x/aprutil.dsw
    apr/apr-util/branches/1.2.x/test/testall.dsw

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=587606&r1=587605&r2=587606&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/Makefile.win (original)
+++ apr/apr-util/branches/1.2.x/Makefile.win Tue Oct 23 11:53:42 2007
@@ -149,8 +149,8 @@
 	 $(MAKE) $(MAKEOPT) -f apr.mak         CFG="apr - $(ARCH)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f libapr.mak      CFG="libapr - $(ARCH)" RECURSE=0 $(CTARGET)
 	 cd build
-	  $(MAKE) $(MAKEOPT) -f aprapp.mak     CFG="aprapp - $(ARCH)" RECURSE=0 $(CTARGET)
-	  $(MAKE) $(MAKEOPT) -f libaprapp.mak  CFG="libaprapp - $(ARCH)" RECURSE=0 $(CTARGET)
+	  $(MAKE) $(MAKEOPT) -f apr_app.mak     CFG="apr_app - $(ARCH)" RECURSE=0 $(CTARGET)
+	  $(MAKE) $(MAKEOPT) -f libapr_app.mak  CFG="libapr_app - $(ARCH)" RECURSE=0 $(CTARGET)
 	 cd ..
 	cd $(API_PATH)
 	 $(MAKE) $(MAKEOPT) -f apriconv.mak    CFG="apriconv - $(ARCH)" RECURSE=0 $(CTARGET)
@@ -177,30 +177,38 @@
 
 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
 	cd $(API_PATH)
 	 $(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
 		BUILD_MODE="$(ARCH)" BIND_MODE=shared API_SOURCE=.
 	cd $(APU_PATH)
 
 buildall:
+	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_app
 	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project aprutil
+	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project libapr_app
 	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project libaprutil
 
 !ELSE
 #	$(USEDSP) == 1
 
 clean:
-	-msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)" /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
 	cd $(API_PATH)
 	 $(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
 		BUILD_MODE="$(ARCH)" BIND_MODE=shared API_SOURCE=.
 	cd $(APU_PATH)
 
 buildall:
-	@msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)"
+	@msdev aprutil.dsw /USEENV /MAKE "apr_app - $(ARCH)"
 	@msdev aprutil.dsw /USEENV /MAKE "aprutil - $(ARCH)"
+	@msdev aprutil.dsw /USEENV /MAKE "libapr_app - $(ARCH)"
+	@msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)"
 
 !ENDIF
 

Modified: apr/apr-util/branches/1.2.x/aprutil.dsw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/aprutil.dsw?rev=587606&r1=587605&r2=587606&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/aprutil.dsw (original)
+++ apr/apr-util/branches/1.2.x/aprutil.dsw Tue Oct 23 11:53:42 2007
@@ -54,9 +54,6 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name apr
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name apriconv
     End Project Dependency
     Begin Project Dependency

Modified: apr/apr-util/branches/1.2.x/test/testall.dsw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/test/testall.dsw?rev=587606&r1=587605&r2=587606&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/test/testall.dsw (original)
+++ apr/apr-util/branches/1.2.x/test/testall.dsw Tue Oct 23 11:53:42 2007
@@ -54,9 +54,6 @@
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name apr
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name apriconv
     End Project Dependency
     Begin Project Dependency



Mime
View raw message