Chromium Code Reviews| Index: Makefile |
| diff --git a/Makefile b/Makefile |
| index 6f29e76e191660cc8dc21d50814df959bab365b5..5fe7e58658f494feb983d84394feb396081795f6 100644 |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -281,9 +281,13 @@ ENVFILE = $(OUTDIR)/environment |
| # Target definitions. "all" is the default. |
| all: $(DEFAULT_MODES) |
| +# Target for generating the v8 version file from git tags. |
| +version: |
|
Jakob Kummerow
2015/01/19 15:26:52
Please add "version" to the .PHONY list above
Michael Achenbach
2015/01/19 15:48:08
Done.
|
| + build/generate_version.py |
|
Jakob Kummerow
2015/01/19 15:26:52
This is indented with tab, right? Codereview doesn
Michael Achenbach
2015/01/19 15:48:08
Yes. If you click on the raw changes view you can
|
| + |
| # Special target for the buildbots to use. Depends on $(OUTDIR)/Makefile |
| # having been created before. |
| -buildbot: |
| +buildbot: version |
| $(MAKE) -C "$(OUTDIR)" BUILDTYPE=$(BUILDTYPE) \ |
| builddir="$(abspath $(OUTDIR))/$(BUILDTYPE)" |
| @@ -294,14 +298,14 @@ $(MODES): $(addsuffix .$$@,$(DEFAULT_ARCHES)) |
| $(ARCHES): $(addprefix $$@.,$(DEFAULT_MODES)) |
| # Defines how to build a particular target (e.g. ia32.release). |
| -$(BUILDS): $(OUTDIR)/Makefile.$$@ |
| +$(BUILDS): $(OUTDIR)/Makefile.$$@ version |
| @$(MAKE) -C "$(OUTDIR)" -f Makefile.$@ \ |
| BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \ |
| python -c "print \ |
| raw_input().replace('opt', '').capitalize()") \ |
| builddir="$(shell pwd)/$(OUTDIR)/$@" |
| -native: $(OUTDIR)/Makefile.native |
| +native: $(OUTDIR)/Makefile.native version |
| @$(MAKE) -C "$(OUTDIR)" -f Makefile.native \ |
| BUILDTYPE=Release \ |
| builddir="$(shell pwd)/$(OUTDIR)/$@" |
| @@ -309,7 +313,8 @@ native: $(OUTDIR)/Makefile.native |
| $(ANDROID_ARCHES): $(addprefix $$@.,$(MODES)) |
| $(ANDROID_BUILDS): $(GYPFILES) $(ENVFILE) build/android.gypi \ |
| - must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN Makefile.android |
| + must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN Makefile.android \ |
| + version |
| @$(MAKE) -f Makefile.android $@ \ |
| ARCH="$(basename $@)" \ |
| MODE="$(subst .,,$(suffix $@))" \ |
| @@ -319,7 +324,7 @@ $(ANDROID_BUILDS): $(GYPFILES) $(ENVFILE) build/android.gypi \ |
| $(NACL_ARCHES): $(addprefix $$@.,$(MODES)) |
| $(NACL_BUILDS): $(GYPFILES) $(ENVFILE) \ |
| - Makefile.nacl must-set-NACL_SDK_ROOT |
| + Makefile.nacl must-set-NACL_SDK_ROOT version |
| @$(MAKE) -f Makefile.nacl $@ \ |
| ARCH="$(basename $@)" \ |
| MODE="$(subst .,,$(suffix $@))" \ |
| @@ -419,7 +424,10 @@ native.clean: |
| rm -rf $(OUTDIR)/native |
| find $(OUTDIR) -regex '.*\(host\|target\)\.native\.mk' -delete |
| -clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES) $(NACL_ARCHES)) native.clean gtags.clean |
| +version.clean: |
| + rm -f src/version_gen.cc |
| + |
| +clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES) $(NACL_ARCHES)) native.clean gtags.clean version.clean |
| # GYP file generation targets. |
| OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(BUILDS)) |