httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/support htpasswd.mak htpasswd.dsp htpasswd.c
Date Wed, 22 Mar 2000 15:21:58 GMT
stoddard    00/03/22 07:21:58

  Modified:    src      CHANGES
               src/support htpasswd.mak htpasswd.dsp htpasswd.c
  Log:
  Get htpasswd compiling under Windows
  
  Submitted by:	William Rowe
  Reviewed by:	Bill Stoddard
  
  Revision  Changes    Path
  1.38      +2 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- CHANGES	2000/03/22 11:18:22	1.37
  +++ CHANGES	2000/03/22 15:21:56	1.38
  @@ -1,4 +1,6 @@
   Changes with Apache 2.0a2-dev
  +  *) Get htpasswd compiling under Windows
  +     [William Rowe <wrowe@lnd.com>]
   
     *) Change the log message for a bind() failure to show the
        interface and port number. [Jeff Trawick]
  
  
  
  1.3       +40 -125   apache-2.0/src/support/htpasswd.mak
  
  Index: htpasswd.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htpasswd.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- htpasswd.mak	2000/03/21 23:26:50	1.2
  +++ htpasswd.mak	2000/03/22 15:21:56	1.3
  @@ -49,13 +49,6 @@
   !ENDIF 
   
   CLEAN :
  -	-@erase "$(INTDIR)\ap_base64.obj"
  -	-@erase "$(INTDIR)\ap_checkpass.obj"
  -	-@erase "$(INTDIR)\ap_cpystrn.obj"
  -	-@erase "$(INTDIR)\ap_getpass.obj"
  -	-@erase "$(INTDIR)\ap_md5c.obj"
  -	-@erase "$(INTDIR)\ap_sha1.obj"
  -	-@erase "$(INTDIR)\ap_snprintf.obj"
   	-@erase "$(INTDIR)\htpasswd.obj"
   	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\htpasswd.exe"
  @@ -63,9 +56,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /D\
  + "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   BSC32=bscmake.exe
  @@ -73,17 +66,12 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  - advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /incremental:no\
  - /pdb:"$(OUTDIR)\htpasswd.pdb" /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" 
  +LINK32_FLAGS=aprlib.lib ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib\
  + comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console\
  + /incremental:no /pdb:"$(OUTDIR)\htpasswd.pdb" /machine:I386\
  + /out:"$(OUTDIR)\htpasswd.exe" /libpath:"../lib/apr/release"\
  + /libpath:"../ap/release" 
   LINK32_OBJS= \
  -	"$(INTDIR)\ap_base64.obj" \
  -	"$(INTDIR)\ap_checkpass.obj" \
  -	"$(INTDIR)\ap_cpystrn.obj" \
  -	"$(INTDIR)\ap_getpass.obj" \
  -	"$(INTDIR)\ap_md5c.obj" \
  -	"$(INTDIR)\ap_sha1.obj" \
  -	"$(INTDIR)\ap_snprintf.obj" \
   	"$(INTDIR)\htpasswd.obj"
   
   "$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  @@ -110,13 +98,6 @@
   !ENDIF 
   
   CLEAN :
  -	-@erase "$(INTDIR)\ap_base64.obj"
  -	-@erase "$(INTDIR)\ap_checkpass.obj"
  -	-@erase "$(INTDIR)\ap_cpystrn.obj"
  -	-@erase "$(INTDIR)\ap_getpass.obj"
  -	-@erase "$(INTDIR)\ap_md5c.obj"
  -	-@erase "$(INTDIR)\ap_sha1.obj"
  -	-@erase "$(INTDIR)\ap_snprintf.obj"
   	-@erase "$(INTDIR)\htpasswd.obj"
   	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(INTDIR)\vc50.pdb"
  @@ -127,9 +108,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "..\include" /I\
  + "..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D\
  + "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   BSC32=bscmake.exe
  @@ -137,18 +118,12 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  - advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /incremental:yes\
  - /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386\
  - /out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept 
  +LINK32_FLAGS=aprlib.lib ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib\
  + comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console\
  + /incremental:yes /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386\
  + /out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept /libpath:"../lib/apr/debug"\
  + /libpath:"../ap/debug" 
   LINK32_OBJS= \
  -	"$(INTDIR)\ap_base64.obj" \
  -	"$(INTDIR)\ap_checkpass.obj" \
  -	"$(INTDIR)\ap_cpystrn.obj" \
  -	"$(INTDIR)\ap_getpass.obj" \
  -	"$(INTDIR)\ap_md5c.obj" \
  -	"$(INTDIR)\ap_sha1.obj" \
  -	"$(INTDIR)\ap_snprintf.obj" \
   	"$(INTDIR)\htpasswd.obj"
   
   "$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  @@ -191,125 +166,65 @@
   
   !IF "$(CFG)" == "htpasswd - Win32 Release" || "$(CFG)" ==\
    "htpasswd - Win32 Debug"
  -SOURCE=..\ap\ap_base64.c
  -DEP_CPP_AP_BA=\
  -	"..\include\ap.h"\
  -	"..\include\ap_ac_config.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_AP_BA=\
  -	"..\ap\ebcdic.h"\
  -	"..\include\ap_config_auto.h"\
  -	"..\include\ap_config_win32.h"\
  -	"..\include\apr.h"\
  -	"..\include\apr_win.h"\
  -	"..\include\os.h"\
  -	"..\os\win32\apr_general.h"\
  -	
  -
  -"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -SOURCE=..\ap\ap_checkpass.c
  -
  -"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -SOURCE=..\ap\ap_cpystrn.c
  -
  -"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -SOURCE=..\ap\ap_getpass.c
  -
  -"$(INTDIR)\ap_getpass.obj" : $(SOURCE) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -SOURCE=..\ap\ap_md5c.c
  -
  -"$(INTDIR)\ap_md5c.obj" : $(SOURCE) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  +SOURCE=.\htpasswd.c
   
  +!IF  "$(CFG)" == "htpasswd - Win32 Release"
   
  -SOURCE=..\ap\ap_sha1.c
  -DEP_CPP_AP_SH=\
  +DEP_CPP_HTPAS=\
   	"..\include\ap.h"\
   	"..\include\ap_ac_config.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  -	"..\include\ap_iol.h"\
  +	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\ap_sha1.h"\
  -	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  +	"..\lib\apr\include\apr_errno.h"\
  +	"..\lib\apr\include\apr_file_io.h"\
  +	"..\lib\apr\include\apr_general.h"\
  +	"..\lib\apr\include\apr_lib.h"\
  +	"..\lib\apr\include\apr_thread_proc.h"\
  +	"..\lib\apr\include\apr_time.h"\
  +	"..\lib\apr\include\apr_win.h"\
   	"..\os\win32\os.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
  -NODEP_CPP_AP_SH=\
  -	"..\ap\ebcdic.h"\
  +NODEP_CPP_HTPAS=\
   	"..\include\ap_config_auto.h"\
   	"..\include\ap_config_win32.h"\
   	"..\include\apr.h"\
  -	"..\include\apr_errno.h"\
  -	"..\include\apr_general.h"\
  -	"..\include\apr_lib.h"\
  -	"..\include\apr_network_io.h"\
  -	"..\include\apr_time.h"\
  -	"..\include\apr_win.h"\
   	"..\include\os.h"\
  -	"..\os\win32\apr_general.h"\
  +	"..\lib\apr\include\apr.h"\
   	
  -
  -"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  +"$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)"
   
  -SOURCE=..\ap\ap_snprintf.c
  -
  -"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  +!ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
  -SOURCE=.\htpasswd.c
   DEP_CPP_HTPAS=\
   	"..\include\ap.h"\
  -	"..\include\ap_ac_config.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\ap_sha1.h"\
   	"..\include\hsregex.h"\
  +	"..\lib\apr\include\apr_errno.h"\
  +	"..\lib\apr\include\apr_file_io.h"\
  +	"..\lib\apr\include\apr_general.h"\
  +	"..\lib\apr\include\apr_lib.h"\
  +	"..\lib\apr\include\apr_thread_proc.h"\
  +	"..\lib\apr\include\apr_time.h"\
  +	"..\lib\apr\include\apr_win.h"\
   	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_HTPAS=\
  -	"..\include\ap_config_auto.h"\
  -	"..\include\ap_config_win32.h"\
  -	"..\include\apr.h"\
  -	"..\include\apr_win.h"\
  -	"..\include\os.h"\
  -	"..\os\win32\apr_general.h"\
  -	"..\os\win32\getopt.h"\
  -	".\apr_lib.h"\
   	
   
   "$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)"
   
  +
  +!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.3       +4 -32     apache-2.0/src/support/htpasswd.dsp
  
  Index: htpasswd.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htpasswd.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- htpasswd.dsp	2000/03/21 23:26:49	1.2
  +++ htpasswd.dsp	2000/03/22 15:21:57	1.3
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX
/FD /c
  -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS"
