Bug 479978 - remove references to MOZ_PROFILE from the build system; (Cv2-MC) the 8 files; r=ted.mielczarek
authorSerge Gautherie <sgautherie.bz@free.fr>
Sat, 28 Mar 2009 03:00:25 +0100
changeset 26642 228e3145c1a6c4bea1479934f2648918b272b603
parent 26641 d943be61416da8680bfe4b64ecb2f45da0b81369
child 26643 f3bfeb5de776e18a83ce4e75b762300ea6279216
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs479978
milestone1.9.2a1pre
Bug 479978 - remove references to MOZ_PROFILE from the build system; (Cv2-MC) the 8 files; r=ted.mielczarek
Makefile.in
config/autoconf.mk.in
config/config.mk
configure.in
js/src/config/autoconf.mk.in
js/src/config/config.mk
js/src/configure.in
tools/footprint/README.reports
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,35 +119,16 @@ distclean::
 ifeq ($(OS_ARCH),WINNT)
 rebase:
 ifdef MOZILLA_OFFICIAL
 	echo rebasing $(DIST)
 	/bin/find $(DIST) -name "*.dll" -a -not -name "msvc*" > rebase.lst
 	rebase -b 60000000 -R . -G rebase.lst
 	rm rebase.lst
 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
 
 ifeq ($(OS_ARCH),WINNT)
 # we want to copy PDB files on Windows
 MAKE_SYM_STORE_ARGS := -c
 ifdef PDBSTR_PATH
 MAKE_SYM_STORE_ARGS += -i
 endif
@@ -213,17 +194,17 @@ endif
 ifeq ($(OS_ARCH),WINNT)
 signnss:
 ifdef MOZILLA_OFFICIAL
 	echo signing NSS libs
 	cd $(DIST)/bin; ./shlibsign.exe -v -i softokn3.dll
 	cd $(DIST)/bin; ./shlibsign.exe -v -i freebl3.dll
 endif # MOZILLA_OFFICIAL
 
