httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pgollu...@apache.org
Subject svn commit: r721104 - in /httpd/apreq/branches/v2_10: ./ module/t/TEST.PL win32/Configure.pl win32/libapreq2.mak
Date Thu, 27 Nov 2008 06:51:10 GMT
Author: pgollucci
Date: Wed Nov 26 22:51:10 2008
New Revision: 721104

URL: http://svn.apache.org/viewvc?rev=721104&view=rev
Log:
Backport r662082:
  remove manifest files with "make clean" in the module\t\c-modules\ 
  subdirectories, and run this within the top "make clean" Makefile 
  target.

Backport r662072:
  win32 build may pick wrong apr and aprutil libs if apxs isn't 
  installed:
    http://marc.info/?l=apreq-dev&m=121122424811997&w=2

  Patch supplied by Nikolay Ananiev




Modified:
    httpd/apreq/branches/v2_10/   (props changed)
    httpd/apreq/branches/v2_10/module/t/TEST.PL
    httpd/apreq/branches/v2_10/win32/Configure.pl
    httpd/apreq/branches/v2_10/win32/libapreq2.mak

Propchange: httpd/apreq/branches/v2_10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 26 22:51:10 2008
@@ -1 +1 @@
-/httpd/apreq/trunk:688788,721096
+/httpd/apreq/trunk:662072,662082,688788,721096

Modified: httpd/apreq/branches/v2_10/module/t/TEST.PL
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_10/module/t/TEST.PL?rev=721104&r1=721103&r2=721104&view=diff
==============================================================================
--- httpd/apreq/branches/v2_10/module/t/TEST.PL (original)
+++ httpd/apreq/branches/v2_10/module/t/TEST.PL Wed Nov 26 22:51:10 2008
@@ -71,7 +71,7 @@
 
     if (WIN32) {
         require File::Spec;
-        my @goners = map {$name . '.' . $_} qw(exp ilk lib pdb so lo);
+        my @goners = map {$name . '.' . $_} qw(exp ilk lib pdb so lo so.manifest);
         my $libs = join ' ',
             (map {'-l' . File::Spec->catfile($mod_apreq2_dir, $_)}
               qw(libapreq2.lib mod_apreq2.lib));

Modified: httpd/apreq/branches/v2_10/win32/Configure.pl
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_10/win32/Configure.pl?rev=721104&r1=721103&r2=721104&view=diff
==============================================================================
--- httpd/apreq/branches/v2_10/win32/Configure.pl (original)
+++ httpd/apreq/branches/v2_10/win32/Configure.pl Wed Nov 26 22:51:10 2008
@@ -37,12 +37,16 @@
 generate_tests($apreq_home, \@tests);
 
 my %apr_libs;
-my %map = (apr => 'libapr.lib', apu => 'libaprutil.lib');
+my $prog = apache_prog_name($apache);
+my @httpd_ver = httpd_version($prog);
 my $devnull = devnull();
+my %map = (
+    apr => $httpd_ver[1] == 2 ? 'libapr-1.lib' : 'libapr.lib',
+    apu => $httpd_ver[1] == 2 ? 'libaprutil-1.lib' : 'libaprutil.lib'
+);
 
-my $prog = apache_prog_name($apache);
 foreach my $what (qw(apr apu)) {
-    my $ap = ($prog eq 'httpd.exe') ?
+    my $ap = ($httpd_ver[1] == 2) ?
         "$what-1-config.bat" : "$what-config.bat";
     my $cfg = catfile $apache, 'bin', $ap;
     my $lib;
@@ -110,6 +114,8 @@
         $(RM_F) *.pch *.exe *.exp *.lib *.pdb *.ilk *.idb *.so *.dll *.obj *.manifest
         cd $(TDIR)
         $(RM_F) *.pch *.exe *.exp *.lib *.pdb *.ilk *.idb *.so *.dll *.obj *.manifest
+        cd $(APREQ_HOME)\module\t\c-modules
+        $(MAKE) clean
         cd $(APREQ_HOME)
 !IF EXIST("$(PERLGLUE)\Makefile")
         cd $(PERLGLUE)
@@ -308,6 +314,14 @@
     return;
 }
 
+sub httpd_version {
+    my $prog = shift;
+    my $vers = qx{$prog -v};
+    die qq{Could not parse "$apache" version}
+        unless $vers =~ m!Apache/2.(\d).(\d)!;
+    return (2, $1, $2);
+}
+
 sub generate_defs {
     my $preamble =<<'END';
 LIBRARY

Modified: httpd/apreq/branches/v2_10/win32/libapreq2.mak
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_10/win32/libapreq2.mak?rev=721104&r1=721103&r2=721104&view=diff
==============================================================================
--- httpd/apreq/branches/v2_10/win32/libapreq2.mak (original)
+++ httpd/apreq/branches/v2_10/win32/libapreq2.mak Wed Nov 26 22:51:10 2008
@@ -68,9 +68,7 @@
 	"$(INTDIR)\module_custom.obj" \
 	"$(INTDIR)\module_cgi.obj" \
 	"$(INTDIR)\error.obj" \
-	"$(INTDIR)\libapreq.res \
-	"$(APR_LIB)" \
-	"$(APU_LIB)"
+	"$(INTDIR)\libapreq.res"
 
 !IF  "$(CFG)" == "libapreq2 - Win32 Release"
 
@@ -87,7 +85,7 @@
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc" 
 LINK32=link.exe
 MANIFEST=$(OUTDIR)\libapreq2.dll.manifest
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /machine:I386
/out:"$(OUTDIR)\libapreq2.dll" /implib:"$(OUTDIR)\libapreq2.lib" 
+LINK32_FLAGS="$(APR_LIB)" "$(APU_LIB)" kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll
/incremental:no /machine:I386 /out:"$(OUTDIR)\libapreq2.dll" /implib:"$(OUTDIR)\libapreq2.lib"
 
 "$(OUTDIR)\libapreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<



Mime
View raw message