Attachment #360188 for bug #480258

Lines 28-34 Link Here

(-)mozilla-release~/build/automation.py.in (-1 / +1 lines)
28	# TODO: this is a hack for mozbase without virtualenv, remove with bug 849900	28	# TODO: this is a hack for mozbase without virtualenv, remove with bug 849900
29	#	29	#
30	here = os.path.dirname(__file__)	30	here = os.path.dirname(__file__)
31	mozbase = os.path.realpath(os.path.join(os.path.dirname(here), 'mozbase'))	31	mozbase = os.path.realpath(os.path.join(os.path.dirname(here), '../../testing/mozbase'))
32		32
33	if os.path.isdir(mozbase):	33	if os.path.isdir(mozbase):
34	for package in os.listdir(mozbase):	34	for package in os.listdir(mozbase):

Lines 210-216 Link Here

(-)mozilla-release~/client.mk (-1 / +1 lines)
210	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_GENERATE=1 MOZ_PGO_INSTRUMENTED=1	210	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_GENERATE=1 MOZ_PGO_INSTRUMENTED=1
211	$(MAKE) -C $(PGO_OBJDIR) package MOZ_PGO_INSTRUMENTED=1 MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT=	211	$(MAKE) -C $(PGO_OBJDIR) package MOZ_PGO_INSTRUMENTED=1 MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT=
212	rm -f ${PGO_OBJDIR}/jarlog/en-US.log	212	rm -f ${PGO_OBJDIR}/jarlog/en-US.log
213	MOZ_PGO_INSTRUMENTED=1 JARLOG_FILE=jarlog/en-US.log EXTRA_TEST_ARGS=10 $(MAKE) -C $(PGO_OBJDIR) pgo-profile-run	213	MOZ_PGO_INSTRUMENTED=1 JARLOG_FILE=jarlog/en-US.log EXTRA_TEST_ARGS=10 topsrcdir=$(TOPSRCDIR) DEPTH=. PYTHON=python $(MAKE) -C $(PGO_OBJDIR) -f $(TOPSRCDIR)/testing/testsuite-targets.mk pgo-profile-run
214	$(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild	214	$(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild
215	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_USE=1	215	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_USE=1
216		216




# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

import os
import sys

# Let's put all subdirectories under testing/mozbase/ here
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/manifestdestiny'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozb2g'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozcrash'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozdevice'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozfile'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozhttpd'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozinfo'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozinstall'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozlog'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/moznetwork'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozprocess'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozprofile'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozrunner'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozsystemmonitor'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/moztest'))

# And all subdirectories under python/
sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/blessings'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/codegen'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/mach'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/mock-1.0.0'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/mozboot'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/mozbuild'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/psutil'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/simplejson-2.1.1'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/which'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/virtualenv'))

# And finally config/ itself
sys.path.append(os.path.join(os.path.dirname(__file__), '../../config'))

from mozprofile import FirefoxProfile, Profile, Preferences
from mozprofile.permissions import ServerLocations
from mozrunner import FirefoxRunner, CLI

import json
import socket
import threading
import os
import sys
import shutil
import tempfile
from datetime import datetime

Return to bug 480258

Lines 4-9 Link Here

(-)mozilla-release~/build/pgo/profileserver.py (-2 / +35 lines)
4	# License, v. 2.0. If a copy of the MPL was not distributed with this	4	# License, v. 2.0. If a copy of the MPL was not distributed with this
5	# file, You can obtain one at http://mozilla.org/MPL/2.0/.	5	# file, You can obtain one at http://mozilla.org/MPL/2.0/.
6		6
		7	import os
		8	import sys
		9
		10	# Let's put all subdirectories under testing/mozbase/ here
		11	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/manifestdestiny'))
		12	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozb2g'))
		13	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozcrash'))
		14	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozdevice'))
		15	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozfile'))
		16	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozhttpd'))
		17	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozinfo'))
		18	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozinstall'))
		19	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozlog'))
		20	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/moznetwork'))
		21	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozprocess'))
		22	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozprofile'))
		23	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozrunner'))
		24	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/mozsystemmonitor'))
		25	sys.path.append(os.path.join(os.path.dirname(__file__), '../../testing/mozbase/moztest'))
		26
		27	# And all subdirectories under python/
		28	sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/blessings'))
		29	sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/codegen'))
		30	sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/mach'))
		31	sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/mock-1.0.0'))
		32	sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/mozboot'))
		33	sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/mozbuild'))
		34	sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/psutil'))
		35	sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/simplejson-2.1.1'))
		36	sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/which'))
		37	sys.path.append(os.path.join(os.path.dirname(__file__), '../../python/virtualenv'))
		38
		39	# And finally config/ itself
		40	sys.path.append(os.path.join(os.path.dirname(__file__), '../../config'))
		41
7	from mozprofile import FirefoxProfile, Profile, Preferences	42	from mozprofile import FirefoxProfile, Profile, Preferences
8	from mozprofile.permissions import ServerLocations	43	from mozprofile.permissions import ServerLocations
9	from mozrunner import FirefoxRunner, CLI	44	from mozrunner import FirefoxRunner, CLI
Lines 11-18 Link Here
11	import json	46	import json
12	import socket	47	import socket
13	import threading	48	import threading
14	import os
15	import sys
16	import shutil	49	import shutil
17	import tempfile	50	import tempfile
18	from datetime import datetime	51	from datetime import datetime