cvs commit: jakarta-tomcat-connectors/jk/native/netscape nsapi.dsp

2005-03-29 Thread mturk
mturk   2005/03/29 22:04:13

  Modified:jk/native/netscape nsapi.dsp
  Log:
  Add mising /debug flag, so that .pdb gets generated.
  
  Revision  ChangesPath
  1.14  +1 -1  jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp
  
  Index: nsapi.dsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- nsapi.dsp 24 Mar 2005 06:41:25 -  1.13
  +++ nsapi.dsp 30 Mar 2005 06:04:13 -  1.14
  @@ -53,7 +53,7 @@
   # 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 /nologo /dll /machine:I386

  -# ADD LINK32 ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib 
mswsock.lib /nologo /base:0x6A6B /dll /machine:I386 
/out:nsapi_release/nsapi_redirect.dll /libpath:$(SUNONE_HOME)\plugins\lib

  +# ADD LINK32 ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib 
mswsock.lib /nologo /base:0x6A6B /dll /debug /machine:I386 
/out:nsapi_release/nsapi_redirect.dll /libpath:$(SUNONE_HOME)\plugins\lib

   

   !ELSEIF  $(CFG) == nsapi - Win32 Debug

   

  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-connectors/jk/native/netscape nsapi.dsp README

2005-03-23 Thread mturk
mturk   2005/03/23 22:41:25

  Modified:jk/native/netscape nsapi.dsp README
  Log:
  Add missing defines and update readme.
  
  Revision  ChangesPath
  1.13  +4 -4  jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp
  
  Index: nsapi.dsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- nsapi.dsp 15 Feb 2005 12:02:29 -  1.12
  +++ nsapi.dsp 24 Mar 2005 06:41:25 -  1.13
  @@ -43,7 +43,7 @@
   # 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 NSAPI_EXPORTS /YX /FD /c

  -# ADD CPP /nologo /MD /W3 /Zi /O2 /I ..\common /I 
c:\D\Sun\WebServer6.1\plugins\include /I $(JAVA_HOME)\include /I 
$(JAVA_HOME)\include\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D 
_USRDLL /D NSAPI_EXPORTS /D XP_WIN32 /FdRelease/nsapi_redirect_src /FD 
/c

  +# ADD CPP /nologo /MD /W3 /Zi /O2 /I ..\common /I 
$(SUNONE_HOME)\plugins\include /I $(JAVA_HOME)\include /I 
$(JAVA_HOME)\include\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D 
_USRDLL /D NSAPI_EXPORTS /D XP_WIN32 /D MCC_HTTPD /D SPAPI20 
/FdRelease/nsapi_redirect_src /FD /c

   # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32

   # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32

   # ADD BASE RSC /l 0x409 /d NDEBUG

  @@ -53,7 +53,7 @@
   # 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 /nologo /dll /machine:I386

  -# ADD LINK32 ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib 
mswsock.lib /nologo /base:0x6A6B /dll /machine:I386 
/out:nsapi_release/nsapi_redirect.dll 
/libpath:c:\D\Sun\WebServer6.1\plugins\lib

  +# ADD LINK32 ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib 
mswsock.lib /nologo /base:0x6A6B /dll /machine:I386 
/out:nsapi_release/nsapi_redirect.dll /libpath:$(SUNONE_HOME)\plugins\lib

   

   !ELSEIF  $(CFG) == nsapi - Win32 Debug

   

  @@ -69,7 +69,7 @@
   # 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 NSAPI_EXPORTS /YX /FD /GZ /c

  -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I ..\common /I 
$(NS_HOME)\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 
/D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D NSAPI_EXPORTS 
/D XP_WIN32 /D MCC_HTTPD /D SPAPI20 /FdDebug/nsapi_redirect_src /FD /c

  +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I ..\common /I 
$(SUNONE_HOME)\plugins\include /I $(JAVA_HOME)\include /I 
$(JAVA_HOME)\include\win32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D 
_USRDLL /D NSAPI_EXPORTS /D XP_WIN32 /D MCC_HTTPD /D SPAPI20 
/FdDebug/nsapi_redirect_src /FD /c

   # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32

   # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32

   # ADD BASE RSC /l 0x409 /d _DEBUG

  @@ -79,7 +79,7 @@
   # 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 /nologo /dll /debug /machine:I386 /pdbtype:sept

  -# ADD LINK32 ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib 
