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/10/27 07:55:24 UTC
cvs commit: httpd-apreq-2/win32 Configure.pl libapreq2.mak mod_apreq.mak test_cgi.mak testall.mak
randyk 2003/10/26 22:55:24
Modified: win32 Configure.pl libapreq2.mak mod_apreq.mak
test_cgi.mak testall.mak
Log:
Adjust Win32 targets so as to build with recent commits. The main
change is to build libapreq2 as a dll now, rather than a static lib.
Revision Changes Path
1.23 +16 -27 httpd-apreq-2/win32/Configure.pl
Index: Configure.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/Configure.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Configure.pl 24 Oct 2003 04:31:21 -0000 1.22
+++ Configure.pl 27 Oct 2003 06:55:24 -0000 1.23
@@ -64,9 +64,9 @@
}
my $test = << 'END';
-TEST: $(LIBAPREQ) $(MOD) $(CGI)
+TEST: $(LIBAPREQ) $(MOD)
$(MAKE) /nologo /f $(CFG_HOME)\$(TESTALL).mak CFG="$(TESTALL) - Win32 $(CFG)" APACHE="$(APACHE)" APREQ_HOME="$(APREQ_HOME)"
- set PATH=%PATH%;$(APACHE)\bin
+ set PATH=%PATH%;$(APACHE)\bin;$(APREQ_HOME)\win32\libs
cd $(LIBDIR) && $(TESTALL).exe -v
cd $(APREQ_HOME)
$(MAKE) /nologo /f $(CFG_HOME)\$(CGITEST).mak CFG="$(CGITEST) - Win32 $(CFG)" APACHE="$(APACHE)" APREQ_HOME="$(APREQ_HOME)"
@@ -139,7 +139,6 @@
nmake - builds the libapreq2 library
nmake test - runs the supplied tests
nmake mod_apreq - builds mod_apreq
- nmake libapreq2_cgi - builds libapreq2_cgi
nmake clean - clean
nmake install - install the C libraries
nmake perl_glue - build the perl glue
@@ -280,26 +279,21 @@
END
chdir "$apreq_home/env";
- my %defs = (mod_apreq => 'mod_apreq.def',
- libapreq_cgi => 'libapreq2_cgi.def');
my $match = qr{^apreq_env};
- foreach my $file(qw(mod_apreq libapreq_cgi)) {
- my %fns = ();
- open my $fh, "<$file.c"
- or die "Cannot open env/$file.c: $!";
- while (<$fh>) {
- next unless /^APREQ_DECLARE\([^\)]+\)\s*(\w+)/;
- my $fn = $1;
- $fns{$fn}++ if $fn =~ /$match/;
- }
- close $fh;
- open my $def, ">../win32/$defs{$file}"
- or die "Cannot open win32/$defs{$file}: $!";
- print $def $preamble;
- print $def $_, "\n" for (sort keys %fns);
- close $def;
- }
-
+ my %fns = ();
+ open my $fh, "<mod_apreq.c"
+ or die "Cannot open env/mod_apreq.c: $!";
+ while (<$fh>) {
+ next unless /^APREQ_DECLARE\([^\)]+\)\s*(\w+)/;
+ my $fn = $1;
+ $fns{$fn}++ if $fn =~ /$match/;
+ }
+ close $fh;
+ open my $def, ">../win32/mod_apreq.def"
+ or die "Cannot open win32/mod_apreq.def: $!";
+ print $def $preamble;
+ print $def $_, "\n" for (sort keys %fns);
+ close $def;
}
sub fetch_apxs {
@@ -355,7 +349,6 @@
TESTALL=testall
CGITEST=test_cgi
MOD=mod_apreq
-CGI=libapreq2_cgi
!IF "$(CFG)" != "Release" && "$(CFG)" != "Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
@@ -398,9 +391,6 @@
$(MOD): $(LIBAPREQ)
$(MAKE) /nologo /f $(CFG_HOME)\$(MOD).mak CFG="$(MOD) - Win32 $(CFG)" APACHE="$(APACHE)" APREQ_HOME="$(APREQ_HOME)"
-$(CGI): $(LIBAPREQ)
- $(MAKE) /nologo /f $(CFG_HOME)\$(CGI).mak CFG="$(CGI) - Win32 $(CFG)" APACHE="$(APACHE)" APREQ_HOME="$(APREQ_HOME)"
-
PERL_GLUE: $(MOD)
cd $(PERLGLUE)
$(PERL) Makefile.PL
@@ -441,7 +431,6 @@
@echo nmake - builds the libapreq2 library
@echo nmake test - runs the supplied tests
@echo nmake mod_apreq - builds mod_apreq
- @echo nmake libapreq2_cgi - builds libapreq2_cgi
@echo nmake clean - clean
@echo nmake install - install the C libraries
@echo nmake perl_glue - build the perl glue
1.2 +33 -20 httpd-apreq-2/win32/libapreq2.mak
Index: libapreq2.mak
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/libapreq2.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libapreq2.mak 24 Oct 2003 04:31:21 -0000 1.1
+++ libapreq2.mak 27 Oct 2003 06:55:24 -0000 1.2
@@ -42,50 +42,58 @@
!IF "$(CFG)" == "libapreq2 - Win32 Release"
-ALL : "$(OUTDIR)\libapreq2.lib"
+ALL : "$(OUTDIR)\libapreq2.dll"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /I"$(APACHE)\include" /Fp"$(INTDIR)\libapreq2.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /I"$(APACHE)\include" /I"$(APREQ_HOME)\src" /Fp"$(INTDIR)\libapreq2.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc"
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /nodefaultlib /out:"$(OUTDIR)\libapreq2.lib"
-LIB32_OBJS= \
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /machine:I386 /out:"$(OUTDIR)\libapreq2.dll" /implib:"$(OUTDIR)\libapreq2.lib"
+LINK32_OBJS= \
"$(INTDIR)\apreq.obj" \
"$(INTDIR)\apreq_cookie.obj" \
"$(INTDIR)\apreq_params.obj" \
"$(INTDIR)\apreq_parsers.obj" \
- "$(INTDIR)\apreq_tables.obj"
-
-"$(OUTDIR)\libapreq2.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
- $(LIB32) @<<
- $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+ "$(INTDIR)\apreq_env.obj" \
+ "$(INTDIR)\apreq_tables.obj" \
+ "$(APACHE)\lib\libapr.lib" \
+ "$(APACHE)\lib\libaprutil.lib"
+
+"$(OUTDIR)\libapreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(DEF_FLAGS) $(LINK32_OBJS)
<<
!ELSEIF "$(CFG)" == "libapreq2 - Win32 Debug"
-ALL : "$(OUTDIR)\libapreq2.lib"
+ALL : "$(OUTDIR)\libapreq2.dll"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /I"$(APACHE)\include" /Fp"$(INTDIR)\libapreq2.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /I"$(APACHE)\include" /I"$(APREQ_HOME)\src" /Fp"$(INTDIR)\libapreq2.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc"
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\libapreq2.lib"
-LIB32_OBJS= \
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libapreq2.pdb" /debug /machine:I386 /out:"$(OUTDIR)\libapreq2.dll" /implib:"$(OUTDIR)\libapreq2.lib" /pdbtype:sept
+LINK32_OBJS= \
"$(INTDIR)\apreq.obj" \
"$(INTDIR)\apreq_cookie.obj" \
"$(INTDIR)\apreq_params.obj" \
"$(INTDIR)\apreq_parsers.obj" \
- "$(INTDIR)\apreq_tables.obj"
-
-"$(OUTDIR)\libapreq2.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
- $(LIB32) @<<
- $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+ "$(INTDIR)\apreq_env.obj" \
+ "$(INTDIR)\apreq_tables.obj" \
+ "$(APACHE)\lib\libapr.lib" \
+ "$(APACHE)\lib\libaprutil.lib"
+
+"$(OUTDIR)\libapreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(DEF_FLAGS) $(LINK32_OBJS)
<<
!ENDIF
@@ -149,6 +157,11 @@
SOURCE=$(APREQ_HOME)\src\apreq_tables.c
"$(INTDIR)\apreq_tables.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+SOURCE=$(APREQ_HOME)\src\apreq_env.c
+
+"$(INTDIR)\apreq_env.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
1.7 +2 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_apreq.mak 24 Oct 2003 04:31:21 -0000 1.6
+++ mod_apreq.mak 27 Oct 2003 06:55:24 -0000 1.7
@@ -53,7 +53,7 @@
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_apreq.bsc"
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /def:$(CFG_HOME)\mod_apreq.def /machine:I386 /out:"$(OUTDIR)\mod_apreq.so" /implib:"$(OUTDIR)\mod_apreq.lib"
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /machine:I386 /out:"$(OUTDIR)\mod_apreq.so" /implib:"$(OUTDIR)\mod_apreq.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_apreq.obj" \
"$(APACHE)\lib\libapr.lib" \
@@ -78,7 +78,7 @@
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_apreq.bsc"
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /def:$(CFG_HOME)\mod_apreq.def /pdb:"$(OUTDIR)\mod_apreq.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_apreq.so" /implib:"$(OUTDIR)\mod_apreq.lib" /pdbtype:sept
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\mod_apreq.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_apreq.so" /implib:"$(OUTDIR)\mod_apreq.lib" /pdbtype:sept
LINK32_OBJS= \
"$(INTDIR)\mod_apreq.obj" \
"$(APACHE)\lib\libapr.lib" \
1.5 +0 -2 httpd-apreq-2/win32/test_cgi.mak
Index: test_cgi.mak
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/test_cgi.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- test_cgi.mak 24 Oct 2003 04:31:21 -0000 1.4
+++ test_cgi.mak 27 Oct 2003 06:55:24 -0000 1.5
@@ -83,7 +83,6 @@
LINK32_FLAGS=kernel32.lib wsock32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\test_cgi.pdb" /machine:I386 /out:"$(OUTDIR)\test_cgi.exe"
LINK32_OBJS= \
"$(INTDIR)\test_cgi.obj" \
- "$(OUTDIR)\libapreq2_cgi.lib" \
"$(OUTDIR)\libapreq2.lib" \
"$(APACHE)\lib\libapr.lib" \
"$(APACHE)\lib\libaprutil.lib"
@@ -140,7 +139,6 @@
LINK32_FLAGS=kernel32.lib wsock32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\test_cgi.pdb" /debug /machine:I386 /out:"$(OUTDIR)\test_cgi.exe" /pdbtype:sept
LINK32_OBJS= \
"$(INTDIR)\test_cgi.obj" \
- "$(OUTDIR)\libapreq2_cgi.lib" \
"$(OUTDIR)\libapreq2.lib" \
"$(APACHE)\lib\libapr.lib" \
"$(APACHE)\lib\libaprutil.lib"
1.8 +0 -8 httpd-apreq-2/win32/testall.mak
Index: testall.mak
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/testall.mak,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testall.mak 24 Oct 2003 04:31:21 -0000 1.7
+++ testall.mak 27 Oct 2003 06:55:24 -0000 1.8
@@ -84,7 +84,6 @@
LINK32_OBJS= \
"$(INTDIR)\cookie.obj" \
"$(INTDIR)\CuTest.obj" \
- "$(INTDIR)\env.obj" \
"$(INTDIR)\params.obj" \
"$(INTDIR)\testall.obj" \
"$(OUTDIR)\libapreq2.lib" \
@@ -146,7 +145,6 @@
LINK32_OBJS= \
"$(INTDIR)\cookie.obj" \
"$(INTDIR)\CuTest.obj" \
- "$(INTDIR)\env.obj" \
"$(INTDIR)\params.obj" \
"$(INTDIR)\testall.obj" \
"$(OUTDIR)\libapreq2.lib" \
@@ -173,12 +171,6 @@
SOURCE=$(APREQ_HOME)\t\CuTest.c
"$(INTDIR)\CuTest.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=$(APREQ_HOME)\t\env.c
-
-"$(INTDIR)\env.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)