From: robs Date: Fri, 31 Aug 2001 14:40:42 +0000 (+0000) Subject: Remove SampleStore from distribution. I don't know that its really added much WRT... X-Git-Tag: 0.67_01~192 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=cbc0639b5315b86360b22dc4d573c8298932fad8;hp=9e2d498325bb76f66ee21034ce0357d07c8b8303;p=catagits%2Ffcgi2.git Remove SampleStore from distribution. I don't know that its really added much WRT helping folks, it doesn't build on Win and it depends on a chunk of TCL library code. --- diff --git a/Win32/FastCGI.dsw b/Win32/FastCGI.dsw index 08d3511..367ecc9 100644 --- a/Win32/FastCGI.dsw +++ b/Win32/FastCGI.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "authorizer"=".\authorizer.dsp" - Package Owner=<4> +Project: "authorizer"=.\authorizer.dsp - Package Owner=<4> Package=<5> {{{ @@ -18,7 +18,7 @@ Package=<4> ############################################################################### -Project: "cgifcgi"=".\cgifcgi.dsp" - Package Owner=<4> +Project: "cgifcgi"=.\cgifcgi.dsp - Package Owner=<4> Package=<5> {{{ @@ -33,7 +33,7 @@ Package=<4> ############################################################################### -Project: "echo"=".\echo.dsp" - Package Owner=<4> +Project: "echo"=.\echo.dsp - Package Owner=<4> Package=<5> {{{ @@ -48,7 +48,7 @@ Package=<4> ############################################################################### -Project: "echox"=".\echox.dsp" - Package Owner=<4> +Project: "echox"=.\echox.dsp - Package Owner=<4> Package=<5> {{{ @@ -63,7 +63,7 @@ Package=<4> ############################################################################### -Project: "libfcgi"=".\libfcgi.dsp" - Package Owner=<4> +Project: "libfcgi"=.\libfcgi.dsp - Package Owner=<4> Package=<5> {{{ @@ -75,7 +75,7 @@ Package=<4> ############################################################################### -Project: "logdump"=".\logdump.dsp" - Package Owner=<4> +Project: "logdump"=.\logdump.dsp - Package Owner=<4> Package=<5> {{{ @@ -90,7 +90,7 @@ Package=<4> ############################################################################### -Project: "size"=".\size.dsp" - Package Owner=<4> +Project: "size"=.\size.dsp - Package Owner=<4> Package=<5> {{{ @@ -105,22 +105,7 @@ Package=<4> ############################################################################### -Project: "store"=".\store.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libfcgi - End Project Dependency -}}} - -############################################################################### - -Project: "threaded"=".\threaded.dsp" - Package Owner=<4> +Project: "threaded"=.\threaded.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/Win32/store.dsp b/Win32/store.dsp deleted file mode 100644 index e85a0f1..0000000 --- a/Win32/store.dsp +++ /dev/null @@ -1,125 +0,0 @@ -# Microsoft Developer Studio Project File - Name="store" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=store - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "store.mak". -!MESSAGE -!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 "store.mak" CFG="store - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "store - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "store - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "store - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\examples\SampleStore\Release" -# PROP Intermediate_Dir "..\examples\SampleStore\Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIB_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /Gi /GX- /O2 /Ob2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.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 /machine:I386 -# ADD LINK32 libfcgi.lib /nologo /pdb:none /machine:IX86 /libpath:"..\libfcgi\Release" - -!ELSEIF "$(CFG)" == "store - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\examples/SampleStore/Debug" -# PROP Intermediate_Dir "..\examples/SampleStore/Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIB_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Gm /Gi /GX- /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.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 /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libfcgi.lib /nologo /profile /debug /machine:IX86 /libpath:"..\libfcgi\Debug" - -!ENDIF - -# Begin Target - -# Name "store - Win32 Release" -# Name "store - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\examples\SampleStore\sample-store.c" -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\examples\SampleStore\tclHash.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\examples\SampleStore\tcl.h -# End Source File -# Begin Source File - -SOURCE=..\examples\SampleStore\tclInt.h -# End Source File -# Begin Source File - -SOURCE=..\examples\SampleStore\tclRegexp.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/examples/Makefile.in b/examples/Makefile.in index 467e1bb..7bb4bc4 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,35 +1,32 @@ # # Makefile for FastCGI examples directory # -# Open Market, Inc. -# -# $Id: Makefile.in,v 1.8 2001/06/22 19:09:59 robs Exp $ +# $Id: Makefile.in,v 1.9 2001/08/31 14:43:48 robs Exp $ # SHELL = @SHELL@ -O = @O@ -L = @L@ -CC = @CC@ +O = @OBJEXT@ +L = @L@ +CC = @CC@ INCLUDEDIR = ../include -CFLAGS = @CCDEFS@ @PROFILE@ -I$(INCLUDEDIR) -LIBS = @LIBS@ -RANLIB = @RANLIB@ +CFLAGS = @CCDEFS@ -I$(INCLUDEDIR) +LIBS = @LIBS@ +RANLIB = @RANLIB@ LIBDIR = ../libfcgi -LIBFCGI = $(LIBDIR)/libfcgi.${L} +LIBFCGI = $(LIBDIR)/libfcgi.${L} INCLUDES = $(INCLUDEDIR)/fastcgi.h \ $(INCLUDEDIR)/fcgiapp.h \ - $(INCLUDEDIR)/fcgimisc.h \ + $(INCLUDEDIR)/fcgimisc.h \ $(INCLUDEDIR)/fcgi_stdio.h -TARGETS = authorizer \ - echo \ +TARGETS = authorizer \ + echo \ echo-x\ - SampleStore/sample-store \ - log-dump \ - threaded + threaded \ + log-dump all: $(TARGETS) @@ -45,23 +42,10 @@ echo: echo.c $(INCLUDES) $(LIBFCGI) echo-x: echo-x.c $(INCLUDES) $(LIBFCGI) $(CC) $(CFLAGS) echo-x.c -o echo-x $(LIBFCGI) $(LIBS) -SampleStore/sample-store: SampleStore/sample-store.${O} SampleStore/tclHash.${O} $(LIBFCGI) - $(CC) $(CFLAGS) -ISampleStore SampleStore/sample-store.${O} SampleStore/tclHash.${O} -o SampleStore/sample-store $(LIBFCGI) $(LIBS) - [ -d SampleStore/SampleStore.state.0 ] || mkdir SampleStore/SampleStore.state.0 - [ -d SampleStore/SampleStore.state.1 ] || mkdir SampleStore/SampleStore.state.1 - log-dump: log-dump.c $(INCLUDES) $(LIBFCGI) $(CC) $(CFLAGS) log-dump.c -o log-dump $(LIBFCGI) $(LIBS) clean: - rm -rf SampleStore/SampleStore.state.? rm -f *.${L} *.${O} core.* errs *~ \#* TAGS *.E a.out $(TARGETS) # ---------------------------------------------------------------------------- - -SampleStore/sample-store.${O}: SampleStore/sample-store.c $(INCLUDES) - $(CC) $(CFLAGS) -ISampleStore -c SampleStore/sample-store.c -o SampleStore/sample-store.${O} - -SampleStore/tclHash.${O}: SampleStore/tclHash.c - $(CC) $(CFLAGS) -ISampleStore -c SampleStore/tclHash.c -o SampleStore/tclHash.${O} -