svn commit: r165537 - in /httpd/apreq/trunk: CHANGES glue/perl/Makefile.PL win32/Configure.pl

[ra...@apache.org]

Author: randyk
Date: Sun May  1 13:20:55 2005
New Revision: 165537

URL: http://svn.apache.org/viewcvs?rev=165537&view=rev
Log:
For the Win32 build, have the top-level 'nmake', 'nmake test', and
'nmake install' actions also include the corrresponding perl glue
targets.

Modified:
    httpd/apreq/trunk/CHANGES
    httpd/apreq/trunk/glue/perl/Makefile.PL
    httpd/apreq/trunk/win32/Configure.pl

Modified: httpd/apreq/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/CHANGES?rev=165537&r1=165536&r2=165537&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Sun May  1 13:20:55 2005
@@ -4,6 +4,11 @@
 
 @section v2_05_dev Changes with libapreq2-2.05-dev
 
+- Win32 build [Randy Kobes]
+  Have top-level 'nmake', 'nmake test', and 'nmake install'
+  targets, respectively, also include building, testing, and
+  installing the corresponding perl glue targets.
+
 - C API
   Minimum httpd version is now 2.0.48, which includes the official
   apr 0.9.4 release.

Modified: httpd/apreq/trunk/glue/perl/Makefile.PL
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/glue/perl/Makefile.PL?rev=165537&r1=165536&r2=165537&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/Makefile.PL (original)
+++ httpd/apreq/trunk/glue/perl/Makefile.PL Sun May  1 13:20:55 2005
@@ -48,7 +48,7 @@
     slurp my $make => "$base_dir/Makefile";
     $make =~ /^APACHE=(\S+)/m or
         die "Cannot find top-level Apache directory";
-    $apache_dir = $1;
+    ($apache_dir = $1) =~ s!\\!/!g;
     ($apache_includes = "-I$apache_dir" . '/include') =~ s!\\!/!g;
     ($apr_libs = "-L$apache_dir" . '/lib') =~ s!\\!/!g;
     $make =~ /^APR_LIB=(\S+)/m or

Modified: httpd/apreq/trunk/win32/Configure.pl
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/win32/Configure.pl?rev=165537&r1=165536&r2=165537&view=diff
==============================================================================
--- httpd/apreq/trunk/win32/Configure.pl (original)
+++ httpd/apreq/trunk/win32/Configure.pl Sun May  1 13:20:55 2005
@@ -87,7 +87,9 @@
 }
 
 my $test = << 'END';
-TEST: $(LIBAPREQ) $(MOD)
+TEST : TEST_APREQ2 PERL_TEST
+
+TEST_APREQ2: $(LIBAPREQ) $(MOD)
 	$(MAKE) /nologo /f $(CFG_HOME)\$(APREQ2_TEST).mak CFG="$(APREQ2_TEST) - Win32 $(CFG)" APACHE="$(APACHE)" APREQ_HOME="$(APREQ_HOME)" APR_LIB="$(APR_LIB)" APU_LIB="$(APU_LIB)"
         set PATH=$(APREQ_HOME)\win32\libs;$(APACHE)\bin;$(PATH)
         $(PERL) "-MExtUtils::Command::MM" "-e" "test_harness()" $(TEST_FILES)
@@ -166,14 +168,10 @@
 A Makefile has been generated in $apreq_home.
 You can now run
 
-  nmake               - builds the libapreq2 library
+  nmake               - builds the libapreq2 library and perl glue
   nmake test          - runs the supplied tests
-  nmake mod_apreq     - builds mod_apreq
-  nmake clean         - clean
-  nmake install       - install the C libraries
-  nmake perl_glue     - build the perl glue
-  nmake perl_test     - test the perl glue
-  nmake perl_install  - install the perl glue
+  nmake install       - install the C libraries and perl glue modules
+  nmake clean         - remove intermediate files
   nmake help          - list the nmake targets
 END
     if ($doxygen) {
@@ -429,7 +427,9 @@
 TDIR=$(APREQ_HOME)\library\t
 APREQ_MODULE=$(APREQ_HOME)\module
 
-ALL : "$(LIBAPREQ)"
+ALL : MAKE_ALL
+
+MAKE_ALL : $(LIBAPREQ) $(MOD) PERL_GLUE
 
 $(LIBAPREQ):
 	$(MAKE) /nologo /f $(CFG_HOME)\$(LIBAPREQ).mak CFG="$(LIBAPREQ) - Win32 $(CFG)" APACHE="$(APACHE)" APREQ_HOME="$(APREQ_HOME)" APR_LIB="$(APR_LIB)" APU_LIB="$(APU_LIB)"
@@ -452,15 +452,9 @@
         $(MAKE) /nologo test
         cd $(APREQ_HOME)
 
-PERL_INSTALL: $(MOD)
-        cd $(PERLGLUE)
-!IF !EXIST("$(PERLGLUE)\Makefile")
-	$(PERL) Makefile.PL
-!ENDIF
-        $(MAKE) /nologo install
-        cd $(APREQ_HOME)
-
-INSTALL: $(LIBAPREQ)
+INSTALL : INSTALL_LIBAPREQ2 PERL_INSTALL
+ 
+INSTALL_LIBAPREQ2: $(LIBAPREQ)
         cd $(LIBDIR)
 !IF EXIST("$(LIBDIR)\$(MOD).so")
 	copy "$(MOD).so" "$(APACHE)\modules\$(MOD).so"
@@ -472,6 +466,14 @@
 !IF EXIST("$(LIBDIR)\$(LIBAPREQ).dll")
         copy "$(LIBAPREQ).dll" "$(APACHE)\bin\$(LIBAPREQ).dll"
 !ENDIF
+        cd $(APREQ_HOME)
+
+PERL_INSTALL: $(MOD)
+        cd $(PERLGLUE)
+!IF !EXIST("$(PERLGLUE)\Makefile")
+	$(PERL) Makefile.PL
+!ENDIF
+        $(MAKE) /nologo install
         cd $(APREQ_HOME)
 
 HELP: