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

Side by Side Diff

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

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

Side by Side 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:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 # -- makefile --	1 # -- makefile --

2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.	2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.

3 # Use of this source code is governed by a BSD-style license that can be	3 # Use of this source code is governed by a BSD-style license that can be

4 # found in the LICENSE file.	4 # found in the LICENSE file.

5	5

6 # Elements used to construct PYTHONPATH. These may be overridden by the	6 # Elements used to construct PYTHONPATH. These may be overridden by the

7 # including Makefile.	7 # including Makefile.

8 #	8 #

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

10 # some masters will override BUILDBOT_PATH in their local Makefiles.	10 # some masters will override BUILDBOT_PATH in their local Makefiles.

11 TOPLEVEL_DIR ?= ../..	11 TOPLEVEL_DIR ?= ../../..
	ghost stip (do not use) 2016/04/14 21:23:41 build_internal has this as ../../../, which is wha build_internal has this as ../../../, which is what caused the disparity in the other patch
12 SCRIPTS_DIR ?= $(TOPLEVEL_DIR)/scripts	12 SCRIPTS_DIR ?= $(TOPLEVEL_DIR)/build/scripts

13	13

14 GCLIENT = $(shell which gclient \|\| echo "$(TOPLEVEL_DIR)/../depot_tools/gclient" )	14 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 we don't need to specify build/ here, but can just remove ../ instead
15	15

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

17 BUILDBOT_PATH ?= $(BUILDBOT8_PATH)	17 BUILDBOT_PATH ?= $(BUILDBOT8_PATH)

18	18

19 # Define PYTHONPATH.	19 # Define PYTHONPATH.

20 PYTHONPATH := $(BUILDBOT8_PATH)	20 PYTHONPATH := $(BUILDBOT8_PATH)

21	21

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

OLD	NEW

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