/D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /D "NDEBUG" /D "WIN32"
/D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
  @@ -51,7 +51,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 /subsystem:console
/machine:I386
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ws2_32.lib /nologo /subsystem:console /machine:I386
  +# ADD LINK32 aprlib.lib ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"../lib/apr/release"
/libpath:"../ap/release"
   
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
  @@ -67,7 +67,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /c
  -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE"
/D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\lib\apr\include" /D "_DEBUG"
/D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  @@ -76,7 +76,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 /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  +# ADD LINK32 aprlib.lib ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
/libpath:"../lib/apr/debug" /libpath:"../ap/debug"
   # SUBTRACT LINK32 /pdb:none
   
   !ENDIF 
  @@ -85,34 +85,6 @@
   
   # Name "htpasswd - Win32 Release"
   # Name "htpasswd - Win32 Debug"
  -# Begin Source File
  -
  -SOURCE=..\ap\ap_base64.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\ap\ap_checkpass.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\ap\ap_cpystrn.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\ap\ap_getpass.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\ap\ap_md5c.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\ap\ap_sha1.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\ap\ap_snprintf.c
  -# End Source File
   # Begin Source File
   
   SOURCE=.\htpasswd.c
  
  
  
  1.5       +0 -1      apache-2.0/src/support/htpasswd.c
  
  Index: htpasswd.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htpasswd.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- htpasswd.c	2000/03/10 00:07:37	1.4
  +++ htpasswd.c	2000/03/22 15:21:57	1.5
  @@ -89,7 +89,6 @@
   
   #ifdef WIN32
   #include <conio.h>
  -#include "../os/win32/getopt.h"
   #define unlink _unlink
   #endif
   
  
  
  

Mime
View raw message