cvs commit: modperl-2.0 Makefile.PL
stas02/03/13 08:01:02
Modified:.Makefile.PL
Log:
do yourself a favor, don't use perl v5.6.0
Revision ChangesPath
1.59 +5 -0 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- Makefile.PL 31 Dec 2001 08:45:13 - 1.58
+++ Makefile.PL 13 Mar 2002 16:01:02 - 1.59
@@ -25,6 +25,11 @@
}
}
+if ($] < 5.006001) {
+error "You are running Perl version $]\n" .
+"We strongly suggest to upgrade to at least 5.6.1";
+}
+
my $build = Apache::Build->new(init => 1);
my $code = ModPerl::Code->new;
cvs commit: modperl-2.0 Makefile.PL
stas01/12/25 04:46:10 Modified:.Makefile.PL Log: - correct the changed docs path in the problem description comment Revision ChangesPath 1.57 +1 -1 modperl-2.0/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- Makefile.PL 2001/12/25 12:44:49 1.56 +++ Makefile.PL 2001/12/25 12:46:10 1.57 @@ -26,7 +26,7 @@ my $code = ModPerl::Code->new; #XXX: dunno why but win32 fails because of this: -#cd docs/src/api/mod_perl-2.0 && nmake all ... +#cd docs/api/mod_perl-2.0 && nmake all ... #NMAKE : fatal error U1073: don't know how to make 'all' #Stop. #NMAKE : fatal error U1077: 'cd' : return code '0x2'
cvs commit: modperl-2.0 Makefile.PL
stas01/11/20 18:39:45
Modified:.Makefile.PL
Log:
s/generate_xs/xs_generate/ to be consistent with make target and
build/xs_generate.pl
Revision ChangesPath
1.54 +2 -2 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Makefile.PL 2001/11/02 17:59:05 1.53
+++ Makefile.PL 2001/11/21 02:39:45 1.54
@@ -113,7 +113,7 @@
if ($build->{MP_GENERATE_XS}) {
print "generating XS code using $tables_dir...\n";
-generate_xs($httpd_version);
+xs_generate($httpd_version);
}
}
@@ -148,7 +148,7 @@
my $tables_dir = "xs/tables/$tables_version";
}
-sub generate_xs {
+sub xs_generate {
require ModPerl::WrapXS;
my $xs = ModPerl::WrapXS->new;
cvs commit: modperl-2.0 Makefile.PL
dougm 01/11/02 09:33:46
Modified:.Makefile.PL
Log:
XXX: MakeMaker will try to unlink $(APACHE_LIBDIR)/$MODPERL_LIB
during 'make' and probably 'make clean' as well
need to find another way to install libmodperl.so
Revision ChangesPath
1.52 +9 -5 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Makefile.PL 2001/11/02 17:31:33 1.51
+++ Makefile.PL 2001/11/02 17:33:46 1.52
@@ -318,12 +318,16 @@
sub MY::post_initialize {
my $self = shift;
+#XXX: MakeMaker will try to unlink $(APACHE_LIBDIR)/$MODPERL_LIB
+#during 'make' and probably 'make clean' as well
+#need to find another way to install libmodperl.so
+
# install libmodperl.so
-if ($build->{MP_USE_DSO}) {
-my $MODPERL_LIB = join '.', $build->{MP_LIBNAME}, 'so';
-$self->{PM}->{"src/modules/perl/$MODPERL_LIB"} =
-"\$(APACHE_LIBDIR)/$MODPERL_LIB";
-}
+#if ($build->{MP_USE_DSO}) {
+#my $MODPERL_LIB = join '.', $build->{MP_LIBNAME}, 'so';
+#$self->{PM}->{"src/modules/perl/$MODPERL_LIB"} =
+#"\$(APACHE_LIBDIR)/$MODPERL_LIB";
+#}
#up one from the Apache2/ subdir
#so it can be found for 'use Apache2 ()'
cvs commit: modperl-2.0 Makefile.PL
dougm 01/11/02 09:31:33
Modified:.Makefile.PL
Log:
no need to check exists $build->{MP_USE_DSO}
Revision ChangesPath
1.51 +1 -1 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- Makefile.PL 2001/10/22 18:19:35 1.50
+++ Makefile.PL 2001/11/02 17:31:33 1.51
@@ -319,7 +319,7 @@
my $self = shift;
# install libmodperl.so
-if (exists $build->{MP_USE_DSO} && $build->{MP_USE_DSO}) {
+if ($build->{MP_USE_DSO}) {
my $MODPERL_LIB = join '.', $build->{MP_LIBNAME}, 'so';
$self->{PM}->{"src/modules/perl/$MODPERL_LIB"} =
"\$(APACHE_LIBDIR)/$MODPERL_LIB";
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/22 11:19:35
Modified:.Makefile.PL
Log:
need touch dummy libmodperl.lib for win32 WrapXS/ Makefile.PLs
Revision ChangesPath
1.50 +12 -0 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Makefile.PL 2001/10/22 04:51:14 1.49
+++ Makefile.PL 2001/10/22 18:19:35 1.50
@@ -56,6 +56,18 @@
post_configure();
sub configure {
+if (Apache::Build::is_win32()) {
+#Makefile.PL's in WrapXS/ just need to pass the -e libmodperl.lib test
+#the real libmodperl.lib will be in place when WrapXS/ dll's are
+#actually linked
+my $lib = "src/modules/perl/$build->{MP_LIBNAME}.lib";
+unless (-e $lib) {
+open my $fh, '>', $lib or die "open $lib: $!";
+print $fh "#this is a dummy file to trick MakeMaker";
+close $fh;
+}
+}
+
system_sanity_check();
set_modperl_version();
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/21 21:51:14 Modified:.Makefile.PL Log: win32 doesnt like documentation Revision ChangesPath 1.49 +8 -1 modperl-2.0/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- Makefile.PL 2001/10/21 23:07:01 1.48 +++ Makefile.PL 2001/10/22 04:51:14 1.49 @@ -25,7 +25,14 @@ my $build = Apache::Build->new(init => 1); my $code = ModPerl::Code->new; -my @remote_makefile_dirs = qw(docs/src/api/mod_perl-2.0); +#XXX: dunno why but win32 fails because of this: +#cd docs/src/api/mod_perl-2.0 && nmake all ... +#NMAKE : fatal error U1073: don't know how to make 'all' +#Stop. +#NMAKE : fatal error U1077: 'cd' : return code '0x2' +#Stop. +my @remote_makefile_dirs = Apache::Build::is_win32() ? () : + qw(docs/src/api/mod_perl-2.0); my @scripts = qw(t/TEST); configure();
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/21 16:07:01
Modified:.Makefile.PL
Log:
always using .so extension for libmodperl
Revision ChangesPath
1.48 +2 -2 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Makefile.PL 2001/10/21 06:43:34 1.47
+++ Makefile.PL 2001/10/21 23:07:01 1.48
@@ -299,9 +299,9 @@
sub MY::post_initialize {
my $self = shift;
-# install libmodperl.so, MODPERL_LIB is not known here yet
+# install libmodperl.so
if (exists $build->{MP_USE_DSO} && $build->{MP_USE_DSO}) {
-my $MODPERL_LIB = join '.', $build->{MP_LIBNAME}, $Config{dlext};
+my $MODPERL_LIB = join '.', $build->{MP_LIBNAME}, 'so';
$self->{PM}->{"src/modules/perl/$MODPERL_LIB"} =
"\$(APACHE_LIBDIR)/$MODPERL_LIB";
}
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/17 10:38:07
Modified:.Makefile.PL
Log:
undo undo of explicit DIR in WriteMakefile; problem seems to have gone away
Revision ChangesPath
1.45 +1 -1 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Makefile.PL 2001/10/15 16:50:47 1.44
+++ Makefile.PL 2001/10/17 17:38:07 1.45
@@ -27,7 +27,7 @@
ModPerl::MM::WriteMakefile(
NAME => 'mod_perl',
VERSION => $VERSION,
-#DIR => get_dirs_with_makefile(@remote_makefile_dirs),
+DIR => get_dirs_with_makefile(@remote_makefile_dirs),
macro => {
MODPERL_SRC => $code->path,
PERL => $build->perl_config('perlpath'),
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/15 09:50:47 Modified:.Makefile.PL Log: fix MODPERL_SRC related targets for win32 to understand Submitted by: William A. Rowe, Jr. <[EMAIL PROTECTED]> Reviewed by: dougm Revision ChangesPath 1.44 +2 -2 modperl-2.0/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- Makefile.PL 2001/10/11 19:48:08 1.43 +++ Makefile.PL 2001/10/15 16:50:47 1.44 @@ -261,10 +261,10 @@ $(SHELL) build/make_etags modperl_lib: - @(cd $(MODPERL_SRC) && $(MAKE)); + cd "$(MODPERL_SRC)" && $(MAKE) modperl_src_clean: - @(cd $(MODPERL_SRC) && $(MAKE) clean); + cd "$(MODPERL_SRC)" && $(MAKE) clean EOF
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/11 12:48:08
Modified:.Makefile.PL
Log:
add os specific sanity checks starting with hpux
Revision ChangesPath
1.43 +19 -0 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Makefile.PL 2001/10/11 03:29:32 1.42
+++ Makefile.PL 2001/10/11 19:48:08 1.43
@@ -181,6 +181,7 @@
$build->lib_check('gdbm');
malloc_check();
+os_check();
}
sub malloc_check {
@@ -200,6 +201,24 @@
}
}
+sub os_check {
+my $check = \&{"os_check_$^O"};
+return unless defined &$check;
+$check->()
+}
+
+sub os_check_hpux {
+my $ccflags = $build->perl_config('ccflags');
+
+if ($build->{MP_USE_DSO} and $Config{ld} eq 'ld') {
+unless ($ccflags =~ /\+z/i) {
+$build->phat_warn(<
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/10 20:29:32
Modified:.Makefile.PL
Log:
the DIR => [] patch does not work, backing it out for now.
Revision ChangesPath
1.42 +1 -1 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Makefile.PL 2001/10/09 18:28:37 1.41
+++ Makefile.PL 2001/10/11 03:29:32 1.42
@@ -27,7 +27,7 @@
ModPerl::MM::WriteMakefile(
NAME => 'mod_perl',
VERSION => $VERSION,
-DIR => get_dirs_with_makefile(@remote_makefile_dirs),
+#DIR => get_dirs_with_makefile(@remote_makefile_dirs),
macro => {
MODPERL_SRC => $code->path,
PERL => $build->perl_config('perlpath'),
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/09 11:28:37
Modified:.Makefile.PL
Log:
clean xs/*.def and xs/*.exp
Revision ChangesPath
1.41 +1 -0 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Makefile.PL 2001/10/04 10:51:46 1.40
+++ Makefile.PL 2001/10/09 18:28:37 1.41
@@ -140,6 +140,7 @@
my $path = $code->path;
return [@{ $build->clean_files }, @scripts,
+, ,
map { "$path/$_"} @{ $code->clean_files }];
}
cvs commit: modperl-2.0 Makefile.PL
stas01/10/04 03:51:46
Modified:.Makefile.PL
Log:
- allow remote dirs to be included in the make process
- needed to override the DIR parameter and therefore duplicate parts from
MM::init_dirscan, to preserve original functionality (to search immediate
sub-dirs for Makefile.PL)
Revision ChangesPath
1.40 +26 -0 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile.PL 2001/09/18 16:05:16 1.39
+++ Makefile.PL 2001/10/04 10:51:46 1.40
@@ -8,6 +8,9 @@
use ModPerl::Code ();
use ModPerl::MM ();
+use File::Spec::Functions;
+use DirHandle ();
+
use Apache::TestTrace;
use Apache::TestMM qw(test);
@@ -16,12 +19,15 @@
my $build = Apache::Build->new(init => 1);
my $code = ModPerl::Code->new;
+my @remote_makefile_dirs = qw(docs/src/api/mod_perl-2.0);
+
my @scripts = qw(t/TEST);
configure();
ModPerl::MM::WriteMakefile(
NAME => 'mod_perl',
VERSION => $VERSION,
+DIR => get_dirs_with_makefile(@remote_makefile_dirs),
macro => {
MODPERL_SRC => $code->path,
PERL => $build->perl_config('perlpath'),
@@ -191,6 +197,26 @@
*) Rebuild Perl without malloc pollution (Configure -Ubincompat5005)
EOF
}
+}
+
+
+# by default only Makefile.PL's in the first level sub-dirs are
+# discovered. If you want to reach a Makefile.PL's in some remote
+# directories, pass them to this function.
+sub get_dirs_with_makefile {
+my @remove_makefile_dirs = @_;
+my %mf_dirs = ();
+
+# since we cannot override MM::init_dirscan, but at the same time
+# want to change $self->{DIR}, we have to reproduce
+# MM::init_dirscan's section on setting DIR
+for my $dir (@remote_makefile_dirs,
+ grep {-d} DirHandle->new(curdir())->read) {
+next if curdir() eq $dir || updir() eq $dir;
+next if -l $dir; # no symlinks per MakeMaker
+$mf_dirs{$dir}++ if -f catfile($dir, "Makefile.PL");
+}
+return [sort keys %mf_dirs];
}
package MY;
cvs commit: modperl-2.0 Makefile.PL
stas01/09/10 00:00:56
Modified:.Makefile.PL
Log:
- define APACHE_PREFIX/APACHE_LIBDIR Makefile vars for install target
re-use
- install libmodperl.so if built with MP_USE_DSO=1
Revision ChangesPath
1.38 +15 -3 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile.PL 2001/08/08 16:38:07 1.37
+++ Makefile.PL 2001/09/10 07:00:56 1.38
@@ -23,9 +23,11 @@
NAME => 'mod_perl',
VERSION => $VERSION,
macro => {
-MODPERL_SRC => $code->path,
-PERL => $build->perl_config('perlpath'),
-MOD_INSTALL => ModPerl::MM::mod_install(),
+MODPERL_SRC => $code->path,
+PERL => $build->perl_config('perlpath'),
+MOD_INSTALL => ModPerl::MM::mod_install(),
+APACHE_PREFIX => $build->apxs('-q' => 'prefix'),
+APACHE_LIBDIR => $build->apxs('-q' => 'libexecdir'),
},
clean => {
FILES => "@{ clean_files() }",
@@ -193,6 +195,8 @@
package MY;
+use Config;
+
sub MY::top_targets {
my $self = shift;
my $string = $self->MM::top_targets;
@@ -239,6 +243,14 @@
sub MY::post_initialize {
my $self = shift;
+
+# install libmodperl.so, MODPERL_LIB is not known here yet
+if (exists $build->{MP_USE_DSO} && $build->{MP_USE_DSO}) {
+my $MODPERL_LIB = join '.', $build->{MP_LIBNAME}, $Config{dlext};
+$self->{PM}->{"src/modules/perl/$MODPERL_LIB"} =
+"\$(APACHE_LIBDIR)/$MODPERL_LIB";
+}
+
#up one from the Apache2/ subdir
#so it can be found for 'use Apache2 ()'
$self->{PM}->{'lib/Apache2.pm'} = "blib/lib/Apache2.pm";
cvs commit: modperl-2.0 Makefile.PL
dougm 01/04/20 10:43:04
Modified:.Makefile.PL
Log:
need to push tables_dir into @INC when xs is not generated
Revision ChangesPath
1.34 +11 -5 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Makefile.PL 2001/04/12 16:03:55 1.33
+++ Makefile.PL 2001/04/20 17:42:57 1.34
@@ -73,7 +73,14 @@
generate_script($_);
}
-generate_xs($httpd_version) if $build->{MP_GENERATE_XS};
+my $tables_dir = tables_dir($httpd_version);
+
+unshift @INC, $tables_dir;
+
+if ($build->{MP_GENERATE_XS}) {
+print "generating XS code using $tables_dir...\n";
+generate_xs($httpd_version);
+}
}
sub post_configure {
@@ -97,7 +104,7 @@
$build->save;
}
-sub generate_xs {
+sub tables_dir {
my $httpd_version = shift;
my $tables_version = 'current';
@@ -105,10 +112,9 @@
#$httpd_version =~ /-dev$/ ? 'current' : $httpd_version;
my $tables_dir = "xs/tables/$tables_version";
-unshift @INC, $tables_dir;
-
-print "generating XS code using $tables_dir...\n";
+}
+sub generate_xs {
require ModPerl::WrapXS;
my $xs = ModPerl::WrapXS->new;
cvs commit: modperl-2.0 Makefile.PL
dougm 01/04/12 09:03:55 Modified:.Makefile.PL Log: make sure test files a cleaned Revision ChangesPath 1.33 +1 -0 modperl-2.0/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Makefile.PL 2001/04/11 23:00:56 1.32 +++ Makefile.PL 2001/04/12 16:03:55 1.33 @@ -234,6 +234,7 @@ my $self = shift; my $string = $self->MM::clean(@_); ModPerl::MM::add_dep(\$string, clean => 'modperl_src_clean'); +ModPerl::MM::add_dep(\$string, clean => 'test_clean'); $string; }
cvs commit: modperl-2.0 Makefile.PL
dougm 01/04/02 02:17:41
Modified:.Makefile.PL
Log:
hook into test stuff
Revision ChangesPath
1.30 +23 -1 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile.PL 2001/03/27 02:32:49 1.29
+++ Makefile.PL 2001/04/02 09:17:40 1.30
@@ -3,15 +3,20 @@
use warnings FATAL => 'all';
use lib qw(lib);
+use Config;
use Apache::Build ();
use ModPerl::Code ();
use ModPerl::MM ();
+use lib qw(Apache-Test/lib);
+use Apache::TestMM qw(test);
+
our $VERSION;
my $build = Apache::Build->new(init => 1);
my $code = ModPerl::Code->new;
+my @scripts = qw(t/TEST);
configure();
ModPerl::MM::WriteMakefile(
@@ -58,6 +63,10 @@
#ModPerl::MM will use Apache::BuildConfig in subdir/Makefile.PL's
$build->save;
+for (@scripts) {
+generate_script($_);
+}
+
generate_xs($httpd_version) if $build->{MP_GENERATE_XS};
}
@@ -103,6 +112,19 @@
shift @INC;
}
+sub generate_script {
+my $file = shift;
+open my $in, "$file.PL" or die "Couldn't open $file.PL: $!";
+open my $out, '>', $file or die "Couldn't open $file: $!";
+print "generating script...$file\n";
+print $out "#!$Config{perlpath}\n",
+ "# WARNING: this file is generated, edit $file.PL instead\n",
+ join '', <$in>;
+close $out or die "close $file: $!";
+close $in;
+chmod 0544, $file;
+}
+
sub echo_cmd {
my $cmd = shift;
print "$cmd\n";
@@ -112,7 +134,7 @@
sub clean_files {
my $path = $code->path;
-return [@{ $build->clean_files },
+return [@{ $build->clean_files }, @scripts,
map { "$path/$_"} @{ $code->clean_files }];
}
cvs commit: modperl-2.0 Makefile.PL
dougm 01/03/26 18:32:50
Modified:.Makefile.PL
Log:
only one version of the source tables is currently supported, so just hardwire it
for now
Revision ChangesPath
1.29 +3 -2 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile.PL 2001/03/26 22:07:12 1.28
+++ Makefile.PL 2001/03/27 02:32:49 1.29
@@ -85,8 +85,9 @@
sub generate_xs {
my $httpd_version = shift;
-my $tables_version =
- $httpd_version =~ /-dev$/ ? 'current' : $httpd_version;
+my $tables_version = 'current';
+#XXX: support versioning
+#$httpd_version =~ /-dev$/ ? 'current' : $httpd_version;
my $tables_dir = "xs/tables/$tables_version";
unshift @INC, $tables_dir;
cvs commit: modperl-2.0 Makefile.PL
dougm 01/03/04 20:11:01 Modified:.Makefile.PL Log: shortcuts for scanning and generating code Revision ChangesPath 1.26 +6 -0 modperl-2.0/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- Makefile.PL 2001/01/04 07:23:17 1.25 +++ Makefile.PL 2001/03/05 04:11:01 1.26 @@ -159,6 +159,12 @@ $string .= <<'EOF'; +source_scan: + $(PERL) util/source_scan.pl + +xs_generate: + $(PERL) util/xs_generate.pl + etags: $(SHELL) util/make_etags
cvs commit: modperl-2.0 Makefile.PL
dougm 01/01/02 12:20:03
Modified:.Makefile.PL
Log:
remove MP_CPP now that we have a .c.cpp rule
Revision ChangesPath
1.22 +0 -21 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.PL 2000/06/12 03:25:04 1.21
+++ Makefile.PL 2001/01/02 20:20:00 1.22
@@ -12,11 +12,6 @@
my $build = Apache::Build->new;
my $code = ModPerl::Code->new;
-if ($build->{MP_CPP}) {
-make();
-exit;
-}
-
configure();
ModPerl::MM::WriteMakefile(
@@ -84,22 +79,6 @@
my $cmd = shift;
print "$cmd\n";
system($cmd) == 0 or exit(1);
-}
-
-sub make {
-my $ccopts = $build->ccopts;
-my @inc = $build->inc;
-my $cc = $build->perl_config('cc');
-
-chdir $code->path;
-
-$ccopts .= " -E" if $build->{MP_CPP};
-
-for (sort { (stat $b)[9] <=> (stat $a)[9] } @{ $code->c_files }) {
-echo_cmd "$cc $ccopts @inc -c $_";
-}
-
-chdir $build->cwd;
}
sub clean_files {
cvs commit: modperl-2.0 Makefile.PL
dougm 00/05/26 11:35:16 Modified:.Makefile.PL Log: add etags target Revision ChangesPath 1.20 +3 -0 modperl-2.0/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Makefile.PL 2000/04/30 18:36:50 1.19 +++ Makefile.PL 2000/05/26 18:35:15 1.20 @@ -177,6 +177,9 @@ $string .= <<'EOF'; +etags: + @(cd $(MODPERL_SRC) && find . -name '*.[ch]' | etags -L -); + modperl_lib: @(cd $(MODPERL_SRC) && $(MAKE));
cvs commit: modperl-2.0 Makefile.PL
dougm 00/04/26 00:28:45 Modified:.Makefile.PL Log: save $build after Makefile is generated Revision ChangesPath 1.16 +3 -3 modperl-2.0/Makefile.PL Index: Makefile.PL === RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.PL 2000/04/25 05:16:07 1.15 +++ Makefile.PL 2000/04/26 07:28:45 1.16 @@ -50,12 +50,12 @@ printf "Configuring Apache/%s mod_perl/%s Perl/v%vd\n", $httpd_version, $VERSION, $^V; -$build->save; -$build->save_ldopts; - $code->generate; $build->write_src_makefile; + +$build->save; +$build->save_ldopts; printf "Will build mod_perl %s as %s\n", $build->is_dynamic ? "shared" : "static",
cvs commit: modperl-2.0 Makefile.PL
dougm 00/04/24 21:25:42
Modified:lib/Apache Build.pm
.Makefile.PL
Log:
workaround MakeMaker braindeadness
Revision ChangesPath
1.11 +5 -2 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Build.pm 2000/04/21 19:43:34 1.10
+++ Build.pm 2000/04/25 04:25:40 1.11
@@ -341,16 +341,19 @@
(my $obj = $self->freeze) =~ s/^//;
open my $fh, '>', $file or die "open $file: $!";
+#work around autosplit braindeadness
+my $package = 'package Apache::BuildConfig';
+
print $fh < $VERSION,
macro => {
MODPERL_SRC => $code->path,
+PERL => $build->perl_config('perl5'),
},
clean => {
FILES => "@{ clean_files() }",
cvs commit: modperl-2.0 Makefile.PL
dougm 00/04/24 20:47:32
Modified:.Makefile.PL
Log:
fix 'make clean'
Revision ChangesPath
1.13 +12 -4 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.PL 2000/04/21 20:18:09 1.12
+++ Makefile.PL 2000/04/25 03:47:31 1.13
@@ -24,6 +24,9 @@
WriteMakefile(
NAME => 'mod_perl',
VERSION => $VERSION,
+macro => {
+MODPERL_SRC => $code->path,
+},
clean => {
FILES => "@{ clean_files() }",
},
@@ -148,25 +151,30 @@
sub MY::top_targets {
my $self = shift;
my $string = $self->MM::top_targets;
-my $path = $code->path;
for (qw(SHARED STATIC)) {
$string .= <{"MODPERL_LIB_$_"}:
- @(cd $path && \$(MAKE) \$\@);
+ @(cd \$(MODPERL_SRC) && \$(MAKE) \$\@);
EOF
}
+$string .= <<'EOF';
+
+modperl_src_clean:
+ @(cd $(MODPERL_SRC) && $(MAKE) clean);
+
+EOF
+
$string;
}
sub MY::clean {
my $self = shift;
my $string = $self->MM::clean(@_);
-my $path = $code->path;
-$string .= "\t-cd $path && \$(MAKE) clean\n";
+$string =~ s/(clean\s+::)/$1 modperl_src_clean /;
$string;
}
cvs commit: modperl-2.0 Makefile.PL
dougm 00/04/21 13:18:09
Modified:.Makefile.PL
Log:
skip autosplit
Revision ChangesPath
1.12 +4 -0 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.PL 2000/04/21 19:43:33 1.11
+++ Makefile.PL 2000/04/21 20:18:09 1.12
@@ -181,3 +181,7 @@
'';
}
+
+sub MY::tool_autosplit {
+'';
+}
cvs commit: modperl-2.0 Makefile.PL
dougm 00/04/15 17:50:05
Modified:.Makefile.PL
Log:
compile most recently modifified files first
Revision ChangesPath
1.7 +3 -1 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.PL 2000/04/16 00:28:39 1.6
+++ Makefile.PL 2000/04/16 00:50:04 1.7
@@ -68,7 +68,9 @@
my $flags = "-g -Wall";
$flags .= " -E" if $opts->{E};
-for ($single_file ? $single_file : $code->c_files) {
+my @c_files = $single_file ? $single_file : $code->c_files;
+
+for (sort { (stat $b)[9] <=> (stat $a)[9] } @c_files) {
echo_cmd "$cc $flags $ccopts @inc -c $_";
return if $single_file;
}
cvs commit: modperl-2.0 Makefile.PL
dougm 00/04/15 17:28:39
Modified:.Makefile.PL
Log:
-E option to use cpp
Revision ChangesPath
1.6 +8 -4 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.PL 2000/04/15 19:04:20 1.5
+++ Makefile.PL 2000/04/16 00:28:39 1.6
@@ -20,9 +20,9 @@
{
use Getopt::Std;
my %opts;
-getopts('cm:', \%opts);
+getopts('Ecm:', \%opts);
configure()if $opts{c};
-make($opts{m}) if $opts{m};
+make(\%opts) if $opts{m};
}
sub configure {
@@ -54,7 +54,8 @@
}
sub make {
-my $target = shift;
+my $opts = shift;
+my $target = $opts->{m};
return clean() if $target eq 'c';
my $single_file = $target =~ /\.c$/ ? $target : "";
@@ -64,8 +65,11 @@
chdir $code->path;
+my $flags = "-g -Wall";
+$flags .= " -E" if $opts->{E};
+
for ($single_file ? $single_file : $code->c_files) {
-echo_cmd "$cc -g -Wall $ccopts @inc -c $_";
+echo_cmd "$cc $flags $ccopts @inc -c $_";
return if $single_file;
}
cvs commit: modperl-2.0 Makefile.PL
dougm 00/04/15 12:04:20
Modified:.Makefile.PL
Log:
option to compile a single file ala -mmodperl_foo.c
Revision ChangesPath
1.5 +3 -1 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.PL 2000/04/15 17:38:44 1.4
+++ Makefile.PL 2000/04/15 19:04:20 1.5
@@ -56,6 +56,7 @@
sub make {
my $target = shift;
return clean() if $target eq 'c';
+my $single_file = $target =~ /\.c$/ ? $target : "";
my $ccopts = ExtUtils::Embed::ccopts();
my @inc = $build->inc;
@@ -63,8 +64,9 @@
chdir $code->path;
-for ($code->c_files) {
+for ($single_file ? $single_file : $code->c_files) {
echo_cmd "$cc -g -Wall $ccopts @inc -c $_";
+return if $single_file;
}
my @objs = $code->o_files;