mswsock.lib /nologo /base:0x6A6B /dll /debug /machine:I386 
/out:nsapi_debug/nsapi_redirect.dll /pdbtype:sept /libpath:$(NS_HOME)\lib

  +# ADD LINK32 ns-httpd40.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib 
mswsock.lib /nologo /base:0x6A6B /dll /debug /machine:I386 
/out:nsapi_debug/nsapi_redirect.dll /pdbtype:sept 
/libpath:$(SUNONE_HOME)\plugins\lib

   

   !ENDIF 

   

  
  
  
  1.2   +5 -6  jakarta-tomcat-connectors/jk/native/netscape/README
  
  Index: README
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/README,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- README1 Jul 2002 11:16:35 -   1.1
  +++ README24 Mar 2005 06:41:25 -  1.2
  @@ -12,7 +12,7 @@
   REQUIREMENT for Windows build
   -
   
  -MS VC 6.0 (+ update, latest service pack is 5)
  +MS VC 6.0 (+ update, latest service pack is 6)
   
   BUILDING on Windows
   ---
  @@ -20,8 +20,10 @@
   The steps that you need to take are:
   
  1. Change directory to the nsapi redirector plugins source directory.
  -
  -   2. Execute the following command:
  +   2. Set the SUNONE_HOME system environment value to SunONE installation
  +  directory or edit the nsapi.dsp and replace all $(SUNONE_HOME)
  +  occurrences with the real path
  +   3. Execute the following command:
 MSDEV 

cvs commit: jakarta-tomcat-connectors/jk/native/netscape nsapi.dsp

2005-02-06 Thread mturk
mturk   2005/02/06 09:43:10

  Modified:jk/native/apache-1.3 Makefile.netware Makefile.vc mod_jk.dsp
   jk/native/apache-2.0 Makefile.vc NWGNUmakefile mod_jk.dsp
   jk/native/common jk_util.c jk_worker_list.h list.mk.in
   jk/native/iis isapi.dsp
   jk/native/netscape nsapi.dsp
  Added:   jk/native/common jk_status.c jk_status.h
  Log:
  Add jk_status worker for displaying and managing worker runtime data.
  
  Revision  ChangesPath
  1.5   +2 -0  
jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware
  
  Index: Makefile.netware
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.netware,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.netware  28 Jul 2004 14:35:46 -  1.4
  +++ Makefile.netware  6 Feb 2005 17:43:09 -   1.5
  @@ -140,7 +140,9 @@
$(OBJDIR)/jk_md5.o \
$(OBJDIR)/jk_msg_buff.o \
$(OBJDIR)/jk_pool.o \
  + $(OBJDIR)/jk_shm.o \
$(OBJDIR)/jk_sockbuf.o \
  + $(OBJDIR)/jk_status.o \
$(OBJDIR)/jk_uri_worker_map.o \
$(OBJDIR)/jk_util.o \
$(OBJDIR)/jk_worker.o \
  
  
  
  1.4   +8 -0  
jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.vc
  
  Index: Makefile.vc
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.vc,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.vc   5 Feb 2005 19:40:19 -   1.3
  +++ Makefile.vc   6 Feb 2005 17:43:09 -   1.4
  @@ -53,6 +53,7 @@
[EMAIL PROTECTED] $(INTDIR)\jk_pool.obj
[EMAIL PROTECTED] $(INTDIR)\jk_shm.obj
[EMAIL PROTECTED] $(INTDIR)\jk_sockbuf.obj
  + [EMAIL PROTECTED] $(INTDIR)\jk_status.obj
[EMAIL PROTECTED] $(INTDIR)\jk_uri_worker_map.obj
[EMAIL PROTECTED] $(INTDIR)\jk_util.obj
[EMAIL PROTECTED] $(INTDIR)\jk_worker.obj
  @@ -90,6 +91,7 @@
$(INTDIR)\jk_pool.obj \
$(INTDIR)\jk_shm.obj \
$(INTDIR)\jk_sockbuf.obj \
  + $(INTDIR)\jk_status.obj \
