зеркало из https://github.com/mozilla/gecko-dev.git
Bug 479978 - remove references to MOZ_PROFILE from the build system; (Cv2-MC) the 8 files; r=ted.mielczarek
This commit is contained in:
Родитель
01d9d132fb
Коммит
4eb784a90c
21
Makefile.in
21
Makefile.in
|
@ -124,25 +124,6 @@ ifdef MOZILLA_OFFICIAL
|
||||||
rebase -b 60000000 -R . -G rebase.lst
|
rebase -b 60000000 -R . -G rebase.lst
|
||||||
rm rebase.lst
|
rm rebase.lst
|
||||||
endif
|
endif
|
||||||
|
|
||||||
splitsymbols:
|
|
||||||
ifdef MOZILLA_OFFICIAL
|
|
||||||
ifdef MOZ_DEBUG_SYMBOLS
|
|
||||||
echo finding pdb files
|
|
||||||
mkdir -p $(DIST)/$(BUILDID)
|
|
||||||
-cp `/bin/find . -path "./dist" -prune -o -name "*.dll" | sed "s/\.dll$$/\.pdb/" | xargs` $(DIST)/$(BUILDID)
|
|
||||||
-cp `/bin/find . -path "./dist" -prune -o -name "*.exe" | sed "s/\.exe$$/\.pdb/" | xargs` $(DIST)/$(BUILDID)
|
|
||||||
-cp `/bin/find . -path "./dist" -prune -o -name "*.EXE" | sed "s/\.EXE$$/\.pdb/" | xargs` $(DIST)/$(BUILDID)
|
|
||||||
endif # MOZ_DEBUG_SYMBOLS
|
|
||||||
ifdef MOZ_PROFILE
|
|
||||||
echo splitting symbols out of binaries
|
|
||||||
/bin/find $(DIST) -name "*.dll" -exec splitsym {} \;
|
|
||||||
/bin/find $(DIST) -name "*.exe" -exec splitsym {} \;
|
|
||||||
/bin/find $(DIST) -name "*.EXE" -exec splitsym {} \;
|
|
||||||
mkdir -p $(DIST)/$(BUILDID)
|
|
||||||
/bin/find $(DIST) -name "*.dbg" -exec mv {} $(DIST)/$(BUILDID) \;
|
|
||||||
endif # MOZ_PROFILE
|
|
||||||
endif # MOZILLA_OFFICIAL
|
|
||||||
endif # WINNT
|
endif # WINNT
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),WINNT)
|
ifeq ($(OS_ARCH),WINNT)
|
||||||
|
@ -218,7 +199,7 @@ ifdef MOZILLA_OFFICIAL
|
||||||
cd $(DIST)/bin; ./shlibsign.exe -v -i freebl3.dll
|
cd $(DIST)/bin; ./shlibsign.exe -v -i freebl3.dll
|
||||||
endif # MOZILLA_OFFICIAL
|
endif # MOZILLA_OFFICIAL
|
||||||
|
|
||||||
deliver: splitsymbols rebase signnss
|
deliver: rebase signnss
|
||||||
|
|
||||||
endif # WINNT
|
endif # WINNT
|
||||||
|
|
||||||
|
|
|
@ -587,7 +587,6 @@ BUILD_OFFICIAL = @BUILD_OFFICIAL@
|
||||||
MOZ_MILESTONE_RELEASE = @MOZ_MILESTONE_RELEASE@
|
MOZ_MILESTONE_RELEASE = @MOZ_MILESTONE_RELEASE@
|
||||||
|
|
||||||
# Win32 options
|
# Win32 options
|
||||||
MOZ_PROFILE = @MOZ_PROFILE@
|
|
||||||
MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@
|
MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@
|
||||||
MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@
|
MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@
|
||||||
MOZ_DEBUG_SYMBOLS = @MOZ_DEBUG_SYMBOLS@
|
MOZ_DEBUG_SYMBOLS = @MOZ_DEBUG_SYMBOLS@
|
||||||
|
|
|
@ -245,7 +245,7 @@ OS_CFLAGS += $(_DEBUG_CFLAGS)
|
||||||
OS_CXXFLAGS += $(_DEBUG_CFLAGS)
|
OS_CXXFLAGS += $(_DEBUG_CFLAGS)
|
||||||
OS_LDFLAGS += $(_DEBUG_LDFLAGS)
|
OS_LDFLAGS += $(_DEBUG_LDFLAGS)
|
||||||
|
|
||||||
# MOZ_PROFILE equivs for win32
|
# XXX: What does this? Bug 482434 filed for better explanation.
|
||||||
ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
|
ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
|
||||||
ifdef MOZ_DEBUG
|
ifdef MOZ_DEBUG
|
||||||
ifneq (,$(MOZ_BROWSE_INFO)$(MOZ_BSCFILE))
|
ifneq (,$(MOZ_BROWSE_INFO)$(MOZ_BSCFILE))
|
||||||
|
|
|
@ -8067,7 +8067,6 @@ AC_SUBST(BUILD_OFFICIAL)
|
||||||
AC_SUBST(MOZ_MILESTONE_RELEASE)
|
AC_SUBST(MOZ_MILESTONE_RELEASE)
|
||||||
|
|
||||||
dnl win32 options
|
dnl win32 options
|
||||||
AC_SUBST(MOZ_PROFILE)
|
|
||||||
AC_SUBST(MOZ_DEBUG_SYMBOLS)
|
AC_SUBST(MOZ_DEBUG_SYMBOLS)
|
||||||
AC_SUBST(MOZ_MAPINFO)
|
AC_SUBST(MOZ_MAPINFO)
|
||||||
AC_SUBST(MOZ_BROWSE_INFO)
|
AC_SUBST(MOZ_BROWSE_INFO)
|
||||||
|
|
|
@ -328,7 +328,6 @@ BUILD_OFFICIAL = @BUILD_OFFICIAL@
|
||||||
MOZ_MILESTONE_RELEASE = @MOZ_MILESTONE_RELEASE@
|
MOZ_MILESTONE_RELEASE = @MOZ_MILESTONE_RELEASE@
|
||||||
|
|
||||||
# Win32 options
|
# Win32 options
|
||||||
MOZ_PROFILE = @MOZ_PROFILE@
|
|
||||||
MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@
|
MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@
|
||||||
MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@
|
MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@
|
||||||
MOZ_DEBUG_SYMBOLS = @MOZ_DEBUG_SYMBOLS@
|
MOZ_DEBUG_SYMBOLS = @MOZ_DEBUG_SYMBOLS@
|
||||||
|
|
|
@ -245,7 +245,7 @@ OS_CFLAGS += $(_DEBUG_CFLAGS)
|
||||||
OS_CXXFLAGS += $(_DEBUG_CFLAGS)
|
OS_CXXFLAGS += $(_DEBUG_CFLAGS)
|
||||||
OS_LDFLAGS += $(_DEBUG_LDFLAGS)
|
OS_LDFLAGS += $(_DEBUG_LDFLAGS)
|
||||||
|
|
||||||
# MOZ_PROFILE equivs for win32
|
# XXX: What does this? Bug 482434 filed for better explanation.
|
||||||
ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
|
ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
|
||||||
ifdef MOZ_DEBUG
|
ifdef MOZ_DEBUG
|
||||||
ifneq (,$(MOZ_BROWSE_INFO)$(MOZ_BSCFILE))
|
ifneq (,$(MOZ_BROWSE_INFO)$(MOZ_BSCFILE))
|
||||||
|
|
|
@ -5056,7 +5056,6 @@ AC_SUBST(BUILD_OFFICIAL)
|
||||||
AC_SUBST(MOZ_MILESTONE_RELEASE)
|
AC_SUBST(MOZ_MILESTONE_RELEASE)
|
||||||
|
|
||||||
dnl win32 options
|
dnl win32 options
|
||||||
AC_SUBST(MOZ_PROFILE)
|
|
||||||
AC_SUBST(MOZ_DEBUG_SYMBOLS)
|
AC_SUBST(MOZ_DEBUG_SYMBOLS)
|
||||||
AC_SUBST(MOZ_MAPINFO)
|
AC_SUBST(MOZ_MAPINFO)
|
||||||
AC_SUBST(MOZ_BROWSE_INFO)
|
AC_SUBST(MOZ_BROWSE_INFO)
|
||||||
|
|
|
@ -33,9 +33,8 @@ following:
|
||||||
|
|
||||||
set BUILD_OPT=1
|
set BUILD_OPT=1
|
||||||
set MOZ_DEBUG=
|
set MOZ_DEBUG=
|
||||||
set MOZ_PROFILE=
|
|
||||||
|
|
||||||
That is, MOZ_DEBUG and MOZ_PROFILE should be unset.
|
That is, MOZ_DEBUG should be unset.
|
||||||
|
|
||||||
5. To collect data and build the dynamic footprint graph, type the
|
5. To collect data and build the dynamic footprint graph, type the
|
||||||
following command from the mozilla/tools/footprint directory:
|
following command from the mozilla/tools/footprint directory:
|
||||||
|
|
Загрузка…
Ссылка в новой задаче