svn commit: r168521 - in /httpd/apreq/trunk: Makefile.PL win32/Configure.pl win32/apreq2_test.mak

[ra...@apache.org]

Author: randyk
Date: Thu May  5 22:13:39 2005
New Revision: 168521

URL: http://svn.apache.org/viewcvs?rev=168521&view=rev
Log:
Win32 fixes for debug mode (reported by Markus Wichitill):
  - recognize --debug option if passed to top-level Makefile.PL
  - fix debug targets in apreq2_test.mak
  - install .pdb files, if they exist

Modified:
    httpd/apreq/trunk/Makefile.PL
    httpd/apreq/trunk/win32/Configure.pl
    httpd/apreq/trunk/win32/apreq2_test.mak

Modified: httpd/apreq/trunk/Makefile.PL
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/Makefile.PL?rev=168521&r1=168520&r2=168521&view=diff
==============================================================================
--- httpd/apreq/trunk/Makefile.PL (original)
+++ httpd/apreq/trunk/Makefile.PL Thu May  5 22:13:39 2005
@@ -19,9 +19,10 @@
 undef @opts{qw(with-apache2-apxs with-apache1-apxs with-apache2-src
                with-perl with-apache2-httpd
                with-apr-config with-apu-config apxs)};
-undef $opts{'with-apache2'} if (WIN32);
+undef @opts{qw(with-apache2)} if (WIN32);
 
 my @flags = qw/enable-maintainer-mode enable-perl-glue disable-perl-glue/;
+push @flags, qw/debug/ if (WIN32);
 my %args;
 # grab from @ARGV only the options that we expect
 GetOptions(\%args, (map "$_=s", keys %opts), @flags);
@@ -39,6 +40,8 @@
     test_prereq "Test::More";
 }
 
+$opts .= "--debug " if (WIN32 and $args{debug});
+
 delete @args{@flags};
 $args{"with-apache2-apxs"} = delete $args{apxs}
     if exists $args{apxs} and not exists $args{"with-apache2-apxs"};
@@ -61,6 +64,7 @@
         }
     }
     my @opts = map{qq/--$_="$args{$_}"/} keys %args;
+    push @opts, (split ' ', $opts);
     my @args = (PERL_PATH, 'win32/Configure.pl', @opts);
     print "@args\n";
     system(@args) == 0 or die "system @args failed: $?";

Modified: httpd/apreq/trunk/win32/Configure.pl
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/win32/Configure.pl?rev=168521&r1=168520&r2=168521&view=diff
==============================================================================
--- httpd/apreq/trunk/win32/Configure.pl (original)
+++ httpd/apreq/trunk/win32/Configure.pl Thu May  5 22:13:39 2005
@@ -11,13 +11,14 @@
 use Archive::Tar;
 use File::Path;
 use LWP::Simple;
-my ($apache, $debug, $help, $no_perl, $perl);
+my ($apache, $debug, $help, $no_perl, $perl, $with_perl);
 my $VERSION = '2.03-dev';
 my $result = GetOptions( 'with-apache2=s' => \$apache,
 			 'debug' => \$debug,
 			 'help' => \$help,
                          'with-perl=s' => \$perl,
                          'disable-perl-glue' => \$no_perl,
+                         'enable-perl-glue' => \$with_perl,
                        );
 usage() if $help;
 
@@ -460,11 +461,17 @@
 	copy "$(MOD).so" "$(APACHE)\modules\$(MOD).so"
 	copy "$(MOD).lib" "$(APACHE_LIB)\$(MOD).lib"
 !ENDIF
+!IF EXIST("$(LIBDIR)\$(MOD).pdb")
+	copy "$(MOD).pdb" "$(APACHE)\modules\$(MOD).pdb"
+!ENDIF
 !IF EXIST("$(LIBDIR)\$(LIBAPREQ).lib")
 	copy "$(LIBAPREQ).lib" "$(APACHE_LIB)\$(LIBAPREQ).lib"
 !ENDIF
 !IF EXIST("$(LIBDIR)\$(LIBAPREQ).dll")
         copy "$(LIBAPREQ).dll" "$(APACHE)\bin\$(LIBAPREQ).dll"
+!ENDIF
+!IF EXIST("$(LIBDIR)\$(LIBAPREQ).pdb")
+        copy "$(LIBAPREQ).pdb" "$(APACHE)\bin\$(LIBAPREQ).pdb"
 !ENDIF
         cd $(APREQ_HOME)
 

Modified: httpd/apreq/trunk/win32/apreq2_test.mak
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/win32/apreq2_test.mak?rev=168521&r1=168520&r2=168521&view=diff
==============================================================================
--- httpd/apreq/trunk/win32/apreq2_test.mak (original)
+++ httpd/apreq/trunk/win32/apreq2_test.mak Thu May  5 22:13:39 2005
@@ -116,7 +116,7 @@
 
 !ELSEIF  "$(CFG)" == "apreq2_test - Win32 Debug"
 
-ALL : "$(OUTDIR)\apreq2_test.lib" $(PROGRAMS)
+ALL : "$(LIBDIR)\apreq2_test.lib" $(PROGRAMS)
 
 CLEAN :
 	-@erase "$(INTDIR)\at.obj"
@@ -137,6 +137,16 @@
 	"$(APR_LIB)" \
 	"$(APU_LIB)"
 
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib wsock32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /subsystem:console /incremental:yes  /debug /machine:I386 /pdbtype:sept 
+
+LINK32_OBJS= \
+	"$(LIBDIR)\libapreq2.lib" \
+	"$(LIBDIR)\apreq2_test.lib" \
+	"$(APR_LIB)" \
+	"$(APU_LIB)" \
+	"$(APACHE)\lib\libhttpd.lib"
+
 "$(LIBDIR)\apreq2_test.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
     $(LIB32) @<<
   $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
@@ -152,9 +162,9 @@
   $(LINK32_FLAGS) $(LINK32_OBJS) "$(OUTDIR)\params.obj"
 <<
 
-"$(LIBTDIR)\parser.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) "$(OUTDIR)\parser.obj"
-    $(LINK32) /pdb:"$(TESTFILE)\parser.pdb" /out:"$(LIBTDIR)\parser.exe" @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS) "$(OUTDIR)\parser.obj"
+"$(LIBTDIR)\parsers.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) "$(OUTDIR)\parsers.obj"
+    $(LINK32) /pdb:"$(TESTFILE)\parsers.pdb" /out:"$(LIBTDIR)\parsers.exe" @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS) "$(OUTDIR)\parsers.obj"
 <<
 
 "$(LIBTDIR)\version.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) "$(OUTDIR)\version.obj"