-deliver: splitsymbols rebase signnss
+deliver: rebase signnss
 
 endif # WINNT
 
 ifneq (,$(wildcard $(DIST)/bin/application.ini))
 BUILDID = $(shell $(PYTHON) $(srcdir)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
 else
 BUILDID = $(shell $(PYTHON) $(srcdir)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
 endif
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -582,17 +582,16 @@ MOZ_PSM=@MOZ_PSM@
 GSSAPI_INCLUDES = @GSSAPI_INCLUDES@
 USE_GSSAPI	= @USE_GSSAPI@
 
 MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@
 BUILD_OFFICIAL = @BUILD_OFFICIAL@
 MOZ_MILESTONE_RELEASE = @MOZ_MILESTONE_RELEASE@
 
 # Win32 options
-MOZ_PROFILE	= @MOZ_PROFILE@
 MOZ_BROWSE_INFO	= @MOZ_BROWSE_INFO@
 MOZ_TOOLS_DIR	= @MOZ_TOOLS_DIR@
 MOZ_DEBUG_SYMBOLS = @MOZ_DEBUG_SYMBOLS@
 MOZ_QUANTIFY	= @MOZ_QUANTIFY@
 MSMANIFEST_TOOL = @MSMANIFEST_TOOL@
 WIN32_REDIST_DIR = @WIN32_REDIST_DIR@
 WIN32_CRT_SRC_DIR = @WIN32_CRT_SRC_DIR@
 WIN32_CUSTOM_CRT_DIR = @WIN32_CUSTOM_CRT_DIR@
--- a/config/config.mk
+++ b/config/config.mk
@@ -240,17 +240,17 @@ endif
 
 
 # append debug flags 
 # (these might have been above when processing MOZ_DBGRINFO_MODULES)
 OS_CFLAGS += $(_DEBUG_CFLAGS)
 OS_CXXFLAGS += $(_DEBUG_CFLAGS)
 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_)
 ifdef MOZ_DEBUG
 ifneq (,$(MOZ_BROWSE_INFO)$(MOZ_BSCFILE))
 OS_CFLAGS += -FR
 OS_CXXFLAGS += -FR
 endif
 else # ! MOZ_DEBUG
 
--- a/configure.in
+++ b/configure.in
@@ -8062,17 +8062,16 @@ AC_SUBST(FIREFOX_VERSION)
 
 AC_SUBST(MOZ_PKG_SPECIAL)
 
 AC_SUBST(MOZILLA_OFFICIAL)
 AC_SUBST(BUILD_OFFICIAL)
 AC_SUBST(MOZ_MILESTONE_RELEASE)
 
 dnl win32 options
-AC_SUBST(MOZ_PROFILE)
 AC_SUBST(MOZ_DEBUG_SYMBOLS)
 AC_SUBST(MOZ_MAPINFO)
 AC_SUBST(MOZ_BROWSE_INFO)
 AC_SUBST(MOZ_TOOLS_DIR)
 AC_SUBST(CYGWIN_WRAPPER)
 AC_SUBST(AS_PERL)
 AC_SUBST(WIN32_REDIST_DIR)
 AC_SUBST(PYTHON)
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -323,17 +323,16 @@ MOZ_OS2_TOOLS = @MOZ_OS2_TOOLS@
 MOZ_OS2_USE_DECLSPEC = @MOZ_OS2_USE_DECLSPEC@
 MOZ_OS2_HIGH_MEMORY = @MOZ_OS2_HIGH_MEMORY@
 
 MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@
 BUILD_OFFICIAL = @BUILD_OFFICIAL@
 MOZ_MILESTONE_RELEASE = @MOZ_MILESTONE_RELEASE@
 
 # Win32 options
-MOZ_PROFILE	= @MOZ_PROFILE@
 MOZ_BROWSE_INFO	= @MOZ_BROWSE_INFO@
 MOZ_TOOLS_DIR	= @MOZ_TOOLS_DIR@
 MOZ_DEBUG_SYMBOLS = @MOZ_DEBUG_SYMBOLS@
 MOZ_QUANTIFY	= @MOZ_QUANTIFY@
 MSMANIFEST_TOOL = @MSMANIFEST_TOOL@
 WIN32_REDIST_DIR = @WIN32_REDIST_DIR@
 WIN32_CRT_SRC_DIR = @WIN32_CRT_SRC_DIR@
 WIN32_CUSTOM_CRT_DIR = @WIN32_CUSTOM_CRT_DIR@
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -240,17 +240,17 @@ endif
 
 
 # append debug flags 
 # (these might have been above when processing MOZ_DBGRINFO_MODULES)
 OS_CFLAGS += $(_DEBUG_CFLAGS)
 OS_CXXFLAGS += $(_DEBUG_CFLAGS)
 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_)
 ifdef MOZ_DEBUG
 ifneq (,$(MOZ_BROWSE_INFO)$(MOZ_BSCFILE))
 OS_CFLAGS += -FR
 OS_CXXFLAGS += -FR
 endif
 else # ! MOZ_DEBUG
 
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -5051,17 +5051,16 @@ AC_SUBST(MOZ_APP_VERSION)
 
 AC_SUBST(MOZ_PKG_SPECIAL)
 
 AC_SUBST(MOZILLA_OFFICIAL)
 AC_SUBST(BUILD_OFFICIAL)
 AC_SUBST(MOZ_MILESTONE_RELEASE)
 
 dnl win32 options
-AC_SUBST(MOZ_PROFILE)
 AC_SUBST(MOZ_DEBUG_SYMBOLS)
 AC_SUBST(MOZ_MAPINFO)
 AC_SUBST(MOZ_BROWSE_INFO)
 AC_SUBST(MOZ_TOOLS_DIR)
 AC_SUBST(CYGWIN_WRAPPER)
 AC_SUBST(AS_PERL)
 AC_SUBST(WIN32_REDIST_DIR)
 AC_SUBST(PYTHON)
--- a/tools/footprint/README.reports
+++ b/tools/footprint/README.reports
@@ -28,19 +28,18 @@ 3. Configure a web server with the ``bus
 in this directory.
 
 4. Pull and build a ``release'' build. Besides the normal Win32 flags
 described on the Win32 build instructions, be sure that you've set the
 following:
 
   set BUILD_OPT=1
   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
 following command from the mozilla/tools/footprint directory:
 
   make --unix -fwin32-gdf.mk \
     BUSTER_URL="http://myserver/cgi-bin/buster.cgi?refresh=10"
 
 (Replace ``myserver'' with the name of the webserver where you