$(INTDIR)\jk_uri_worker_map.obj \
$(INTDIR)\jk_util.obj \
$(INTDIR)\jk_worker.obj \
  @@ -240,6 +242,12 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +SOURCE=..\common\jk_status.c
  +
  +$(INTDIR)\jk_status.obj : $(SOURCE) $(INTDIR)
  + $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
   SOURCE=..\common\jk_uri_worker_map.c
   
   $(INTDIR)\jk_uri_worker_map.obj : $(SOURCE) $(INTDIR)
  
  
  
  1.9   +8 -0  jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.dsp
  
  Index: mod_jk.dsp
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.dsp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_jk.dsp5 Feb 2005 19:40:19 -   1.8
  +++ mod_jk.dsp6 Feb 2005 17:43:09 -   1.9
  @@ -156,6 +156,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=..\common\jk_status.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\common\jk_uri_worker_map.c
   # End Source File
   # Begin Source File
  @@ -256,6 +260,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=..\common\jk_status.h
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\common\jk_uri_worker_map.h
   # End Source File
   # Begin Source File
  
  
  
  1.4   +8 -0  
jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.vc
  
  Index: Makefile.vc
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.vc,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.vc   5 Feb 2005 19:40:19 -   1.3
  +++ Makefile.vc   6 Feb 2005 17:43:09 -   1.4
  @@ -53,6 +53,7 @@
[EMAIL PROTECTED] $(INTDIR)\jk_pool.obj
[EMAIL PROTECTED] $(INTDIR)\jk_shm.obj
[EMAIL PROTECTED] $(INTDIR)\jk_sockbuf.obj
  + [EMAIL PROTECTED] $(INTDIR)\jk_status.obj
[EMAIL PROTECTED] $(INTDIR)\jk_uri_worker_map.obj
[EMAIL PROTECTED] $(INTDIR)\jk_util.obj
[EMAIL PROTECTED] $(INTDIR)\jk_worker.obj
  @@ -90,6 +91,7 @@
$(INTDIR)\jk_pool.obj \
$(INTDIR)\jk_shm.obj \
$(INTDIR)\jk_sockbuf.obj \
  + $(INTDIR)\jk_status.obj \
$(INTDIR)\jk_uri_worker_map.obj \
$(INTDIR)\jk_util.obj \
$(INTDIR)\jk_worker.obj \
  @@ -240,6 +242,12 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +SOURCE=..\common\jk_status.c
  +
  +$(INTDIR)\jk_status.obj : $(SOURCE) $(INTDIR)
  + $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
   SOURCE=..\common\jk_uri_worker_map.c
   
   $(INTDIR)\jk_uri_worker_map.obj : $(SOURCE) 

cvs commit: jakarta-tomcat-connectors/jk/native/netscape nsapi.dsp

2005-02-05 Thread mturk
mturk   2005/02/05 11:40:19

  Modified:jk/native/apache-1.3 Makefile.vc mod_jk.dsp
   jk/native/apache-2.0 Makefile.vc NWGNUmakefile mod_jk.dsp
   jk/native/common list.mk.in
   jk/native/iis isapi.dsp
   jk/native/netscape nsapi.dsp
  Added:   jk/native/common jk_shm.c jk_shm.h
  Log:
  Add shared memory support.
  
  Revision  ChangesPath
  1.3   +8 -0  
jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.vc
  
  Index: Makefile.vc
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.vc,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.vc   27 Dec 2004 08:46:57 -  1.2
  +++ Makefile.vc   5 Feb 2005 19:40:19 -   1.3
  @@ -51,6 +51,7 @@
[EMAIL PROTECTED] $(INTDIR)\jk_md5.obj
[EMAIL PROTECTED] $(INTDIR)\jk_msg_buff.obj
[EMAIL PROTECTED] $(INTDIR)\jk_pool.obj
  + [EMAIL PROTECTED] $(INTDIR)\jk_shm.obj
[EMAIL PROTECTED] $(INTDIR)\jk_sockbuf.obj
[EMAIL PROTECTED] $(INTDIR)\jk_uri_worker_map.obj
[EMAIL PROTECTED] $(INTDIR)\jk_util.obj
  @@ -87,6 +88,7 @@
$(INTDIR)\jk_md5.obj \
$(INTDIR)\jk_msg_buff.obj \
$(INTDIR)\jk_pool.obj \
  + $(INTDIR)\jk_shm.obj \
