Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

http://bugzilla.mozilla.org/show_bug.cgi?id=111093

Browse Source 
Generation of MAP and COD files
This patch should help create MAP file and COD files only on Windows.
These files will be generated only when MODINFO and CODINFO flags are set.
r=cls,leaf and sr=dveditz


git-svn-id: svn://10.0.0.236/trunk@109712 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
namachi%netscape.com 2001-12-05 03:28:33 +00:00
parent af121ab737
commit 515e646658
4 changed files with 134 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/config/WIN32
View File

@ -72,6 +72,7 @@ OS_LFLAGS=/DEBUG /DEBUGTYPE:CV /PDB:$(PDBFILE)
OPTIMIZER=-O1 -UDEBUG -DNDEBUG
OS_LFLAGS=/OPT:nowin98
# if MOZ_DEBUG is not set and MOZ_PROFILE is set, then we generate
# an optimized build with debugging symbols. Useful for debugging
# compiler optimization bugs, as well as running with Quantify.
@ -89,6 +90,18 @@ OPTIMIZER=-Zi -O1 -UDEBUG -DNDEBUG
!endif
# MOZ_COVERAGE
# if MOZ_DEBUG is not set and MOZ_MAPINFO
!if defined (MOZ_MAPINFO)
OS_LFLAGS=$(OS_LFLAGS) /MAP:$(MAPFILE) /MAPINFO:LINES
!endif
#MOZ_MAPINFO
# if MOZ_DEBUG is not set and MOZ_CODINFO
!if defined (MOZ_CODINFO)
OS_LFLAGS= $(OS_LFLAGS) /COD:$(CODFILE)
!endif
#MOZ_CODINFO
!endif
# MOZ_DEBUG

3
mozilla/config/dll.inc
View File

@ -80,8 +80,9 @@ $(DLL): $(OBJDIR) $(OBJS) $(LLIBS) $(RESFILE) $(DEFFILE) $(EXTRA_LIBS_LIST_FILE)
/DEF:$(DEFFILE)
!endif
!ifdef MAPFILE
/MAP:$(MAPFILE)
/MAP:$(MAPFILE) /MAPINFO:LINES
!endif
!if exist(win32.order) && !defined(MOZ_DEBUG) && defined(MOZ_COVERAGE)
/ORDER:@win32.order
!endif

91
mozilla/config/obj.inc
View File

