bug 422296: need debug+leak testing builds for mozilla central - trivial follow-up for build/Makefile.in. r=tmielczarek, patch=me
authorBen Hearsum <bhearsum@mozilla.com>
Wed, 14 May 2008 08:22:25 -0400
changeset 15120 30fb4015e748beb9dfa9af58b61a6ae88260d5af
parent 15119 0fa5cdc6e062d50761298822f2d66a4ade6cc7b6
child 15121 22910de574673c051335ba0ff9dfcbd4fa714ef0
push idunknown
push userunknown
push dateunknown
reviewerstmielczarek
bugs422296
milestone1.9.1a1pre
bug 422296: need debug+leak testing builds for mozilla central - trivial follow-up for build/Makefile.in. r=tmielczarek, patch=me
build/Makefile.in
build/pgo/automation.py.in
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -53,16 +53,37 @@ endif
 ifeq (WINNT,$(OS_ARCH))
 DIRS = win32
 endif
 
 DIRS += pgo
 
 include $(topsrcdir)/config/rules.mk
 
+
+ifeq ($(USE_SHORT_LIBNAME), 1)
+PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
+else
+PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
+endif
+
+ifeq ($(MOZ_BUILD_APP),camino)
+browser_path = \"$(DIST)/Camino.app/Contents/MacOS/Camino\"
+else
+ifeq ($(OS_ARCH),Darwin)
+ifdef MOZ_DEBUG
+browser_path = \"$(DIST)/$(MOZ_APP_DISPLAYNAME)Debug.app/Contents/MacOS/$(PROGRAM)\"
+else
+browser_path = \"$(DIST)/$(MOZ_APP_DISPLAYNAME).app/Contents/MacOS/$(PROGRAM)\"
+endif
+else
+browser_path = \"$(DIST)/bin/$(PROGRAM)\"
+endif
+endif
+
 AUTOMATION_PPARGS = 	\
 			-DBROWSER_PATH=$(browser_path) \
 			-DXPC_BIN_PATH=\"$(DIST)/bin\" \
 			$(NULL)
 
 ifeq ($(OS_ARCH),Darwin)
 AUTOMATION_PPARGS += -DIS_MAC=1
 else
--- a/build/pgo/automation.py.in
+++ b/build/pgo/automation.py.in
@@ -228,16 +228,17 @@ def initializeProfile(profileDir):
   # Start with a clean slate.
   shutil.rmtree(profileDir, True)
   os.mkdir(profileDir)
 
   prefs = []
 
   part = """\
 user_pref("browser.dom.window.dump.enabled", true);
+user_pref("dom._allow_script_to_close_windows", true);
 user_pref("dom.disable_open_during_load", false);
 user_pref("dom.max_script_run_time", 0); // no slow script dialogs
 user_pref("signed.applets.codebase_principal_support", true);
 user_pref("security.warn_submit_insecure", false);
 user_pref("browser.shell.checkDefaultBrowser", false);
 user_pref("browser.warnOnQuit", false);
 user_pref("accessibility.typeaheadfind.autostart", false);
 user_pref("javascript.options.showInConsole", true);