$(INTDIR)\jk_sockbuf.obj \
$(INTDIR)\jk_uri_worker_map.obj \
$(INTDIR)\jk_util.obj \
  @@ -226,6 +228,12 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +SOURCE=..\common\jk_shm.c
  +
  +$(INTDIR)\jk_shm.obj : $(SOURCE) $(INTDIR)
  + $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
   SOURCE=..\common\jk_sockbuf.c
   
   $(INTDIR)\jk_sockbuf.obj : $(SOURCE) $(INTDIR)
  
  
  
  1.8   +46 -40jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.dsp
  
  Index: mod_jk.dsp
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.dsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_jk.dsp23 Dec 2004 14:20:44 -  1.7
  +++ mod_jk.dsp5 Feb 2005 19:40:19 -   1.8
  @@ -42,8 +42,8 @@
   # PROP Intermediate_Dir Release
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir 
  -# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D WIN32 /D NDEBUG /D _WINDOWS 
/D _MBCS /D _USRDLL /D MOD_JK_EXPORTS /FD /c
  -# ADD CPP /nologo /MD /W3 /O2 /Zi /I ..\common /I 
$(APACHE1_HOME)\include /I $(APACHE1_HOME)\src\include /I 
$(APACHE1_HOME)\src\os\win32 /I $(JAVA_HOME)\include /I 
$(JAVA_HOME)\include\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D 
_USRDLL /D MOD_JK_EXPORTS /FdRelease\mod_jk_src /FD /c
  +# ADD BASE CPP /nologo /MD /W3 /Zi /O2 /D WIN32 /D NDEBUG /D _WINDOWS 
/D _MBCS /D _USRDLL /D MOD_JK_EXPORTS /FD /c
  +# ADD CPP /nologo /MD /W3 /Zi /O2 /I ..\common /I 
$(APACHE1_HOME)\include /I $(APACHE1_HOME)\src\include /I 
$(APACHE1_HOME)\src\os\win32 /I $(JAVA_HOME)\include /I 
$(JAVA_HOME)\include\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D 
_USRDLL /D MOD_JK_EXPORTS /FdRelease\mod_jk_src /FD /c
   # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
   # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d NDEBUG
  @@ -53,7 +53,7 @@
   # 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 /nologo /dll /machine:I386
  -# ADD LINK32 ApacheCore.lib wsock32.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 /base:0x6A6B /subsystem:windows 
/dll /incremental:no /debug /machine:I386 /out:Release/mod_jk.so /opt:ref 
/libpath:$(APACHE1_HOME)\libexec /libpath:$(APACHE1_HOME)\src\CoreR 
/libpath:$(APACHE1_HOME)\src\Release
  +# ADD LINK32 ApacheCore.lib wsock32.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 /base:0x6A6B /subsystem:windows 
/dll /debug /machine:I386 /out:Release/mod_jk.so 
/libpath:$(APACHE1_HOME)\libexec /libpath:$(APACHE1_HOME)\src\CoreR 
/libpath:$(APACHE1_HOME)\src\Release /opt:ref
   
   !ELSEIF  $(CFG) == mod_jk - Win32 Debug
   
  @@ -104,10 +104,26 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=..\common\jk_ajp14.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_ajp14_worker.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_ajp_common.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\common\jk_connect.c
   # End Source File
   # Begin Source File
   
  +SOURCE=..\common\jk_context.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\common\jk_jni_worker.c
   # End Source File
   # Begin Source File
  @@ 

cvs commit: jakarta-tomcat-connectors/jk/native/netscape nsapi.dsp

2005-01-03 Thread mturk
mturk   2005/01/03 00:31:37

  Modified:jk/native/netscape nsapi.dsp
  Log:
  Update build files for SunONE/iPlanet
  
  Revision  ChangesPath
  1.9   +18 -9 jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp
  
  Index: nsapi.dsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- nsapi.dsp 10 Feb 2004 13:29:28 -  1.8
  +++ nsapi.dsp 3 Jan 2005 08:31:37 -   1.9
  @@ -38,12 +38,12 @@
   # PROP BASE Target_Dir 
   # PROP Use_MFC 0
   # PROP Use_Debug_Libraries 0
  -# PROP Output_Dir nsapi_release
  -# PROP Intermediate_Dir nsapi_release
  +# 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 