@ -55,6 +55,13 @@ $(OBJS): makefile.win \
$(LINCS_1)
$(INCS)
-Fd$(PDBFILE)
!ifdef MAPFILE
-Fm$(MAPFILE)
!endif
!ifdef CODFILE
-Fa$(CODFILE)
-FAsc
!endif
$(CURDIR)$(*B).c
<<KEEP
@ -67,6 +74,13 @@ $(OBJS): makefile.win \
$(LINCS_1)
$(INCS)
-Fd$(PDBFILE)
!ifdef MAPFILE
-Fm$(MAPFILE)
!endif
!ifdef CODFILE
-Fa$(CODFILE)
-FAsc
!endif
-Fo.\$(OBJDIR)\
$(CURDIR)$(*B).c
<<KEEP
@ -80,6 +94,13 @@ $(OBJS): makefile.win \
$(LINCS_1)
$(INCS)
-Fd$(PDBFILE)
!ifdef MAPFILE
-Fm$(MAPFILE)
!endif
!ifdef CODFILE
-Fa$(CODFILE)
-FAsc
!endif
-Fo.\$(OBJDIR)\
$(CURDIR)_jmc\$(*B).c
<<KEEP
@ -93,6 +114,13 @@ $(OBJS): makefile.win \
$(LINCS_1)
$(INCS)
-Fd$(PDBFILE)
!ifdef MAPFILE
-Fm$(MAPFILE)
!endif
!ifdef CODFILE
-Fa$(CODFILE)
-FAsc
!endif
$(CURDIR)$(*B).cpp
<<KEEP
@ -105,6 +133,13 @@ $(OBJS): makefile.win \
$(LINCS_1)
$(INCS)
-Fd$(PDBFILE)
!ifdef MAPFILE
-Fm$(MAPFILE)
!endif
!ifdef CODFILE
-Fa$(CODFILE)
-FAsc
!endif
-Fo.\$(OBJDIR)\
$(CURDIR)$(*B).cpp
<<KEEP
@ -119,6 +154,13 @@ $(OBJS): makefile.win \
$(LINCS_1)
$(INCS)
-Fd$(PDBFILE)
!ifdef MAPFILE
-Fm$(MAPFILE)
!endif
!ifdef CODFILE
-Fa$(CODFILE)
-FAsc
!endif
-Fo.\$(OBJDIR)\
$(CURDIR)_jmc\$(*B).cpp
<<KEEP
@ -151,6 +193,13 @@ $(OBJS): makefile.win \
$(LINCS_1)
$(INCS)
-Fd$(PDBFILE)
!ifdef MAPFILE
-Fm$(MAPFILE)
!endif
!ifdef CODFILE
-Fa$(CODFILE)
-FAsc
!endif
-Fo.\$(OBJDIR)\
$(CURDIR)$(*B).c
<<
@ -180,6 +229,13 @@ $(OBJS): makefile.win \
$(LLIBS)
$(OS_LIBS)
-Fd$(PDBFILE)
!ifdef MAPFILE
-Fm$(MAPFILE)
!endif
!ifdef CODFILE
-Fa$(CODFILE)
-FAsc
!endif
-Fe.\$(OBJDIR)\
-Fo.\$(OBJDIR)\
$(CURDIR)$(*B).c
@ -197,6 +253,13 @@ $(OBJS): makefile.win \
$(OS_LIBS)
/link $(LFLAGS)
-Fd$(PDBFILE)
!ifdef MAPFILE
-Fm$(MAPFILE)
!endif
!ifdef CODFILE
-Fa$(CODFILE)
-FAsc
!endif
-Fe.\$(OBJDIR)\
-Fo.\$(OBJDIR)\
$(CURDIR)$(*B).cpp
@ -220,6 +283,13 @@ $(OBJS): makefile.win \
$(LINCS_1)
$(INCS)
-Fd$(PDBFILE)
!ifdef MAPFILE
-Fm$(MAPFILE)
!endif
!ifdef CODFILE
-Fa$(CODFILE)
-FAsc
!endif
$(CURDIR)$(*B).c
<<KEEP
@ -233,6 +303,13 @@ $(OBJS): makefile.win \
$(LINCS_1)
$(INCS)
-Fd$(PDBFILE)
!ifdef MAPFILE
-Fm$(MAPFILE)
!endif
!ifdef CODFILE
-Fa$(CODFILE)
-FAsc
!endif
-Fo.\$(OBJDIR)\
$(CURDIR)$(*B).c
<<KEEP
@ -247,6 +324,13 @@ $(OBJS): makefile.win \
$(LINCS_1)
$(INCS)
-Fd$(PDBFILE)
!ifdef MAPFILE
-Fm$(MAPFILE)
!endif
!ifdef CODFILE
-Fa$(CODFILE)
-FAsc
!endif
$(CURDIR)$(*B).cpp
<<KEEP
@ -260,6 +344,13 @@ $(OBJS): makefile.win \
$(LINCS_1)
$(INCS)
-Fd$(PDBFILE)
!ifdef MAPFILE
-Fm$(MAPFILE)
!endif
!ifdef CODFILE
-Fa$(CODFILE)
-FAsc
!endif
-Fo.\$(OBJDIR)\
$(CURDIR)$(*B).cpp
<<KEEP

30
mozilla/config/rules.mak
View File

@ -278,18 +278,35 @@ OS_LIBS=$(EXE_LIBS) $(OS_LIBS)
!ifdef LIBRARY_NAME
PDBFILE=$(LIBRARY_NAME)
!endif
# Replace optimizer and pdb related flags to use our own conventions
!ifdef DLLNAME
PDBFILE=$(DLLNAME)
!endif
# Replace optimizer and mapinfo related flags to use our own conventions
!ifdef LIBRARY_NAME
MAPFILE=$(LIBRARY_NAME)
!endif
!ifdef DLLNAME
MAPFILE=$(DLLNAME)
!endif
# Replace optimizer and codinfo related flags to use our own conventions
!ifdef LIBRARY_NAME
CODFILE=$(LIBRARY_NAME)
!endif
!ifdef DLLNAME
CODFILE=$(DLLNAME)
!endif
#//------------------------------------------------------------------------
#//
#// Prepend the "object directory" to any public make variables.
#// PDBFILE - File containing debug info
#// RESFILE - Compiled resource file
#// MAPFILE - MAP file for an executable
#// CODFILE - COD file for an executable
#//
#//------------------------------------------------------------------------
!ifdef PDBFILE
@ -300,8 +317,17 @@ PDBFILE=.\$*.pdb # used for executables
!ifdef RESFILE
RESFILE=.\$(OBJDIR)\$(RESFILE)
!endif
!ifdef MAPFILE
MAPFILE=.\$(OBJDIR)\$(MAPFILE)
MAPFILE=.\$(OBJDIR)\$(MAPFILE).map
!else
MAPFILE=.\$*.map # used for executables
!endif
!ifdef CODFILE
CODFILE=.\$(OBJDIR)\$(CODFILE).cod
!else
CODFILE=.\$*.cod # used for executables
!endif
!ifdef DIRS