You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by ra...@apache.org on 2003/07/01 04:21:38 UTC
cvs commit: httpd-apreq-2/win32 Configure.pl
randyk 2003/06/30 19:21:38
Modified: . INSTALL
win32 Configure.pl
Log:
For win32:
- add perl_glue and perl_test Makefile targets
- clean up files in glue/perl with 'nmake test'
- generate build/doxygen.conf.win32 to reflect Win32 Perl and doxysearch paths
Revision Changes Path
1.4 +2 -4 httpd-apreq-2/INSTALL
Index: INSTALL
===================================================================
RCS file: /home/cvs/httpd-apreq-2/INSTALL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- INSTALL 30 Jun 2003 22:43:15 -0000 1.3
+++ INSTALL 1 Jul 2003 02:21:38 -0000 1.4
@@ -39,7 +39,5 @@
C:\httpd-apreq-2\win32> nmake
C:\httpd-apreq-2\win32> nmake test
C:\httpd-apreq-2\win32> nmake mod_apreq
- C:\httpd-apreq-2\win32> cd ..\glue\perl
- C:\httpd-apreq-2\glue\perl> perl Makefile.PL
- C:\httpd-apreq-2\glue\perl> nmake
- C:\httpd-apreq-2\glue\perl> nmake test
+ C:\httpd-apreq-2\win32> nmake perl_glue
+ C:\httpd-apreq-2\win32> nmake perl_test
1.6 +30 -3 httpd-apreq-2/win32/Configure.pl
Index: Configure.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/Configure.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Configure.pl 16 Jun 2003 05:54:11 -0000 1.5
+++ Configure.pl 1 Jul 2003 02:21:38 -0000 1.6
@@ -4,6 +4,7 @@
use Getopt::Long;
require File::Spec;
require Win32;
+use File::Basename;
my ($apache, $debug, $help, $no_perl);
my $result = GetOptions( 'with-apache=s' => \$apache,
'debug' => \$debug,
@@ -34,7 +35,7 @@
}
}
-open my $make, '>Makefile' or die qq{Cannot open Makefile: $!};
+open(my $make, '>Makefile') or die qq{Cannot open Makefile: $!};
print $make <<"END";
# Microsoft Developer Studio Generated NMAKE File.
@@ -52,10 +53,23 @@
docs:
cd ..
- "$doxygen" build\\doxygen.conf
+ "$doxygen" build\\doxygen.conf.win32
cd win32
END
+
+ my $bin_abspath = Win32::GetShortPathName(dirname(which('doxysearch')));
+ open(my $conf, '../build/doxygen.conf')
+ or die "Cannot read ../build/doxygen.conf: $!";
+ open(my $win32_conf, '>../build/doxygen.conf.win32')
+ or die "Cannot write to ../build/doxygen.conf.win32: $!";
+ while (<$conf>) {
+ s/^(PERL_PATH\s+=\s+).*/$1"$^X"/;
+ s/^(BIN_ABSPATH\s+=\s+).*/$1$bin_abspath/;
+ print $win32_conf $_;
+ }
+ close $conf;
+ close $win32_conf;
}
close $make;
@@ -70,6 +84,8 @@
nmake mod_apreq - builds mod_apreq
nmake libapreq_cgi - builds libapreq_cgi
nmake clean - clean
+ nmake perl_glue - build the perl glue
+ nmake perl_test - test the perl glue
END
if ($doxygen) {
print << 'END';
@@ -243,7 +259,10 @@
CLEAN:
cd libs
$(RM_F) *.pch *.exe *.exp *.lib *.pch *.idb *.so *.dll *.obj
- cd ..
+!IF EXIST("..\glue\perl\Makefile")
+ cd ..\..\glue\perl
+ $(MAKE) /nologo clean
+!ENDIF
TEST: $(LIBAPREQ)
$(MAKE) /nologo /f $(TESTALL).mak CFG="$(TESTALL) - Win32 $(CFG)" APACHE="$(APACHE)"
@@ -256,3 +275,11 @@
$(CGI): $(LIBAPREQ)
$(MAKE) /nologo /f $(CGI).mak CFG="$(CGI) - Win32 $(CFG)" APACHE="$(APACHE)"
+PERL_GLUE: $(LIBAPREQ) $(MOD)
+ cd ..\glue\perl
+ $(PERL) Makefile.PL
+ $(MAKE)
+
+PERL_TEST: PERL_GLUE
+ cd ..\glue\perl
+ $(MAKE) test