apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr-iconv/build modules.mk.win
Date Fri, 07 Feb 2003 01:02:02 GMT
wrowe       2003/02/06 17:02:02

  Modified:    .        apriconv.dsp libapriconv.dsp
               build    modules.mk.win
  Log:
    *) Introduce Release mode debugging symbols for Win32 builds of apr.
       All library builds gain /Zi for debug symbols (which are discarded
       at link time if some flavor of the /debug flag isn't passed to link)
       and .dll builds gain both .pdb and .dbg files (older debuggers and
       Dr. Watson-type utilities on WinNT or Win9x don't support the newer
       .pdb symbol files.)  Documentation on how-to-use these symbol files
       will be forthcoming.  [Allen Edwards, William Rowe]
  
  Revision  Changes    Path
  1.8       +2 -2      apr-iconv/apriconv.dsp
  
  Index: apriconv.dsp
  ===================================================================
  RCS file: /home/cvs/apr-iconv/apriconv.dsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apriconv.dsp	12 Jan 2003 23:46:29 -0000	1.7
  +++ apriconv.dsp	7 Feb 2003 01:02:01 -0000	1.8
  @@ -41,7 +41,7 @@
   # PROP Intermediate_Dir "LibR"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MD /W3 /O2 /I "../apr/include" /I "include" /D "NDEBUG" /D "APR_DECLARE_STATIC"
/D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibR\apriconv" /FD /c
  +# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../apr/include" /I "include" /D "NDEBUG" /D "APR_DECLARE_STATIC"
/D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibR\apriconv_src" /FD /c
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
   BSC32=bscmake.exe
  @@ -65,7 +65,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../apr/include" /I "include" /D "_DEBUG" /D
"APR_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibD\apriconv" /FD
/c
  +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../apr/include" /I "include" /D "_DEBUG" /D
"APR_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibD\apriconv_src"
/FD /c
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
   BSC32=bscmake.exe
  
  
  
  1.9       +11 -3     apr-iconv/libapriconv.dsp
  
  Index: libapriconv.dsp
  ===================================================================
  RCS file: /home/cvs/apr-iconv/libapriconv.dsp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- libapriconv.dsp	20 Jan 2003 18:39:18 -0000	1.8
  +++ libapriconv.dsp	7 Feb 2003 01:02:01 -0000	1.9
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MD /W3 /O2 /I "../apr/include" /I "include" /D "NDEBUG" /D "WIN32" /D
"_WINDOWS" /D "API_DECLARE_EXPORT" /Fd"Release\apriconv" /FD /c
  +# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../apr/include" /I "include" /D "NDEBUG" /D "WIN32"
/D "_WINDOWS" /D "API_DECLARE_EXPORT" /Fd"Release\libapriconv_src" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
  @@ -53,7 +53,15 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows
/dll /map /machine:I386
  -# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll
/map /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE50000"
/subsystem:windows /dll /map /debug /debugtype:both /machine:I386 /pdbtype:sept
  +# Begin Custom Build - Extracting .dbg symbols from $(InputPath)
  +InputPath=.\Release\libapriconv.dll
  +SOURCE="$(InputPath)"
  +
  +".\Release\libapriconv.dbg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	rebase -q -b 0x6EE50000 -x ".\Release" $(InputPath)
  +
  +# End Custom Build
   
   !ELSEIF  "$(CFG)" == "libapriconv - Win32 Debug"
   
  @@ -69,7 +77,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../apr/include" /I "include" /D "_DEBUG" /D
"WIN32" /D "_WINDOWS" /D "API_DECLARE_EXPORT" /Fd"Debug\apriconv" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../apr/include" /I "include" /D "_DEBUG" /D
"WIN32" /D "_WINDOWS" /D "API_DECLARE_EXPORT" /Fd"Debug\libapriconv_src" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
  
  
  
  1.7       +15 -6     apr-iconv/build/modules.mk.win
  
  Index: modules.mk.win
  ===================================================================
  RCS file: /home/cvs/apr-iconv/build/modules.mk.win,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- modules.mk.win	15 Jan 2003 15:18:13 -0000	1.6
  +++ modules.mk.win	7 Feb 2003 01:02:02 -0000	1.7
  @@ -18,8 +18,9 @@
   # release shared
   APR_LIB_PFX = $(APR_SOURCE)\Release\lib
   API_LIB_PFX = $(API_SOURCE)\Release\lib
  -CFG_CFLAGS  = /MD /O2
  +CFG_CFLAGS  = /MD /Zi /O2
   CFG_DEFINES = /D "NDEBUG"
  +CFG_LDFLAGS = /debug /debugtype:both /pdbtype:sept 
   CFG_OUTPUT  = Release\iconv
   
   !ELSE
  @@ -27,8 +28,9 @@
   # release static
   APR_LIB_PFX = $(APR_SOURCE)\LibR\	# no line continuation
   API_LIB_PFX = $(API_SOURCE)\LibR\	# no line continuation
  -CFG_CFLAGS  = /MD /O2
  +CFG_CFLAGS  = /MD /Zi /O2
   CFG_DEFINES = /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
  +CFG_LDFLAGS = /debug /debugtype:both /pdbtype:sept 
   CFG_OUTPUT  = LibR\iconv
   
   !ELSE
  @@ -85,10 +87,17 @@
   LDFLAGS      = /WARN:0
   ALL_LDFLAGS  = $(INT_LDFLAGS) $(LDFLAGS)
   
  +!IF "$(BUILD_MODE)" == "release" || "$(BUILD_MODE)" == "Release"
  +ALL_REBASE = -d -b $(REBASE_TOP) -x $(OUTPUT_DIR)
  +!ELSE
  +ALL_REBASE = -d -b $(REBASE_TOP)
  +!ENDIF
  +REBASE_STAMP = $(OUTPUT_DIR)\rebased.$(REBASE_TOP).log
  +
   .c{$(OUTPUT_DIR)}.so:
   	-$(SILENT)if not exist "$(OUTPUT_DIR)\$(NULL)" mkdir "$(OUTPUT_DIR)"
   	$(SILENT)echo Compiling and linking $@...
  -	$(SILENT)cl $(ALL_CFLAGS) /Fo"$*.obj" /Fd"$*" $< \
  +	$(SILENT)cl $(ALL_CFLAGS) /Fo"$*.obj" /Fd"$*_src" $< \
   		/link $(ALL_LDFLAGS) /out:$@ \
   		"$(API_LIB_PFX)apriconv.lib" \
   		"$(APR_LIB_PFX)apr.lib" \
  @@ -97,10 +106,10 @@
   	$(SILENT)del "$*.exp"
   	$(SILENT)del "$*.lib"
   
  -all: $(ALL_TARGETS) rebase
  +all: $(ALL_TARGETS) $(REBASE_STAMP)
   
  -rebase:
  -	$(SILENT)rebase -d -b $(REBASE_TOP) -q $(ALL_TARGETS)
  +$(REBASE_STAMP): $(ALL_TARGETS) 
  +	$(SILENT)rebase $(ALL_REBASE) $(ALL_TARGETS) >$(REBASE_STAMP)
   
   clean:
   	-$(SILENT)if exist "$(OUTPUT_DIR)/$(NULL)" $(rmdir) $(OUTPUT_DIR)
  
  
  

Mime
View raw message