- Removed all of the cruft in the windows subdirectory, now the valid stuff
lives in the win32 directory
diff --git a/windows/README b/windows/README
deleted file mode 100644
index 7177b9a..0000000
--- a/windows/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Two sets of files are included here, from two attempts to make
-mod_dtcl work under windows.
-
-Jan Nijtman succesfully compiled mod_dtcl with VC++ 5, but says "I
-never got to the point that it actually runs on Windows". See
-README.vc++.
-
-Craig Huckabee has succesfully compiled and run mod_dtcl using the
-MingW32 environment. Instructions in README.mingw32.
diff --git a/windows/README.mingw32 b/windows/README.mingw32
deleted file mode 100644
index 635484f..0000000
--- a/windows/README.mingw32
+++ /dev/null
@@ -1,89 +0,0 @@
-Steps for building mod_dtcl under NT for Apache with MingW32
-(http://www.mingw.org/).
-
-1) Get Apache for NT, I used version 1.3.12. You can use the binary release
-or build it from source. I built from source because I needed to also include
-mod_ssl. Note that I used VC++ to build Apache - they don't support MingW32
-yet AFAIK.
-
-2) Get mod_dtcl. Copy my makefile into place. Edit the makefile to reflect
-your environment. By default Apache (either built from scratch or the binary
-release) puts the source under:
-
- C:\Program Files\Apache Group\Apache\src
-
-The lib directory at
-
- C:\Program Files\Apache Group\Apache\lib
-
-is generally empty in either case - you'll be putting your import library for
-Apache there (we'll get to that in a minute).
-
-3) Apply the diffs for mod_dtcl and Apache. The diff for Apache wraps a few
-declarations and one #include directive in the os.h file that aren't needed or
-used with the MingW32 compiler. The diff for mod_dtcl just wraps the threaded
-TCL declaration. I used GNU patch to do this with :
-
- patch -c -b < os.h.diff
- patch -c -b < mod_dtcl.c.diff
-
-4) You'll need to make import libraries for Tcl and Apache. See
-http://www.mingw.org/mingwfaq.shtml for the background on this. I did it
-like this :
-
-For TCL :
- If you compiled Tcl from scratch with VC++:
-
- cd <tcl source directory>\win\release
- echo EXPORTS > c:\temp\tcl83.def
- nm tcl83.exp | grep ' U _' | sed 's/.* U _//' >> c:\temp\tcl83.def
- cd <tk source directory>\win\release
- echo EXPORTS > c:\temp\tk83.def
- nm tk83.exp | grep ' U _' | sed 's/.* U _//' >> c:\temp\tk83.def
-
- Otherwise if using the Scriptics binary release do this :
-
- cd c:\Program Files\Tcl\lib
- echo EXPORTS > c:\temp\tcl83.def
- echo EXPORTS > c:\temp\tk83.def
- nm tcl83.lib | grep ' T _' | sed 's/.* T _//' >> c:\temp\tcl83.def
- nm tk83.lib | grep ' T _' | sed 's/.* T _//' >> c:\temp\tk83.def
-
- Then do this (dlltool commands are all one line):
-
- cd c:\Program Files\Tcl\bin
- dlltool --def c:\temp\tcl83.def --dllname tcl83.dll \
- --output-lib ..\lib\libtcl83.a
- dlltool --def c:\temp\tk83.def --dllname tk83.dll \
- --output-lib ..\lib\libtk83.a
-
-For Apache :
-
- Use the ApacheCore.def file I've included* and do this :
- cd C:\Program Files\Apache Group\Apache
- dlltool --dllname ApacheCore.dll --def c:\temp\ApacheCore.def \
- --output-lib lib\libapachecore.a -k
-
- *This file was modified from one created by Apache+mod_ssl, it may
- need to be tweaked for plain vanilla Apache or for other module
- installs that make source changes like mod_ssl.
-
-5) Go back to where you've put mod_dtcl's sources at and run make. There
-will be some warnings about a redefinition - you can ignore it. You should be
-left with a file called ApacheModuleDtcl.dll.
-
-6) Run make install. Make the changes to your Apache configuration as
-described on the mod_dtcl documentation, and you are off.
-
-Notes :
-
- -- I'm pretty sure Tcl needs to be in the path of the web server; I
- always add it to the system path.
- -- These instructions assume you have the MingW32 gcc setup as well
- as a good collection of GNU tools on your NT machine (sed, grep, etc).
- They also assume you have Tcl setup.
- -- I've tried my best to make these instructions error free but
- mistakes are possible.
-
-Good Luck,
-Craig
diff --git a/windows/README.vc++ b/windows/README.vc++
deleted file mode 100644
index b30fc0b..0000000
--- a/windows/README.vc++
+++ /dev/null
@@ -1,27 +0,0 @@
-Information about attempting to build mod_dtcl under VC++:
-
-These files are Jan Nijtmans' <mailto://j.nijtmans@chello.nl>, and are the
-following:
-
-- mod_dtcl.dsw
- workspace for VC++ 5.0
-- mod_dtcl.dsp
- project file for VC++ 5.0
-- mod_dtcl.def
- export definition file.
-
-Any questions should be sent to him.
-
-He also has the following comment:
-
- However, although everything compiles now, I never got to the point
- that it actually runs on Windows. The problem is that the ap_error()
- function (if I remember correctly, I don't have the code at hand
- now) in Apache still has the wrong signature, even though in the
- symbol is exported now. I even recompiled Apache after fixing this,
- but still then there is a problem during the initializaton of Tcl
- which prevents it from running. I never found out what was the cause
- of this problem, and due to other obligations I now barely have the
- time to continue the search. The reason I still contributed the
- makefiles to you was that although it wouldn't work yet, at least it
- would be a start for anyone trying to do the same thing as I did.
diff --git a/windows/makefile b/windows/makefile
deleted file mode 100644
index 4e103ac..0000000
--- a/windows/makefile
+++ /dev/null
@@ -1,149 +0,0 @@
-#
-# makefile for mod_dtcl and MingW32
-#
-#
-#
-
-#
-# I use this as a pointer to a good temporary location.
-# The default works for most people
-#
-TEMP_LIBS = C:\\TEMP
-
-#
-# Set this to your TCL version
-#
-TCL_VERSION = 83
-
-#
-# Set TCL_HOME to where you have installed Tcl
-#
-TCL_HOME = C:\\Progra~1\\Tcl
-TCL_INC = $(TCL_HOME)\\include
-TCL_LIB = $(TCL_HOME)\\lib
-
-#
-# Set this to where you have installed Apache - used for the install step.
-#
-APACHE_HOME = C:\\"Program Files\\Apache Group\\Apache"
-
-#
-# Set APACHE_SRC to where your APACHE sources live.
-# NOTE: You must apply the diff to the os.h file as described in the
-# readme, and this directory must contain built sources, e.g. object files
-#
-APACHE_SRC = ..\\apache
-
-#
-# Set APACHE_INC to where the APACHE source include files live. This default
-# should be OK.
-#
-APACHE_INC = -I $(APACHE_SRC)\\src\\include -I $(APACHE_SRC)\\src\\os\\win32
-
-
-#
-# Set APACHE_LIB and APACHE_DEF to where you'd like a MingW32 compatible
-# APACHE library file and DLL DEF file put. You normally only need these
-# during a build, so a temporary location is OK
-#
-APACHE_LIB = $(TEMP_LIBS)
-APACHE_DEF = $(TEMP_LIBS)\\ApacheCore.def
-
-#
-# Set APACHE_STYLE to "OLD" for versions before 1.3.17, or "NEW" for the newer
-# versions of Apache (i.e. 1.3.17 or newer). Some file locations changed
-# between versions and this affects the build process
-APACHE_STYLE = OLD
-#APACHE_STYLE = NEW
-
-
-#
-# You shouldn't have to change anything below this
-#
-ROOT_DIR = ..\\
-
-CC = gcc -O3 -fnative-struct -shared -mwindows -DSHARED_MODULE -DDTCL_VERSION="\"`cat $(ROOT_DIR)\\VERSION`\""
-
-INCLUDES = -I$(TCL_INC) $(APACHE_INC)
-LIBS = $(TCL_LIB)\\tcl$(TCL_VERSION).lib -L$(APACHE_LIB) -lapachecore
-
-APREQ_OBJECTS = apache_cookie.o apache_multipart_buffer.o apache_request.o
-OBJECTS = tcl_commands.o parser.o channel.o $(APREQ_OBJECTS)
-
-DLL_CFLAGS = -DEAPI=1
-
-DLL_EXP_LIB = libmod_dtcl.a
-DLL_EXP_DEF = mod_dtcl.def
-DLL_DYNAMIC = ApacheModuleDtcl.dll
-DLL_SO = mod_dtcl.so
-DLL_OBJS = mod_dtcl.o $(OBJECTS)
-
-DLLWRAP_FLAGS = --def $(DLL_EXP_DEF) \
- --implib $(DLL_EXP_LIB) \
- --driver-name $(CC)
-
-ifeq ($(APACHE_STYLE),OLD)
- DLL_BUILD=$(DLL_DYNAMIC)
- APACHE_EXP=$(APACHE_SRC)\\src\\CoreR\\ApacheCore.exp
-else
- DLL_BUILD=$(DLL_SO)
- APACHE_EXP=$(APACHE_SRC)\\src\\Release\\ApacheCore.exp
-endif
-
-#
-# By default we build a .dll file (Apache < 1.3.14)
-#
-all : apache_libs $(DLL_BUILD)
-
-dll_style: apache_libs $(DLL_DYNAMIC)
-
-so_style: apache_libs $(DLL_SO)
-
-$(DLL_DYNAMIC): $(DLL_OBJS) makefile
- $(CC) --dll --kill-at --disable-stdcall-fixup \
- -o $(DLL_DYNAMIC) $(DLL_OBJS) $(LIBS)
-
-#
-# This does the same thing as the above, yet names the output file
-# with a .so extension to match the "new" Apache style.
-#
-$(DLL_SO): $(DLL_OBJS) makefile
- $(CC) --dll --kill-at --disable-stdcall-fixup \
- -o $(DLL_SO) $(DLL_OBJS) $(LIBS)
-
-apache_cookie.o: $(ROOT_DIR)apache_cookie.c $(ROOT_DIR)apache_cookie.h
- $(CC) -c $(DLL_CFLAGS) $(INCLUDES) -D_AP_OS_IS_PATH_ABS_ -o $@ $<
-apache_multipart_buffer.o: $(ROOT_DIR)apache_multipart_buffer.c $(ROOT_DIR)apache_multipart_buffer.h
- $(CC) -c $(DLL_CFLAGS) $(INCLUDES) -D_AP_OS_IS_PATH_ABS_ -o $@ $<
-apache_request.o: $(ROOT_DIR)apache_request.c $(ROOT_DIR)apache_request.h
- $(CC) -c $(DLL_CFLAGS) $(INCLUDES) -D_AP_OS_IS_PATH_ABS_ -o $@ $<
-mod_dtcl.o: $(ROOT_DIR)mod_dtcl.c $(ROOT_DIR)mod_dtcl.h $(ROOT_DIR)tcl_commands.h $(ROOT_DIR)apache_request.h $(ROOT_DIR)parser.h
- $(CC) -c $(DLL_CFLAGS) $(INCLUDES) -o $@ $<
-tcl_commands.o: $(ROOT_DIR)tcl_commands.c $(ROOT_DIR)tcl_commands.h $(ROOT_DIR)mod_dtcl.h
- $(CC) -c $(DLL_CFLAGS) $(INCLUDES) -D_AP_OS_IS_PATH_ABS_ -o $@ $<
-parser.o: $(ROOT_DIR)parser.c $(ROOT_DIR)mod_dtcl.h $(ROOT_DIR)parser.h
- $(CC) -c $(DLL_CFLAGS) $(INCLUDES) -D_AP_OS_IS_PATH_ABS_ -o $@ $<
-channel.o: $(ROOT_DIR)channel.c $(ROOT_DIR)mod_dtcl.h $(ROOT_DIR)channel.h
- $(CC) -c $(DLL_CFLAGS) $(INCLUDES) -D_AP_OS_IS_PATH_ABS_ -o $@ $<
-
-clean:
- -@rm -f $(DLL_OBJS) $(DLL_DYNAMIC) $(DLL_SO) $(DLL_EXP_LIB)
-
-install: $(DLL_BUILD) $(DLL_EXP_LIB)
- echo Installing mod_dtcl...
- -cp $(DLL_BUILD) $(APACHE_HOME)\\modules
-
-apache_libs:
- -@mkdir $(TEMP_LIBS)
- -@rm $(APACHE_DEF)
- echo EXPORTS > $(APACHE_DEF)
- nm $(APACHE_EXP) |grep " U _" | sed "s/.* U _//" >> $(APACHE_DEF)
- sed -e "s/ap_log_error$$/ap_log_error@0/g" \
- -e "s/ap_log_rerror$$/ap_log_rerror@0/g" \
- -e "s/ap_table_do$$/ap_table_do@0/g" \
- $(APACHE_DEF) > $(APACHE_DEF).new
- mv $(APACHE_DEF).new $(APACHE_DEF)
- dlltool --def $(APACHE_DEF) --dllname ApacheCore.dll \
- --output-lib $(TEMP_LIBS)\libapachecore.a -k
-
-
diff --git a/windows/mod_dtcl.def b/windows/mod_dtcl.def
deleted file mode 100644
index 538cd94..0000000
--- a/windows/mod_dtcl.def
+++ /dev/null
@@ -1,3 +0,0 @@
-EXPORTS
- dtcl_init_handler
- dtcl_module
diff --git a/windows/mod_dtcl.dsp b/windows/mod_dtcl.dsp
deleted file mode 100644
index 6908cb0..0000000
--- a/windows/mod_dtcl.dsp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mod_dtcl" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mod_dtcl - 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 "mod_dtcl.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 "mod_dtcl.mak" CFG="mod_dtcl - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mod_dtcl - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_dtcl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mod_dtcl - 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 "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "\progra~1\opensa\apache\include" /I "\progra~1\Tcl\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /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 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ApacheCore.lib tcl82.lib /nologo /subsystem:windows /dll /machine:I386 /out:"ApacheModuleDtcl.dll" /libpath:"\progra~1\opensa\apache\lib" /libpath:"\progra~1\tcl\lib"
-
-!ELSEIF "$(CFG)" == "mod_dtcl - 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 "Debug"
-# PROP Intermediate_Dir "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" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /Zi /Od /I "\progra~1\opsa\apache\include" /I "\progra~1\Tcl\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ApacheCore.lib tclstub82.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"ApacheModuleDtcl.dll" /pdbtype:sept /libpath:"\progra~1\opensa\apache\lib" /libpath:"\progra~1\tcl\lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "mod_dtcl - Win32 Release"
-# Name "mod_dtcl - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_dtcl.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_dtcl.def
-# End Source File
-# End Target
-# End Project
diff --git a/windows/mod_dtcl.dsw b/windows/mod_dtcl.dsw
deleted file mode 100644
index 221db74..0000000
--- a/windows/mod_dtcl.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "mod_dtcl"=.\mod_dtcl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows/os.h.diff b/windows/os.h.diff
deleted file mode 100644
index 1145e7a..0000000
--- a/windows/os.h.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-*** c:\progra~1\Apache Group\Apache\src\os\win32\os.h Mon Sep 13 08:32:42 1999
---- os.h Fri Jul 21 08:20:20 2000
-***************
-*** 68,74 ****
---- 68,78 ----
-
- #include <windows.h>
- #include <winsock2.h>
-+
-+ #ifndef __MINGW32__
- #include <mswsock.h>
-+ #endif
-+
- #include <process.h>
- #include <malloc.h>
- #include <io.h>
-***************
-*** 108,115 ****
---- 112,123 ----
- #define HAVE_DRIVE_LETTERS
- typedef int uid_t;
- typedef int gid_t;
-+
-+ #ifndef __MINGW32__
- typedef int pid_t;
- typedef int mode_t;
-+ #endif
-+
- typedef char * caddr_t;
-
- /*
-***************
-*** 132,138 ****
---- 140,148 ----
- #define strncasecmp(s1, s2, n) strnicmp(s1, s2, n)
- #define lstat(x, y) stat(x, y)
- #define S_ISLNK(m) (0)
-+ #ifndef __MINGW32__
- #define S_ISREG(m) ((m & _S_IFREG) == _S_IFREG)
-+ #endif
- #ifndef S_ISDIR
- #define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR)
- #endif
