httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject cvs commit: httpd-apreq-2/t Makefile.am
Date Tue, 28 Oct 2003 14:00:08 GMT
joes        2003/10/28 06:00:08

  Modified:    .        Makefile.PL Makefile.am
               build    version_check.pl
               env      Makefile.am
               glue/perl Makefile.PL
               glue/perl/t TEST.PL
               t        Makefile.am
  Added:       .        MANIFEST.SKIP
  Log:
  Add MANIFEST.SKIP- '% make release' should generate a functional, CPAN-friendly tarball
now.
  
  Revision  Changes    Path
  1.6       +3 -1      httpd-apreq-2/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/Makefile.PL,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.PL	17 Oct 2003 14:49:12 -0000	1.5
  +++ Makefile.PL	28 Oct 2003 14:00:06 -0000	1.6
  @@ -17,7 +17,7 @@
   }
   else {
       my @opts = qw(with-apache2-apxs with-apache2-src
  -                  with-apr-config with-apu-config);
  +                  with-apr-config with-apu-config apxs);
   
       my @flags = qw/enable-maintainer-mode enable-perl-glue disable-perl-glue/;
       my %opts;
  @@ -30,6 +30,8 @@
       $opts .= "--enable-perl-glue " unless exists $opts{"disable-perl-glue"};
   
       delete @opts{@flags};
  +    $opts{"with-apache2-apxs"} = delete $opts{apxs} 
  +        if exists $opts{apxs} and not exists $opts{"with-apache2-apxs"};
   
       $opts .= join " ", map {"--$_=$opts{$_}"} keys %opts;
       print "./configure $opts\n";
  
  
  
  1.17      +19 -5     httpd-apreq-2/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/Makefile.am,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Makefile.am	18 Oct 2003 21:03:06 -0000	1.16
  +++ Makefile.am	28 Oct 2003 14:00:06 -0000	1.17
  @@ -1,6 +1,6 @@
   AUTOMAKE_OPTIONS = foreign
   SUBDIRS = src env glue t
  -EXTRA_DIST = INSTALL CHANGES build
  +EXTRA_DIST = README INSTALL CHANGES MANIFEST.SKIP Makefile.PL build win32
   APU_SRCDIR=`@APU_CONFIG@ --srcdir`
   APR_SRCDIR=`@APR_CONFIG@ --srcdir`
   APU_DOX = (cd $(APU_SRCDIR); cat - docs/doxygen.conf | doxygen -)
  @@ -8,6 +8,7 @@
   COOKIE_POD=glue/perl/blib/lib/Apache/Cookie.pod
   REQUEST_POD=glue/perl/blib/lib/Apache/Request.pod
   SED_BODY_TAG= s(^[\S\s]+<body.+|</body>[\S\s]+$$)()gi
  +EUM=ExtUtils::Manifest
   
   bin_SCRIPTS = apreq2_config
   
  @@ -17,11 +18,24 @@
   PERL_TEST = 
   endif
   
  -apreq2_config:
  +release: distdir
  +	@PERL@ build/version_check.pl > $(distdir)/PREREQUISITES
  +	echo MANIFEST > $(distdir)/MANIFEST
  +	cd $(distdir); ./buildconf
  +	@cd $(distdir); @PERL@ -M$(EUM) -e "$(EUM)::mkmanifest"
  +	@PERL@ -ple '$$_="$(distdir)/$$_"' $(distdir)/MANIFEST | tar -czf $(distdir).tar.gz -T
