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/24 06:31:21 UTC
cvs commit: httpd-apreq-2/win32 libapreq2.mak libapreq2_cgi.mak Configure.pl apreq2_win32.pl mod_apreq.mak test_cgi.mak testall.mak libapreq.mak libapreq_cgi.mak
randyk 2003/10/23 21:31:21
Modified: build xsbuilder.pl
env/t TEST.PL
win32 Configure.pl apreq2_win32.pl mod_apreq.mak
test_cgi.mak testall.mak
Added: win32 libapreq2.mak libapreq2_cgi.mak
Removed: win32 libapreq.mak libapreq_cgi.mak
Log:
For Win32, changed the names of the built libraries
libapreq.lib -> libapreq2.lib
libapreq_cgi.lib -> libapreq2_cgi.lib.
Revision Changes Path
1.13 +1 -1 httpd-apreq-2/build/xsbuilder.pl
Index: xsbuilder.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/build/xsbuilder.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xsbuilder.pl 17 Oct 2003 16:56:27 -0000 1.12
+++ xsbuilder.pl 24 Oct 2003 04:31:21 -0000 1.13
@@ -30,7 +30,7 @@
my $apache_dir = Apache::Build->build_config()->dir;
($apache_includes = "-I$apache_dir" . '/include') =~ s!\\!/!g;
($apr_libs = $apache_dir . '/lib') =~ s!\\!/!g;
- $apreq_libname = "apreq";
+ $apreq_libname = "apreq2";
}
else {
slurp my $config => "$base_dir/config.status";
1.6 +1 -1 httpd-apreq-2/env/t/TEST.PL
Index: TEST.PL
===================================================================
RCS file: /home/cvs/httpd-apreq-2/env/t/TEST.PL,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TEST.PL 13 Oct 2003 18:24:46 -0000 1.5
+++ TEST.PL 24 Oct 2003 04:31:21 -0000 1.6
@@ -68,7 +68,7 @@
all: $lib
$lib: $name.c
- \$(APXS) -L../../../win32/libs -I../../../src -llibapreq -llibhttpd -lmod_apreq $dversion -p -I$self->{cmodules_dir} -c $name.c
+ \$(APXS) -L../../../win32/libs -I../../../src -llibapreq2 -llibhttpd -lmod_apreq $dversion -p -I$self->{cmodules_dir} -c $name.c
clean:
-erase @goners vc60.pdb
1.22 +10 -9 httpd-apreq-2/win32/Configure.pl
Index: Configure.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/Configure.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Configure.pl 24 Oct 2003 02:10:55 -0000 1.21
+++ Configure.pl 24 Oct 2003 04:31:21 -0000 1.22
@@ -136,10 +136,10 @@
A Makefile has been generated in $apreq_home.
You can now run
- nmake - builds the libapreq library
+ nmake - builds the libapreq2 library
nmake test - runs the supplied tests
nmake mod_apreq - builds mod_apreq
- nmake libapreq_cgi - builds libapreq_cgi
+ nmake libapreq2_cgi - builds libapreq2_cgi
nmake clean - clean
nmake install - install the C libraries
nmake perl_glue - build the perl glue
@@ -280,6 +280,8 @@
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 = ();
@@ -291,8 +293,8 @@
$fns{$fn}++ if $fn =~ /$match/;
}
close $fh;
- open my $def, ">../win32/$file.def"
- or die "Cannot open win32/$file.def: $!";
+ 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;
@@ -349,11 +351,11 @@
__DATA__
-LIBAPREQ=libapreq
+LIBAPREQ=libapreq2
TESTALL=testall
CGITEST=test_cgi
MOD=mod_apreq
-CGI=libapreq_cgi
+CGI=libapreq2_cgi
!IF "$(CFG)" != "Release" && "$(CFG)" != "Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
@@ -436,11 +438,10 @@
cd $(APREQ_HOME)
HELP:
- @echo nmake - builds the libapreq library
- @echo nmake - builds the libapreq library
+ @echo nmake - builds the libapreq2 library
@echo nmake test - runs the supplied tests
@echo nmake mod_apreq - builds mod_apreq
- @echo nmake libapreq_cgi - builds libapreq_cgi
+ @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 +1 -1 httpd-apreq-2/win32/apreq2_win32.pl
Index: apreq2_win32.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/apreq2_win32.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apreq2_win32.pl 24 Oct 2003 02:10:55 -0000 1.1
+++ apreq2_win32.pl 24 Oct 2003 04:31:21 -0000 1.2
@@ -108,7 +108,7 @@
my %apreq_args = (APREQ_MAJOR_VERSION => $vers{MAJOR},
APREQ_DOTTED_VERSION => $dotted,
- APREQ_LIBNAME => 'libapreq.lib',
+ APREQ_LIBNAME => 'libapreq2.lib',
prefix => $prefix,
exec_prefix => $prefix,
bindir => "$prefix/bin",
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_apreq.mak 21 Jul 2003 00:46:44 -0000 1.5
+++ mod_apreq.mak 24 Oct 2003 04:31:21 -0000 1.6
@@ -59,7 +59,7 @@
"$(APACHE)\lib\libapr.lib" \
"$(APACHE)\lib\libaprutil.lib" \
"$(APACHE)\lib\libhttpd.lib" \
- "$(OUTDIR)\libapreq.lib"
+ "$(OUTDIR)\libapreq2.lib"
"$(OUTDIR)\mod_apreq.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -84,7 +84,7 @@
"$(APACHE)\lib\libapr.lib" \
"$(APACHE)\lib\libaprutil.lib" \
"$(APACHE)\lib\libhttpd.lib" \
- "$(OUTDIR)\libapreq.lib"
+ "$(OUTDIR)\libapreq2.lib"
"$(OUTDIR)\mod_apreq.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
1.4 +4 -4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test_cgi.mak 24 Oct 2003 00:25:08 -0000 1.3
+++ test_cgi.mak 24 Oct 2003 04:31:21 -0000 1.4
@@ -83,8 +83,8 @@
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)\libapreq_cgi.obj" \
- "$(OUTDIR)\libapreq.lib" \
+ "$(OUTDIR)\libapreq2_cgi.lib" \
+ "$(OUTDIR)\libapreq2.lib" \
"$(APACHE)\lib\libapr.lib" \
"$(APACHE)\lib\libaprutil.lib"
@@ -140,8 +140,8 @@
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)\libapreq_cgi.obj" \
- "$(OUTDIR)\libapreq.lib" \
+ "$(OUTDIR)\libapreq2_cgi.lib" \
+ "$(OUTDIR)\libapreq2.lib" \
"$(APACHE)\lib\libapr.lib" \
"$(APACHE)\lib\libaprutil.lib"
1.7 +2 -2 httpd-apreq-2/win32/testall.mak
Index: testall.mak
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/testall.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testall.mak 21 Jul 2003 00:46:44 -0000 1.6
+++ testall.mak 24 Oct 2003 04:31:21 -0000 1.7
@@ -87,7 +87,7 @@
"$(INTDIR)\env.obj" \
"$(INTDIR)\params.obj" \
"$(INTDIR)\testall.obj" \
- "$(OUTDIR)\libapreq.lib" \
+ "$(OUTDIR)\libapreq2.lib" \
"$(APACHE)\lib\libapr.lib" \
"$(APACHE)\lib\libaprutil.lib" \
"$(APACHE)\lib\libhttpd.lib" \
@@ -149,7 +149,7 @@
"$(INTDIR)\env.obj" \
"$(INTDIR)\params.obj" \
"$(INTDIR)\testall.obj" \
- "$(OUTDIR)\libapreq.lib" \
+ "$(OUTDIR)\libapreq2.lib" \
"$(APACHE)\lib\libapr.lib" \
"$(APACHE)\lib\libaprutil.lib" \
"$(APACHE)\lib\libhttpd.lib" \
1.1 httpd-apreq-2/win32/libapreq2.mak
Index: libapreq2.mak
===================================================================
# Microsoft Developer Studio Generated NMAKE File, Based on libapreq.dsp
!IF "$(APACHE)" == ""
!MESSAGE No Apache directory was specified.
!MESSAGE This makefile is not to be run directly.
!MESSAGE Please run Configure.bat, and then $(MAKE) on Makefile.
!ERROR
!ENDIF
!IF "$(CFG)" == ""
CFG=libapreq2 - Win32 Release
!MESSAGE No configuration specified. Defaulting to libapreq2 - Win32 Release.
!ENDIF
!IF "$(CFG)" != "libapreq2 - Win32 Release" && "$(CFG)" != "libapreq2 - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "libapreq2.mak" CFG="libapreq2 - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "libapreq2 - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "libapreq2 - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
CPP=cl.exe
RSC=rc.exe
CFG_HOME=$(APREQ_HOME)\win32
OUTDIR=$(CFG_HOME)\libs
INTDIR=$(CFG_HOME)\libs
!IF "$(CFG)" == "libapreq2 - Win32 Release"
ALL : "$(OUTDIR)\libapreq2.lib"
"$(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
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc"
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /nodefaultlib /out:"$(OUTDIR)\libapreq2.lib"
LIB32_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)
<<
!ELSEIF "$(CFG)" == "libapreq2 - Win32 Debug"
ALL : "$(OUTDIR)\libapreq2.lib"
"$(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
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc"
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /out:"$(OUTDIR)\libapreq2.lib"
LIB32_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)
<<
!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
!IF "$(CFG)" == "libapreq2 - Win32 Release" || "$(CFG)" == "libapreq2 - Win32 Debug"
SOURCE=$(APREQ_HOME)\src\apreq.c
"$(INTDIR)\apreq.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
SOURCE=$(APREQ_HOME)\src\apreq_cookie.c
"$(INTDIR)\apreq_cookie.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
SOURCE=$(APREQ_HOME)\src\apreq_params.c
"$(INTDIR)\apreq_params.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
SOURCE=$(APREQ_HOME)\src\apreq_parsers.c
"$(INTDIR)\apreq_parsers.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
SOURCE=$(APREQ_HOME)\src\apreq_tables.c
"$(INTDIR)\apreq_tables.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
1.1 httpd-apreq-2/win32/libapreq2_cgi.mak
Index: libapreq2_cgi.mak
===================================================================
# Microsoft Developer Studio Generated NMAKE File, Based on libapreq_cgi.dsp
!IF "$(APACHE)" == ""
!MESSAGE No Apache directory was specified.
!MESSAGE This makefile is not to be run directly.
!MESSAGE Please run Configure.bat, and then $(MAKE) on Makefile.
!ERROR
!ENDIF
!IF "$(CFG)" == ""
CFG=libapreq2_cgi - Win32 Release
!MESSAGE No configuration specified. Defaulting to libapreq2_cgi - Win32 Release.
!ENDIF
!IF "$(CFG)" != "libapreq2_cgi - Win32 Release" && "$(CFG)" != "libapreq2_cgi - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "libapreq2_cgi.mak" CFG="libapreq2_cgi - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "libapreq2_cgi - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "libapreq2_cgi - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
CPP=cl.exe
RSC=rc.exe
CFG_HOME=$(APREQ_HOME)\win32
OUTDIR=$(CFG_HOME)\libs
INTDIR=$(CFG_HOME)\libs
!IF "$(CFG)" == "libapreq2_cgi - Win32 Release"
ALL : "$(OUTDIR)\libapreq2_cgi.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "LIBAPREQ_CGI_EXPORTS" /D "_WINDOWS" /I"$(APREQ_HOME)\src" /I"$(APACHE)\include" /Fp"$(INTDIR)\libapreq2_cgi.pch" /YX /Fo"$(INTDIR)\libapreq2_cgi.obj" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2_cgi.bsc"
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /nodefaultlib /out:"$(OUTDIR)\libapreq2_cgi.lib"
LIB32_OBJS= \
"$(INTDIR)\libapreq2_cgi.obj" \
"$(INTDIR)\libapreq2.lib" \
"$(APACHE)\lib\libapr.lib"
"$(OUTDIR)\libapreq2_cgi.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
$(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
<<
!ELSEIF "$(CFG)" == "libapreq2_cgi - Win32 Debug"
ALL : "$(OUTDIR)\libapreq2_cgi.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "LIBAPREQ_CGI_EXPORTS" /D "_LIB" /I"$(APREQ_HOME)\src" /I"$(APACHE)\include" /Fp"$(INTDIR)\libapreq2_cgi.pch" /YX /Fo"$(INTDIR)\libapreq2_cgi.obj" /Fd"$(INTDIR)\\" /FD /GZ /c
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2_cgi.bsc"
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /out:"$(OUTDIR)\libapreq2_cgi.lib"
LIB32_OBJS= \
"$(INTDIR)\libapreq2_cgi.obj" \
"$(INTDIR)\libapreq2.lib" \
"$(APACHE)\lib\libapr.lib"
"$(OUTDIR)\libapreq2_cgi.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
$(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
<<
!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
!IF "$(CFG)" == "libapreq2_cgi - Win32 Release" || "$(CFG)" == "libapreq2_cgi - Win32 Debug"
SOURCE=$(APREQ_HOME)\env\libapreq_cgi.c
"$(INTDIR)\libapreq2_cgi.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF