Bug 525057 'make clean' deletes automationutils.py r=ted
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Mon, 11 Jan 2010 23:55:51 +0000
changeset 37090 fa0a5a38b7f47af2b8199b56f75f7d4f924fe591
parent 37089 47cd92d616d77bf77733293c334e6dc51d14560c
child 37091 cea14ad20b6106d1c3ba4d6ab1603280f18cfd3e
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
bugs525057
milestone1.9.3a1pre
Bug 525057 'make clean' deletes automationutils.py r=ted
build/Makefile.in
build/automation-build.mk
build/automation.py.in
build/pgo/Makefile.in
layout/tools/reftest/Makefile.in
testing/mochitest/Makefile.in
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -69,17 +69,17 @@ include $(topsrcdir)/config/rules.mk
 # we install to _leaktest/
 TARGET_DEPTH = ..
 include $(srcdir)/automation-build.mk
 
 _LEAKTEST_DIR = $(DEPTH)/_leaktest
 
 _LEAKTEST_FILES =    \
 		automation.py \
-		$(CURDIR)/automationutils.py \
+		automationutils.py \
 		leaktest.py \
 		bloatcycle.html \
 		$(topsrcdir)/build/pgo/server-locations.txt \
 		$(NULL)
 
 leaktest.py: leaktest.py.in
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $^ > $@
 	chmod +x $@
--- a/build/automation-build.mk
+++ b/build/automation-build.mk
@@ -69,16 +69,11 @@ AUTOMATION_PPARGS += -DIS_DEBUG_BUILD=0
 endif
 
 ifdef MOZ_CRASHREPORTER
 AUTOMATION_PPARGS += -DCRASHREPORTER=1
 else
 AUTOMATION_PPARGS += -DCRASHREPORTER=0
 endif
 
-$(CURDIR)/automationutils.py: $(MOZILLA_DIR)/build/automationutils.py
-	$(INSTALL) $< .
-
-automation.py: $(MOZILLA_DIR)/build/automation.py.in $(MOZILLA_DIR)/build/automation-build.mk $(CURDIR)/automationutils.py
+automation.py: $(MOZILLA_DIR)/build/automation.py.in $(MOZILLA_DIR)/build/automation-build.mk
 	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \
 	$(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
-
-GARBAGE += automation.py $(CURDIR)/automationutils.py
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -46,24 +46,24 @@ import re
 import select
 import shutil
 import signal
 import subprocess
 import sys
 import threading
 import tempfile
 
-from automationutils import checkForCrashes
-
 """
 Runs the browser from a script, and provides useful utilities
 for setting up the browser environment.
 """
 
 SCRIPT_DIR = os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0])))
+sys.path.insert(0, SCRIPT_DIR);
+from automationutils import checkForCrashes
 
 __all__ = [
            "UNIXISH",
            "IS_WIN32",
            "IS_MAC",
            "log",
            "runApp",
            "Process",
--- a/build/pgo/Makefile.in
+++ b/build/pgo/Makefile.in
@@ -54,17 +54,17 @@ include $(topsrcdir)/config/rules.mk
 # We install to _profile/pgo
 TARGET_DEPTH = ../..
 include $(topsrcdir)/build/automation-build.mk
 
 # Stuff to make a build with a profile
 
 _PGO_FILES = 	\
   automation.py \
-  $(CURDIR)/automationutils.py \
+  $(topsrcdir)/build/automationutils.py \
   profileserver.py \
   genpgocert.py \
   index.html \
   server-locations.txt \
   favicon.ico \
   $(NULL)
 
 genpgocert.py: genpgocert.py.in
--- a/layout/tools/reftest/Makefile.in
+++ b/layout/tools/reftest/Makefile.in
@@ -70,17 +70,17 @@ make-xpi:
 	+$(MAKE) -C $(CURDIR) libs XPI_NAME=reftest
 copy-harness: make-xpi
 libs:: copy-harness
 endif
 
 _HARNESS_FILES = \
   $(srcdir)/runreftest.py \
   automation.py \
-  $(CURDIR)/automationutils.py \
+  $(topsrcdir)/build/automationutils.py \
   $(NULL)
 
 $(_DEST_DIR):
 	$(NSINSTALL) -D $@
 
 $(_HARNESS_FILES): $(_DEST_DIR)
 
 # copy harness and the reftest extension bits to $(_DEST_DIR)
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -55,17 +55,17 @@ include $(topsrcdir)/config/rules.mk
 # necessary for relative objdir paths.
 TARGET_DEPTH = ../../..
 include $(topsrcdir)/build/automation-build.mk
 
 # files that get copied into $objdir/_tests/
 _SERV_FILES = 	\
 		runtests.py \
 		automation.py \
-		$(CURDIR)/automationutils.py \
+		$(topsrcdir)/build/automationutils.py \
 		gen_template.pl \
 		server.js \
 		harness-a11y.xul \
 		harness-overlay.xul \
 		harness.xul \
 		browser-test-overlay.xul \
 		browser-test.js \
 		browser-harness.xul \