/D _MBCS /D _USRDLL /D NSAPI_EXPORTS /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /I ..\common /I $(NS_HOME)\include /I 
$(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /D WIN32 /D NDEBUG 
/D _WINDOWS /D _MBCS /D _USRDLL /D NSAPI_EXPORTS /D XP_WIN32 /YX /FD 
/c
  +# ADD CPP /nologo /MD /W3 /Zi /O2 /I ..\common /I 
$(NS_HOME)\plugins\include /I $(JAVA_HOME)\include /I 
$(JAVA_HOME)\include\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D 
_USRDLL /D NSAPI_EXPORTS /D XP_WIN32 /FdRelease/nsapi_redirect_src /FD 
/c
   # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
   # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d NDEBUG
  @@ -53,7 +53,8 @@
   # 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 /nologo /dll /machine:I386
  -# ADD LINK32 wsock32.lib ns-httpd36.lib /nologo /dll /machine:I386 
/out:nsapi_release/nsapi_redirect.dll /libpath:$(NS_HOME)\lib
  +# ADD LINK32 wsock32.lib ns-httpd36.lib /nologo /base:0x6A6B /dll 
/machine:I386 /out:Release/nsapi_redirect.dll 
/libpath:$(NS_HOME)\plugins\lib
  +# SUBTRACT LINK32 /pdb:none
   
   !ELSEIF  $(CFG) == nsapi - Win32 Debug
   
  @@ -64,12 +65,12 @@
   # PROP BASE Target_Dir 
   # PROP Use_MFC 0
   # PROP Use_Debug_Libraries 1
  -# PROP Output_Dir nsapi_debug
  -# PROP Intermediate_Dir nsapi_debug
  +# 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 /D _MBCS /D _USRDLL /D NSAPI_EXPORTS /YX /FD /GZ /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ..\common /I 
$(NS_HOME)\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 
/D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D NSAPI_EXPORTS 
/D XP_WIN32 /D MCC_HTTPD /D SPAPI20 /YX /FD /GZ /c
  +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I ..\common /I 
$(NS_HOME)\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 
/D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D NSAPI_EXPORTS 
/D XP_WIN32 /D MCC_HTTPD /D SPAPI20 /FdDebug/nsapi_redirect_src /FD /c
   # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32
   # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d _DEBUG
  @@ -79,7 +80,8 @@
   # 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 /nologo /dll /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 wsock32.lib ns-httpd36.lib /nologo /dll /debug /machine:I386 
/out:nsapi_debug/nsapi_redirect.dll /pdbtype:sept /libpath:$(NS_HOME)\lib
  +# ADD LINK32 wsock32.lib ns-httpd36.lib /nologo /base:0x6A6B /dll 
/debug /machine:I386 /out:Debug/nsapi_redirect.dll /pdbtype:sept 
/libpath:$(NS_HOME)\lib
  +# SUBTRACT LINK32 /pdb:none
   
   !ENDIF 
   
  @@ -92,6 +94,10 @@
   # PROP Default_Filter cpp;c;cxx;rc;def;r;odl;idl;hpj;bat
   # Begin Source File
   
  +SOURCE=..\common\jk_ajp12_worker.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\common\jk_ajp13.c
   # End Source File
   # Begin Source File
  @@ -148,6 +154,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=..\common\jk_sockbuf.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\common\jk_uri_worker_map.c
   # End Source File
   # Begin Source File
  @@ -243,7 +253,6 @@
   SOURCE=..\common\jk_worker.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
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-connectors/jk/native/netscape nsapi.dsp

2004-02-10 Thread hgomez
hgomez  2004/02/10 05:29:28

  Modified:jk/native/netscape nsapi.dsp
  Log:
  Fix the bad copypaste :)
  
  Revision  ChangesPath
  1.8   +1 -1  jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp
  
  Index: nsapi.dsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- nsapi.dsp 9 Feb 2004 12:04:53 -   1.7
  +++ nsapi.dsp 10 Feb 2004 13:29:28 -  1.8
  @@ -242,7 +242,7 @@
   
   SOURCE=..\common\jk_worker.h
   # End Source File
  -# Begin Source File
  +# End Group
   
   # Begin Group Resource Files
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-connectors/jk/native/netscape nsapi.dsp

