randyk 2003/10/11 21:55:13
Modified: win32 Configure.pl
Added: win32 cgi_test.mak
Removed: win32 test_cgi.mak
Log:
Rename test_cgi.mak to cgi_test.mak, and adjust Configure.pl to
build the cgi_test.c C cgi script and run the corresponding tests
under env/t/cgi_test/.
Revision Changes Path
1.18 +14 -7 httpd-apreq-2/win32/Configure.pl
Index: Configure.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/Configure.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Configure.pl 12 Oct 2003 02:37:25 -0000 1.17
+++ Configure.pl 12 Oct 2003 04:55:13 -0000 1.18
@@ -69,14 +69,19 @@
set PATH=%PATH%;$(APACHE)\bin
cd $(LIBDIR) && $(TESTALL).exe -v
cd $(APREQ_HOME)
- $(MAKE) /nologo /f $(CFG_HOME)\$(TESTCGI).mak CFG="$(TESTCGI) - Win32
$(CFG)" APACHE="$(APACHE)" APREQ_HOME="$(APREQ_HOME)"
- copy $(LIBDIR)\test_cgi.exe $(APREQ_HOME)\env\t\cgi-bin\test_cgi.exe
+ $(MAKE) /nologo /f $(CFG_HOME)\$(CGITEST).mak CFG="$(CGITEST) - Win32
$(CFG)" APACHE="$(APACHE)" APREQ_HOME="$(APREQ_HOME)"
+ copy $(LIBDIR)\cgi_test.exe $(APREQ_CGI)\t\cgi-bin\cgi_test.exe
+ cd $(APREQ_CGI)
+ $(PERL) t\TEST.PL
+ cd $(APREQ_HOME)
END
my $clean = << 'END';
CLEAN:
cd $(LIBDIR)
$(RM_F) *.pch *.exe *.exp *.lib *.pdb *.ilk *.idb *.so *.dll *.obj
+ cd $(APREQ_CGI)
+ $(PERL) t\TEST.PL -clean
cd $(APREQ_HOME)
!IF EXIST("$(PERLGLUE)\Makefile")
cd $(PERLGLUE)
@@ -87,13 +92,13 @@
if ($apxs) {
$test .= << "END";
- cd env
- \$(PERL) t/TEST.PL -apxs $apxs
+ cd \$(APREQ_ENV)
+ \$(PERL) t\\TEST.PL -apxs $apxs
cd \$(APREQ_HOME)
END
$clean .= << 'END';
- cd env
- $(PERL) t/TEST.PL -clean
+ cd $(APREQ_ENV)
+ $(PERL) t\TEST.PL -clean
cd $(APREQ_HOME)
END
}
@@ -345,7 +350,7 @@
LIBAPREQ=libapreq
TESTALL=testall
-TESTCGI=test_cgi
+CGITEST=cgi_test
MOD=mod_apreq
CGI=libapreq_cgi
@@ -380,6 +385,8 @@
LIBDIR=$(CFG_HOME)\libs
PERLGLUE=$(APREQ_HOME)\glue\perl
APACHE_LIB=$(APACHE)\lib
+APREQ_ENV=$(APREQ_HOME)\env
+APREQ_CGI=$(APREQ_ENV)\cgi_test
ALL : "$(LIBAPREQ)"
1.1 httpd-apreq-2/win32/cgi_test.mak
Index: cgi_test.mak
===================================================================
# Microsoft Developer Studio Generated NMAKE File, Based on testall.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=cgi_test - Win32 Release
!MESSAGE No configuration specified. Defaulting to cgi_test - Win32 Release.
!ENDIF
!IF "$(CFG)" != "cgi_test - Win32 Release" && "$(CFG)" != "cgi_test - 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 "cgi_test.mak" CFG="cgi_test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "cgi_test - Win32 Release" (based on "Win32 (x86) Console
Application")
!MESSAGE "cgi_test - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
CFG_HOME=$(APREQ_HOME)\win32
OUTDIR=$(CFG_HOME)\libs
INTDIR=$(CFG_HOME)\libs
!IF "$(CFG)" == "cgi_test - Win32 Release"
ALL : "$(OUTDIR)\cgi_test.exe"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"
/I"$(APACHE)\include" /I"$(APREQ_HOME)\src" /Fp"$(INTDIR)\cgi_test.pch" /YX
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.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) $<
<<
RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\cgi_test.bsc"
LINK32=link.exe
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)\cgi_test.pdb" /machine:I386 /out:"$(OUTDIR)\cgi_test.exe"
LINK32_OBJS= \
"$(INTDIR)\cgi_test.obj" \
"$(OUTDIR)\libapreq_cgi.obj" \
"$(OUTDIR)\libapreq.lib" \
"$(APACHE)\lib\libapr.lib" \
"$(APACHE)\lib\libaprutil.lib"
"$(OUTDIR)\cgi_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ELSEIF "$(CFG)" == "cgi_test - Win32 Debug"
ALL : "$(OUTDIR)\cgi_test.exe"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /I"$(APACHE)\include" /I"$(APREQ_HOME)\src"
/Fp"$(INTDIR)\cgi_test.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
.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) $<
<<
RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\cgi_test.bsc"
LINK32=link.exe
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)\cgi_test.pdb" /debug /machine:I386
/out:"$(OUTDIR)\cgi_test.exe" /pdbtype:sept
LINK32_OBJS= \
"$(INTDIR)\cgi_test.obj" \
"$(OUTDIR)\libapreq_cgi.obj" \
"$(OUTDIR)\libapreq.lib" \
"$(APACHE)\lib\libapr.lib" \
"$(APACHE)\lib\libaprutil.lib"
"$(OUTDIR)\cgi_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ENDIF
!IF "$(CFG)" == "cgi_test - Win32 Release" || "$(CFG)" == "cgi_test - Win32
Debug"
SOURCE=$(APREQ_HOME)\env\cgi_test\cgi_test.c
"$(INTDIR)\cgi_test.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
