author | Mike Hommey <mh+mozilla@glandium.org> |
Tue, 10 Sep 2013 14:58:50 +0900 | |
changeset 146221 | e5ca10a2b3d06ad1ffa9b94ce0c6120afe13504d |
parent 146220 | 4c431a91973730c6d97805517a98e0b4d82d017a |
child 146222 | e59f853e6c2699639acb99ac9d4f0c0839758c70 |
push id | 25249 |
push user | mh@glandium.org |
push date | Tue, 10 Sep 2013 05:59:30 +0000 |
treeherder | mozilla-central@e5ca10a2b3d0 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ted |
bugs | 913842 |
milestone | 26.0a1 |
first release with | nightly linux32
e5ca10a2b3d0
/
26.0a1
/
20130910030254
/
files
nightly linux64
e5ca10a2b3d0
/
26.0a1
/
20130910030254
/
files
nightly mac
e5ca10a2b3d0
/
26.0a1
/
20130910030254
/
files
nightly win32
e5ca10a2b3d0
/
26.0a1
/
20130910030254
/
files
nightly win64
e5ca10a2b3d0
/
26.0a1
/
20130910030254
/
files
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
releases | nightly linux32
26.0a1
/
20130910030254
/
pushlog to previous
nightly linux64
26.0a1
/
20130910030254
/
pushlog to previous
nightly mac
26.0a1
/
20130910030254
/
pushlog to previous
nightly win32
26.0a1
/
20130910030254
/
pushlog to previous
nightly win64
26.0a1
/
20130910030254
/
pushlog to previous
|
mobile/android/base/Makefile.in | file | annotate | diff | comparison | revisions | |
mobile/android/base/locales/Makefile.in | file | annotate | diff | comparison | revisions |
--- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -1381,25 +1381,26 @@ res/drawable-hdpi/icon.png: $(ICON_PATH_ res/drawable-xhdpi/icon.png: $(ICON_PATH_XHDPI) $(NSINSTALL) -D res/drawable-xhdpi cp $(ICON_PATH_XHDPI) $@ res/drawable-xxhdpi/icon.png: $(ICON_PATH_XXHDPI) $(NSINSTALL) -D res/drawable-xxhdpi cp $(ICON_PATH_XXHDPI) $@ -$(RES_DIRS): $(subst res/,$(srcdir)/resources/,$(RESOURCES)) - $(RM) -r $@ - $(NSINSTALL) -D $@ +$(call mkdir_deps,$(RES_DIRS)): $(subst res/,$(srcdir)/resources/,$(RESOURCES)) Makefile + $(RM) -r $(@D) + $(NSINSTALL) -D $(@D) + $(TOUCH) $@ -$(RESOURCES): $(RES_DIRS) $(subst res/,$(srcdir)/resources/,$(RESOURCES)) +$(RESOURCES): $(call mkdir_deps,$(RES_DIRS)) $(subst res/,$(srcdir)/resources/,$(RESOURCES)) @echo "creating $@" $(NSINSTALL) $(subst res/,$(srcdir)/resources/,$@) $(dir $@) -res/values/strings.xml: $(RES_DIRS) +res/values/strings.xml: $(call mkdir_deps,$(RES_DIRS)) $(MAKE) -C locales # With multilocale builds, there will be multiple strings.xml files. We need to # rebuild gecko.ap_ if any of them change. MULTILOCALE_STRINGS_XML_FILES := $(wildcard res/values-*/strings.xml) all_resources = \ res/drawable-mdpi/icon.png \ res/drawable-hdpi/icon.png \
--- a/mobile/android/base/locales/Makefile.in +++ b/mobile/android/base/locales/Makefile.in @@ -56,16 +56,17 @@ strings-xml-preqs =\ $(STRINGSPATH) \ $(SYNCSTRINGSPATH) \ $(BOOKMARKSPATH) \ $(if $(IS_LANGUAGE_REPACK),FORCE) \ $(NULL) $(dir-strings-xml)/strings.xml: $(strings-xml-preqs) $(NSINSTALL) -D $(dir-strings-xml) + $(TOUCH) $(call mkdir_deps,$(dir-strings-xml)) $(PYTHON) $(topsrcdir)/config/Preprocessor.py \ $(DEFINES) \ -DBRANDPATH="$(BRANDPATH)" \ -DSTRINGSPATH="$(STRINGSPATH)" \ -DSYNCSTRINGSPATH="$(SYNCSTRINGSPATH)" \ -DBOOKMARKSPATH="$(BOOKMARKSPATH)" \ -DMOZ_APP_DISPLAYNAME="@MOZ_APP_DISPLAYNAME@" \ $< \