masters/master-common.mk - Issue 1892643002: Reupload of "Flock master startup."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: masters/master-common.mk

Issue 1892643002: Reupload of "Flock master startup." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: Patch up differing uses of TOPLEVEL_DIR between build/ and build_internal/. Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: masters/master-common.mk

diff --git a/masters/master-common.mk b/masters/master-common.mk

index 0b1dfe53252758bd0284dcf9130a80ee029eff23..936a7dcb816105eaf1dfc5f68f5cfb9e73e6a5ef 100644

--- a/masters/master-common.mk

+++ b/masters/master-common.mk

@@ -8,10 +8,10 @@

# For example: while we transition from buildbot 0.7.12 to buildbot 0.8.x ,

# some masters will override BUILDBOT_PATH in their local Makefiles.

-TOPLEVEL_DIR ?= ../..

-SCRIPTS_DIR ?= $(TOPLEVEL_DIR)/scripts

+TOPLEVEL_DIR ?= ../../..

ghost stip (do not use) 2016/04/14 21:23:41 build_internal has this as ../../../, which is wha

+SCRIPTS_DIR ?= $(TOPLEVEL_DIR)/build/scripts

-GCLIENT = $(shell which gclient || echo "$(TOPLEVEL_DIR)/../depot_tools/gclient")

ghost stip (do not use) 2016/04/14 21:23:41 we don't need to specify build/ here, but can just

+GCLIENT = $(shell which gclient || echo "$(TOPLEVEL_DIR)/depot_tools/gclient")

BUILDBOT8_PATH = $(shell $(SCRIPTS_DIR)/common/env.py -M "$(PWD)" echo)

BUILDBOT_PATH ?= $(BUILDBOT8_PATH)

@@ -19,4 +19,4 @@ BUILDBOT_PATH ?= $(BUILDBOT8_PATH)

# Define PYTHONPATH.

PYTHONPATH := $(BUILDBOT8_PATH)

-include $(TOPLEVEL_DIR)/masters/master-common-rules.mk

+include $(TOPLEVEL_DIR)/build/masters/master-common-rules.mk

« no previous file with comments | « .gitignore ('k') | masters/master-common-rules.mk » ('j') | no next file with comments »