httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: httpd-apreq-2/win32 Configure.pl libapreq.mak testall.mak mod_apreq.mak
Date Mon, 16 Jun 2003 02:51:28 GMT
randyk      2003/06/15 19:51:28

  Modified:    win32    Configure.pl libapreq.mak testall.mak mod_apreq.mak
  Log:
  - minor cleanups
  - use top-level clean target
  - add Configure option to skip perl glue initialization
  
  Revision  Changes    Path
  1.4       +20 -20    httpd-apreq-2/win32/Configure.pl
  
  Index: Configure.pl
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/win32/Configure.pl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Configure.pl	15 Jun 2003 23:11:47 -0000	1.3
  +++ Configure.pl	16 Jun 2003 02:51:28 -0000	1.4
  @@ -4,10 +4,11 @@
   use Getopt::Long;
   require File::Spec;
   require Win32;
  -my ($apache, $debug, $help);
  +my ($apache, $debug, $help, $no_perl);
   my $result = GetOptions( 'with-apache=s' => \$apache,
   			 'debug' => \$debug,
   			 'help' => \$help,
  +                         'without-perl' => \$no_perl,
                          );
   usage() if $help;
   
  @@ -20,24 +21,28 @@
   my $doxygen = which('doxygen');
   my $cfg = $debug ? 'Debug' : 'Release';
   
  -eval {require ExtUtils::XSBuilder;};
  -if ($@) {
  -    warn "ExtUtils::XSBuilder must be installed for Perl glue\n";
  -}
  -else {
  -    my @args = ($^X, '../../build/xsbuilder.pl', 'run', 'run');
  -    chdir '../glue/perl';
  -    system(@args) == 0 or die "system @args failed: $!";
  -    chdir '../../win32';
  +unless ($no_perl) {
  +    eval {require ExtUtils::XSBuilder;};
  +    if ($@) {
  +        warn "ExtUtils::XSBuilder must be installed for Perl glue\n";
  +    }
  +    else {
  +        my @args = ($^X, '../../build/xsbuilder.pl', 'run', 'run');
  +        chdir '../glue/perl';
  +        system(@args) == 0 or die "system @args failed: $!";
  +        chdir '../../win32';
  +    }
   }
   
  -
   open my $make, '>Makefile' or die qq{Cannot open Makefile: $!};
   print $make <<"END";
   # Microsoft Developer Studio Generated NMAKE File.
   
   CFG=$cfg
   APACHE=$apache
  +PERL=$^X
  +RM_F=\$(PERL) -MExtUtils::Command -e rm_f
  +
   END
   
   print $make $_ while (<DATA>);
  @@ -83,6 +88,7 @@
   
     --with-apache=C:\Path\to\Apache2 : specify the top-level Apache2 directory
     --debug                          : build a debug version
  +  --without-perl                   : skip initializing the perl glue
     --help                           : print this help message
   
   With no options specified, an attempt will be made to find a suitable 
  @@ -197,13 +203,8 @@
   NULL=nul
   !ENDIF 
   
  -!IF  "$(CFG)" == "Release"
   INTDIR=.\libs
   OUTDIR=.\libs
  -!ELSE
  -INTDIR=.\libs
  -OUTDIR=.\libs
  -!ENDIF
   
   ALL : "$(LIBAPREQ)"
   
  @@ -211,10 +212,9 @@
   	$(MAKE) /nologo /f $(LIBAPREQ).mak CFG="$(LIBAPREQ) - Win32 $(CFG)" APACHE="$(APACHE)"
   
   CLEAN:
  -	$(MAKE) /nologo /f $(LIBAPREQ).mak CFG="$(LIBAPREQ) - Win32 $(CFG)" APACHE="$(APACHE)"
clean
  -	$(MAKE) /nologo /f $(TESTALL).mak CFG="$(TESTALL) - Win32 $(CFG)" APACHE="$(APACHE)" clean
  -	$(MAKE) /nologo /f $(MOD).mak CFG="$(MOD) - Win32 $(CFG)" APACHE="$(APACHE)" clean
  -	$(MAKE) /nologo /f $(CGI).mak CFG="$(CGI) - Win32 $(CFG)" APACHE="$(APACHE)" clean
  +	cd libs
  +        $(RM_F) *.pch *.exe *.exp *.lib *.pch *.idb *.so *.dll *.obj
  +	cd ..
   
   TEST: $(LIBAPREQ)
   	$(MAKE) /nologo /f $(TESTALL).mak CFG="$(TESTALL) - Win32 $(CFG)" APACHE="$(APACHE)"
  
  
  
  1.3       +2 -31     httpd-apreq-2/win32/libapreq.mak
  
  Index: libapreq.mak
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/win32/libapreq.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- libapreq.mak	12 Jun 2003 03:24:00 -0000	1.2
  +++ libapreq.mak	16 Jun 2003 02:51:28 -0000	1.3
  @@ -36,26 +36,16 @@
   CPP=cl.exe
   RSC=rc.exe
   
  -!IF  "$(CFG)" == "libapreq - Win32 Release"
  -
   OUTDIR=.\libs
   INTDIR=.\libs
   # Begin Custom Macros
   OutDir=.\libs
   # End Custom Macros
   
  -ALL : "$(OUTDIR)\libapreq.lib"
   
  +!IF  "$(CFG)" == "libapreq - Win32 Release"
   
  -CLEAN :
  -	-@erase "$(INTDIR)\apreq.obj"
  -	-@erase "$(INTDIR)\apreq_cookie.obj"
  -	-@erase "$(INTDIR)\apreq_params.obj"
  -	-@erase "$(INTDIR)\apreq_parsers.obj"
  -	-@erase "$(INTDIR)\apreq_tables.obj"
  -	-@erase "$(INTDIR)\vc60.idb"
  -	-@erase "$(OUTDIR)\libapreq.lib"
  -        -@erase "$(OUTDIR)\libapreq.pch"
  +ALL : "$(OUTDIR)\libapreq.lib"
   
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  @@ -79,26 +69,8 @@
   
   !ELSEIF  "$(CFG)" == "libapreq - Win32 Debug"
   
  -OUTDIR=.\libs
  -INTDIR=.\libs
  -# Begin Custom Macros
  -OutDir=.\libs
  -# End Custom Macros
  -
   ALL : "$(OUTDIR)\libapreq.lib"
   
  -
  -CLEAN :
  -	-@erase "$(INTDIR)\apreq.obj"
  -	-@erase "$(INTDIR)\apreq_cookie.obj"
  -	-@erase "$(INTDIR)\apreq_params.obj"
  -	-@erase "$(INTDIR)\apreq_parsers.obj"
  -	-@erase "$(INTDIR)\apreq_tables.obj"
  -	-@erase "$(INTDIR)\vc60.idb"
  -	-@erase "$(INTDIR)\vc60.pdb"
  -	-@erase "$(OUTDIR)\libapreq.lib"
  -        -@erase "$(OUTDIR)\libapreq.pch"
  -
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  @@ -181,7 +153,6 @@
   
   "$(INTDIR)\apreq_tables.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
   
   
   !ENDIF 
  
  
  
  1.3       +0 -44     httpd-apreq-2/win32/testall.mak
  
  Index: testall.mak
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/win32/testall.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testall.mak	12 Jun 2003 03:27:04 -0000	1.2
  +++ testall.mak	16 Jun 2003 02:51:28 -0000	1.3
  @@ -34,29 +34,8 @@
   !ENDIF 
   
   !IF  "$(CFG)" == "testall - Win32 Release"
  -
  -OUTDIR=.\libs
  -INTDIR=.\libs
  -# Begin Custom Macros
  -OutDir=.\libs
  -# End Custom Macros
  -
   ALL : "$(OUTDIR)\testall.exe"
   
  -
  -CLEAN :
  -	-@erase "$(INTDIR)\cookie.obj"
  -	-@erase "$(INTDIR)\CuTest.obj"
  -	-@erase "$(INTDIR)\env.obj"
  -	-@erase "$(INTDIR)\params.obj"
  -	-@erase "$(INTDIR)\parsers.obj"
  -	-@erase "$(INTDIR)\performance.obj"
  -	-@erase "$(INTDIR)\tables.obj"
  -	-@erase "$(INTDIR)\testall.obj"
  -	-@erase "$(INTDIR)\vc60.idb"
  -	-@erase "$(OUTDIR)\testall.exe"
  -        -@erase "$(OUTDIR)\testall.pch"
  -
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  @@ -119,30 +98,7 @@
   
   !ELSEIF  "$(CFG)" == "testall - Win32 Debug"
   
  -OUTDIR=.\libs
  -INTDIR=.\libs
  -# Begin Custom Macros
  -OutDir=.\libs
  -# End Custom Macros
  -
   ALL : "$(OUTDIR)\testall.exe"
  -
  -
  -CLEAN :
  -	-@erase "$(INTDIR)\cookie.obj"
  -	-@erase "$(INTDIR)\CuTest.obj"
  -	-@erase "$(INTDIR)\env.obj"
  -	-@erase "$(INTDIR)\params.obj"
  -	-@erase "$(INTDIR)\parsers.obj"
  -	-@erase "$(INTDIR)\performance.obj"
  -	-@erase "$(INTDIR)\tables.obj"
  -	-@erase "$(INTDIR)\testall.obj"
  -	-@erase "$(INTDIR)\vc60.idb"
  -	-@erase "$(INTDIR)\vc60.pdb"
  -	-@erase "$(OUTDIR)\testall.exe"
  -	-@erase "$(OUTDIR)\testall.ilk"
  -	-@erase "$(OUTDIR)\testall.pdb"
  -        -@erase "$(OUTDIR)\testall.pch"
   
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  
  
  
  1.3       +2 -30     httpd-apreq-2/win32/mod_apreq.mak
  
  Index: mod_apreq.mak
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/win32/mod_apreq.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_apreq.mak	12 Jun 2003 03:24:00 -0000	1.2
  +++ mod_apreq.mak	16 Jun 2003 02:51:28 -0000	1.3
  @@ -37,24 +37,15 @@
   MTL=midl.exe
   RSC=rc.exe
   
  -!IF  "$(CFG)" == "mod_apreq - Win32 Release"
  -
   OUTDIR=.\libs
   INTDIR=.\libs
   # Begin Custom Macros
   OutDir=.\libs
   # End Custom Macros
   
  -ALL : "$(OUTDIR)\mod_apreq.dll"
  -
  +!IF  "$(CFG)" == "mod_apreq - Win32 Release"
   
  -CLEAN :
  -	-@erase "$(INTDIR)\mod_apreq.obj"
  -	-@erase "$(INTDIR)\vc60.idb"
  -	-@erase "$(OUTDIR)\mod_apreq.so"
  -	-@erase "$(OUTDIR)\mod_apreq.exp"
  -	-@erase "$(OUTDIR)\mod_apreq.lib"
  -        -@erase "$(OUTDIR)\mod_apreq.pch"
  +ALL : "$(OUTDIR)\mod_apreq.dll"
   
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  @@ -79,26 +70,8 @@
   
   !ELSEIF  "$(CFG)" == "mod_apreq - Win32 Debug"
   
  -OUTDIR=.\libs
  -INTDIR=.\libs
  -# Begin Custom Macros
  -OutDir=.\libs
  -# End Custom Macros
  -
   ALL : "$(OUTDIR)\mod_apreq.dll"
   
  -
  -CLEAN :
  -	-@erase "$(INTDIR)\mod_apreq.obj"
  -	-@erase "$(INTDIR)\vc60.idb"
  -	-@erase "$(INTDIR)\vc60.pdb"
  -	-@erase "$(OUTDIR)\mod_apreq.so"
  -	-@erase "$(OUTDIR)\mod_apreq.exp"
  -	-@erase "$(OUTDIR)\mod_apreq.ilk"
  -	-@erase "$(OUTDIR)\mod_apreq.lib"
  -	-@erase "$(OUTDIR)\mod_apreq.pdb"
  -        -@erase "$(OUTDIR)\mod_apreq.pch"
  -
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  @@ -158,7 +131,6 @@
   
   "$(INTDIR)\mod_apreq.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
   
   
   !ENDIF 
  
  
  

Mime
View raw message