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/os/win32/installer/installdll install.c install.dsp install.mak
Date Wed, 22 Mar 2000 15:33:56 GMT
stoddard    00/03/22 07:33:56

  Modified:    src/os/win32/installer/installdll install.c install.dsp
                        install.mak
  Log:
  First cut at getting the Win32 installer working
  
  Submitted by:	William Rowe
  Reviewed by:	Bill Stoddard
  
  Revision  Changes    Path
  1.4       +2 -2      apache-2.0/src/os/win32/installer/installdll/install.c
  
  Index: install.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/installer/installdll/install.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- install.c	1999/10/11 22:40:03	1.3
  +++ install.c	2000/03/22 15:33:55	1.4
  @@ -15,8 +15,8 @@
   #include <direct.h>
   #include <time.h>
   
  -#include "conf.h"
  -#include "ap.h"
  +#include "apr_winconfig.h"
  +#include "apr_lib.h"
   
   #ifdef strftime
   #undef strftime
  
  
  
  1.2       +5 -3      apache-2.0/src/os/win32/installer/installdll/install.dsp
  
  Index: install.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/installer/installdll/install.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- install.dsp	1999/08/24 06:45:50	1.1
  +++ install.dsp	2000/03/22 15:33:56	1.2
  @@ -43,7 +43,8 @@
   # 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 /MT /W3 /GX /O2 /I "../../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /FD /c
  +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../lib/apr/include" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -69,7 +70,8 @@
   # 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 /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /D "WIN32" /D "_DEBUG"
/D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../lib/apr/include" /D "WIN32"
/D "_DEBUG" /D "_WINDOWS" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -92,7 +94,7 @@
   # PROP Default_Filter ""
   # Begin Source File
   
  -SOURCE=..\..\..\..\ap\ap_snprintf.c
  +SOURCE=..\..\..\..\lib\apr\lib\apr_snprintf.c
   # End Source File
   # Begin Source File
   
  
  
  
  1.2       +54 -51    apache-2.0/src/os/win32/installer/installdll/install.mak
  
  Index: install.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/installer/installdll/install.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- install.mak	1999/08/24 06:45:50	1.1
  +++ install.mak	2000/03/22 15:33:56	1.2
  @@ -46,7 +46,7 @@
   !ENDIF 
   
   CLEAN :
  -	-@erase "$(INTDIR)\ap_snprintf.obj"
  +	-@erase "$(INTDIR)\apr_snprintf.obj"
   	-@erase "$(INTDIR)\install.obj"
   	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\install.dll"
  @@ -57,9 +57,8 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "../../../../include" /D "WIN32" /D\
  - "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\install.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "../../../../lib/apr/include" /D "WIN32" /D\
  + "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   
  @@ -108,7 +107,7 @@
   DEF_FILE= \
   	".\install.def"
   LINK32_OBJS= \
  -	"$(INTDIR)\ap_snprintf.obj" \
  +	"$(INTDIR)\apr_snprintf.obj" \
   	"$(INTDIR)\install.obj"
   
   "$(OUTDIR)\install.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  @@ -135,7 +134,7 @@
   !ENDIF 
   
   CLEAN :
  -	-@erase "$(INTDIR)\ap_snprintf.obj"
  +	-@erase "$(INTDIR)\apr_snprintf.obj"
   	-@erase "$(INTDIR)\install.obj"
   	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(INTDIR)\vc50.pdb"
  @@ -149,9 +148,8 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /D "WIN32"\
  - /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\install.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../lib/apr/include" /D\
  + "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -201,7 +199,7 @@
   DEF_FILE= \
   	".\install.def"
   LINK32_OBJS= \
  -	"$(INTDIR)\ap_snprintf.obj" \
  +	"$(INTDIR)\apr_snprintf.obj" \
   	"$(INTDIR)\install.obj"
   
   "$(OUTDIR)\install.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  @@ -214,45 +212,44 @@
   
   !IF "$(CFG)" == "install - Win32 Release" || "$(CFG)" ==\
    "install - Win32 Debug"
  -SOURCE=..\..\..\..\ap\ap_snprintf.c
  +SOURCE=..\..\..\..\lib\apr\lib\apr_snprintf.c
   
   !IF  "$(CFG)" == "install - Win32 Release"
   
  -DEP_CPP_AP_SN=\
  -	"..\..\..\..\include\alloc.h"\
  -	"..\..\..\..\include\ap.h"\
  -	"..\..\..\..\include\ap_config.h"\
  -	"..\..\..\..\include\ap_ctype.h"\
  -	"..\..\..\..\include\ap_mmn.h"\
  -	"..\..\..\..\include\buff.h"\
  -	"..\..\..\..\include\hsregex.h"\
  -	"..\..\..\..\include\httpd.h"\
  -	"..\..\..\..\include\util_uri.h"\
  -	"..\..\os.h"\
  -	"..\..\readdir.h"\
  +DEP_CPP_APR_S=\
  +	"..\..\..\..\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"\
  +	"..\..\..\..\lib\apr\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_APR_S=\
  +	"..\..\..\..\lib\apr\include\apr.h"\
  +	"..\..\..\..\lib\apr\lib\apr_config.h"\
  +	
   
  -"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
  +"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "install - Win32 Debug"
   
  -DEP_CPP_AP_SN=\
  -	"..\..\..\..\include\alloc.h"\
  -	"..\..\..\..\include\ap.h"\
  -	"..\..\..\..\include\ap_config.h"\
  -	"..\..\..\..\include\ap_ctype.h"\
  -	"..\..\..\..\include\ap_mmn.h"\
  -	"..\..\..\..\include\buff.h"\
  -	"..\..\..\..\include\hsregex.h"\
  -	"..\..\..\..\include\httpd.h"\
  -	"..\..\..\..\include\util_uri.h"\
  -	"..\..\os.h"\
  -	"..\..\readdir.h"\
  +DEP_CPP_APR_S=\
  +	"..\..\..\..\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"\
  +	"..\..\..\..\lib\apr\include\apr_winconfig.h"\
   	
   
  -"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
  +"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -263,13 +260,18 @@
   !IF  "$(CFG)" == "install - Win32 Release"
   
   DEP_CPP_INSTA=\
  -	"..\..\..\..\include\ap.h"\
  -	"..\..\..\..\include\ap_config.h"\
  -	"..\..\..\..\include\ap_ctype.h"\
  -	"..\..\..\..\include\ap_mmn.h"\
  -	"..\..\..\..\include\conf.h"\
  -	"..\..\..\..\include\hsregex.h"\
  -	"..\..\os.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"\
  +	"..\..\..\..\lib\apr\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_INSTA=\
  +	"..\..\..\..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTA) "$(INTDIR)"
  @@ -278,13 +280,14 @@
   !ELSEIF  "$(CFG)" == "install - Win32 Debug"
   
   DEP_CPP_INSTA=\
  -	"..\..\..\..\include\ap.h"\
  -	"..\..\..\..\include\ap_config.h"\
  -	"..\..\..\..\include\ap_ctype.h"\
  -	"..\..\..\..\include\ap_mmn.h"\
  -	"..\..\..\..\include\conf.h"\
  -	"..\..\..\..\include\hsregex.h"\
  -	"..\..\os.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"\
  +	"..\..\..\..\lib\apr\include\apr_winconfig.h"\
   	
   
   "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTA) "$(INTDIR)"
  
  
  

Mime
View raw message