-
  +	rm -rf $(distdir)
  +	@echo "Made $(distdir).tar.gz"
  +
  +release_test:
  +	-rm -rf $(distdir)
  +	tar xzvf $(distdir).tar.gz
  +	@cd $(distdir); @PERL@ -M$(EUM) -e "die 'Bogus MANIFEST' if $(EUM)::manicheck"
  +	@cd $(distdir); @PERL@ Makefile.PL -apxs @APACHE2_APXS@ && make test
  +	rm -rf $(distdir)
  +	@echo "$(distdir).tar.gz is kosher."
   
  -dist-hook:
  -	rm -rf `find $(distdir) -name '*CVS'`
  -	rm -rf `find $(distdir) -name '*~'`
  +apreq2_config:
   
   docs:	src env glue build/doxygen.conf
   	doxygen build/doxygen.conf
  
  
  
  1.1                  httpd-apreq-2/MANIFEST.SKIP
  
  Index: MANIFEST.SKIP
  ===================================================================
  # Version control files and dirs.
  \bRCS\b
  \bCVS\b
  ,v$
  \.cvsignore$
  
  # Makemaker generated files and dirs.
  ^MANIFEST\.
  Makefile$
  ^blib/
  ^MakeMakerā€\d
  
  # Temp, old and emacs backup files.
  ~$
  \.old$
  ^#.*#$
  ^\.#
  
  # libtool stuff
  /\.libs
  \.la$
  \.lo$
  \.o$
  \.a$
  \.slo$
  \.so$
  
  # perl glue
  glue/perl/blib
  glue/perl/xsbuilder/tables
  
  #Apache Test stuff
  t/TEST$
  t/conf/*.conf$
  t/logs
  
  
  
  1.4       +1 -3      httpd-apreq-2/build/version_check.pl
  
  Index: version_check.pl
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/build/version_check.pl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- version_check.pl	28 Oct 2003 03:23:56 -0000	1.3
  +++ version_check.pl	28 Oct 2003 14:00:06 -0000	1.4
  @@ -2,8 +2,6 @@
   use strict;
   use warnings 'FATAL';
   
  -
  -my $usage = "Usage: version_check.pl tool version_string [path/to/tool]";
   my ($tool, $path) = @ARGV;
   $path = $tool unless defined $path;
   
  @@ -44,7 +42,7 @@
       exit 0;
   }
   
  -die "$0 failed: unknown tool '$tool'." unless $prereq{$tool};
  +die "$0 failed: unknown tool '$tool'.\n" unless $prereq{$tool};
   my $version = $prereq{$tool}->{version};
   my @version = split /\./, $version;
   
  
  
  
  1.17      +1 -1      httpd-apreq-2/env/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/env/Makefile.am,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Makefile.am	27 Oct 2003 03:07:28 -0000	1.16
  +++ Makefile.am	28 Oct 2003 14:00:06 -0000	1.17
  @@ -46,7 +46,7 @@
   
   test_clean : cmodules_clean
   	-@PERL@ t/TEST -clean
  -	-rm -rf t/htdocs t/logs t/modules t/TEST t/cgi-bin/test_cgi
  +	-rm -rf t/htdocs t/logs t/modules t/TEST t/cgi-bin/test_cgi t/cgi-bin/.libs t/conf/extra.conf
   
   cmodules_clean:
   	-cd c-modules && $(MAKE) clean
  
  
  
  1.8       +2 -1      httpd-apreq-2/glue/perl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/glue/perl/Makefile.PL,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.PL	13 Oct 2003 18:24:47 -0000	1.7
  +++ Makefile.PL	28 Oct 2003 14:00:06 -0000	1.8
  @@ -32,7 +32,8 @@
       NAME => 'libapreq2',
       VERSION => '0.1',
       DIR => [qw(xs)],
  -    clean => { DIRS => "blib", FILES => "t/TEST @scripts" },
  +    clean => { FILES => "xs t/logs t/TEST @scripts" },
  +    realclean => { FILES => "xsbuilder/tables" },
   );
   
   __END__
  
  
  
  1.7       +0 -3      httpd-apreq-2/glue/perl/t/TEST.PL
  
  Index: TEST.PL
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/glue/perl/t/TEST.PL,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TEST.PL	17 Oct 2003 06:27:20 -0000	1.6
  +++ TEST.PL	28 Oct 2003 14:00:06 -0000	1.7
  @@ -2,9 +2,6 @@
   
   use strict;
   use warnings FATAL => 'all';
  -
  -use lib qw(lib Apache-Test/lib);
  -
   use Apache2;
   use Apache::Build;
   require Win32 if Apache::Build::WIN32;
  
  
  
  1.16      +1 -1      httpd-apreq-2/t/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/t/Makefile.am,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Makefile.am	27 Oct 2003 03:07:28 -0000	1.15
  +++ Makefile.am	28 Oct 2003 14:00:08 -0000	1.16
  @@ -2,7 +2,7 @@
   LIBS = ../src/lib@APREQ_LIBNAME@.la @APR_LTLIBS@ @APU_LTLIBS@
   
   noinst_LIBRARIES = lib@APREQ_LIBNAME@_tests.a
  -lib@APREQ_LIBNAME@_tests_a_SOURCES = CuTest.c cookie.c params.c parsers.c
  +lib@APREQ_LIBNAME@_tests_a_SOURCES = CuTest.h test_apreq.h CuTest.c cookie.c params.c parsers.c
   
   check_PROGRAMS = testall
   testall_LDADD  = lib@APREQ_LIBNAME@_tests.a
  
  
  

Mime
View raw message