2004-02-09 Thread hgomez
hgomez  2004/02/09 04:04:53

  Modified:jk/native/netscape nsapi.dsp
  Log:
  Remove unexisting file in deps, maybe a bad copy/paste from jk2.
  
  Thanks to Gunter Knauf
  
  Revision  ChangesPath
  1.7   +0 -19 jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp
  
  Index: nsapi.dsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- nsapi.dsp 7 Nov 2001 21:43:35 -   1.6
  +++ nsapi.dsp 9 Feb 2004 12:04:53 -   1.7
  @@ -92,10 +92,6 @@
   # PROP Default_Filter cpp;c;cxx;rc;def;r;odl;idl;hpj;bat
   # Begin Source File
   
  -SOURCE=..\common\jk_channel_socket.c
  -# End Source File
  -# Begin Source File
  -
   SOURCE=..\common\jk_ajp13.c
   # End Source File
   # Begin Source File
  @@ -160,14 +156,6 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=..\common\jk_registry.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\common\jk_env.c
  -# End Source File
  -# Begin Source File
  -
   SOURCE=..\common\jk_worker.c
   # End Source File
   # End Group
  @@ -176,10 +164,6 @@
   # PROP Default_Filter h;hpp;hxx;hm;inl
   # Begin Source File
   
  -SOURCE=..\common\jk_channel.h
  -# End Source File
  -# Begin Source File
  -
   SOURCE=..\common\jk_ajp13.h
   # End Source File
   # Begin Source File
  @@ -260,9 +244,6 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=..\common\jk_env.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
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-connectors/jk/native/netscape nsapi.dsp

2001-06-14 Thread mmanders

mmanders01/06/14 12:41:30

  Modified:jk/native/netscape nsapi.dsp
  Log:
  Updated inside of MSDEV so that it will load (and build) properly.
  
  Revision  ChangesPath
  1.4   +38 -40jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp
  
  Index: nsapi.dsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/nsapi.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- nsapi.dsp 2001/06/07 14:19:37 1.3
  +++ nsapi.dsp 2001/06/14 19:41:27 1.4
  @@ -104,10 +104,26 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=..\common\jk_ajp14.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_ajp14_worker.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\common\jk_ajp_common.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\common\jk_connect.c
   # End Source File
   # Begin Source File
   
  +SOURCE=..\common\jk_context.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\common\jk_jni_worker.c
   # End Source File
   # Begin Source File
  @@ -120,6 +136,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=..\common\jk_md5.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\common\jk_msg_buff.c
   # End Source File
   # Begin Source File
  @@ -147,45 +167,40 @@
   SOURCE=..\common\jk_worker.c
   # End Source File
   # End Group
  +# Begin Group Header Files
   
  -SOURCE=..\common\jk_ajp14.c
  -# End Source File
  -# End Group
  +# PROP Default_Filter h;hpp;hxx;hm;inl
  +# Begin Source File
   
  -SOURCE=..\common\jk_ajp14_worker.c
  +SOURCE=..\common\jk_ajp12_worker.h
   # End Source File
  -# End Group
  +# Begin Source File
   
  -SOURCE=..\common\jk_md5.c
  +SOURCE=..\common\jk_ajp13.h
   # End Source File
  -# End Group
  +# Begin Source File
   
  -SOURCE=..\common\jk_context.c
  +SOURCE=..\common\jk_ajp13_worker.h
   # End Source File
  -# End Group
  +# Begin Source File
   
  -SOURCE=..\common\jk_ajp_common.c
  +SOURCE=..\common\jk_ajp14.h
   # End Source File
  -# End Group
  -
  -# Begin Group Header Files
  -
  -# PROP Default_Filter h;hpp;hxx;hm;inl
   # Begin Source File
   
  -SOURCE=..\common\jk_ajp12_worker.h
  +SOURCE=..\common\jk_ajp14_worker.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\common\jk_ajp13.h
  +SOURCE=..\common\jk_ajp_common.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\common\jk_ajp13_worker.h
  +SOURCE=..\common\jk_connect.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\common\jk_connect.h
  +SOURCE=..\common\jk_context.h
   # End Source File
   # Begin Source File
   
  @@ -209,6 +224,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=..\common\jk_md5.h
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\common\jk_msg_buff.h
   # End Source File
   # Begin Source File
  @@ -244,27 +263,6 @@
   SOURCE=..\common\jk_worker_list.h
   # End Source File
   # End Group
  -
  -SOURCE=..\common\jk_ajp14.h
  -# End Source File
  -# End Group
  -
  -SOURCE=..\common\jk_worker_ajp14.h
  -# End Source File
  -# End Group
  -
  -SOURCE=..\common\jk_md5.h
  -# End Source File
  -# End Group
  -
  -SOURCE=..\common\jk_context.h
  -# End Source File
  -# End Group
  -
  -SOURCE=..\common\jk_ajp_common.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