author | Michael Wu <mwu@mozilla.com> |
Thu, 09 Sep 2010 16:12:08 -0400 | |
changeset 52325 | 4b50cff14c740a535ff30481ba078d8789fa69c1 |
parent 52324 | 0d41af6784f79f06c3f7d737e846aa8850118e57 |
child 52326 | 1bd1a125cad9e9ec0517501c6493555246912657 |
push id | 1 |
push user | root |
push date | Tue, 26 Apr 2011 22:38:44 +0000 |
treeherder | mozilla-beta@bfdb6e623a36 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ted, beltzner |
bugs | 589971 |
milestone | 2.0b6pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
build/pgo/Makefile.in | file | annotate | diff | comparison | revisions | |
client.mk | file | annotate | diff | comparison | revisions | |
config/rules.mk | file | annotate | diff | comparison | revisions | |
js/src/config/rules.mk | file | annotate | diff | comparison | revisions |
--- a/build/pgo/Makefile.in +++ b/build/pgo/Makefile.in @@ -50,16 +50,26 @@ DIRS = \ $(NULL) include $(topsrcdir)/config/rules.mk # We install to _profile/pgo TARGET_DEPTH = ../.. include $(topsrcdir)/build/automation-build.mk +ifeq ($(OS_ARCH),Darwin) +ifdef MOZ_DEBUG +browser_path = \"$(TARGET_DIST)/$(MOZ_APP_NAME)/$(MOZ_APP_DISPLAYNAME)Debug.app/Contents/MacOS/$(PROGRAM)\" +else +browser_path = \"$(TARGET_DIST)/$(MOZ_APP_NAME)/$(MOZ_APP_DISPLAYNAME).app/Contents/MacOS/$(PROGRAM)\" +endif +else +browser_path = \"$(TARGET_DIST)/$(MOZ_APP_NAME)/$(PROGRAM)\" +endif + # Stuff to make a build with a profile _PGO_FILES = \ automation.py \ $(topsrcdir)/build/automationutils.py \ profileserver.py \ genpgocert.py \ index.html \
--- a/client.mk +++ b/client.mk @@ -206,16 +206,17 @@ everything: clean build ifdef MOZ_OBJDIR PGO_OBJDIR = $(MOZ_OBJDIR) else PGO_OBJDIR := $(TOPSRCDIR) endif profiledbuild:: $(MAKE) -f $(TOPSRCDIR)/client.mk build MOZ_PROFILE_GENERATE=1 + $(MAKE) -C $(PGO_OBJDIR) package OBJDIR=${PGO_OBJDIR} $(PROFILE_GEN_SCRIPT) $(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild $(MAKE) -f $(TOPSRCDIR)/client.mk build MOZ_PROFILE_USE=1 ##################################################### # Build date unification ifdef MOZ_UNIFY_BDATE
--- a/config/rules.mk +++ b/config/rules.mk @@ -970,21 +970,21 @@ endif # In the second pass, we need to merge the pgc files into the pgd file. # The compiler would do this for us automatically if they were in the right # place, but they're in dist/bin. ifneq (,$(SHARED_LIBRARY)$(PROGRAM)) export:: ifdef PROGRAM $(PYTHON) $(topsrcdir)/build/win32/pgomerge.py \ - $(PROGRAM:$(BIN_SUFFIX)=) $(DIST)/bin + $(PROGRAM:$(BIN_SUFFIX)=) $(DIST)/$(MOZ_APP_NAME) endif ifdef SHARED_LIBRARY $(PYTHON) $(topsrcdir)/build/win32/pgomerge.py \ - $(SHARED_LIBRARY_NAME) $(DIST)/bin + $(SHARED_LIBRARY_NAME) $(DIST)/$(MOZ_APP_NAME) endif endif # SHARED_LIBRARY || PROGRAM endif # WINNT_ endif # MOZ_PROFILE_GENERATE || MOZ_PROFILE_USE endif # NO_PROFILE_GUIDED_OPTIMIZE ##############################################
--- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -970,21 +970,21 @@ endif # In the second pass, we need to merge the pgc files into the pgd file. # The compiler would do this for us automatically if they were in the right # place, but they're in dist/bin. ifneq (,$(SHARED_LIBRARY)$(PROGRAM)) export:: ifdef PROGRAM $(PYTHON) $(topsrcdir)/build/win32/pgomerge.py \ - $(PROGRAM:$(BIN_SUFFIX)=) $(DIST)/bin + $(PROGRAM:$(BIN_SUFFIX)=) $(DIST)/$(MOZ_APP_NAME) endif ifdef SHARED_LIBRARY $(PYTHON) $(topsrcdir)/build/win32/pgomerge.py \ - $(SHARED_LIBRARY_NAME) $(DIST)/bin + $(SHARED_LIBRARY_NAME) $(DIST)/$(MOZ_APP_NAME) endif endif # SHARED_LIBRARY || PROGRAM endif # WINNT_ endif # MOZ_PROFILE_GENERATE || MOZ_PROFILE_USE endif # NO_PROFILE_GUIDED_OPTIMIZE ##############################################