Backout changeset 2d9b31fd2c69 (bug 1219122) for Windows PGO bustage

This commit is contained in:
Mike Hommey 2015-10-30 19:03:12 +09:00
parent 986608233a
commit 8e15440a37
4 changed files with 9 additions and 5 deletions

View File

@ -44,6 +44,7 @@ default: $(addprefix install-,$(INSTALL_MANIFESTS))
# Explicit files to be built for a default build
default: $(addprefix $(TOPOBJDIR)/,$(MANIFEST_TARGETS))
default: $(TOPOBJDIR)/dist/bin/platform.ini
default: $(TOPOBJDIR)/dist/bin/webapprt/webapprt.ini
# Targets from the recursive make backend to be built for a default build
default: $(TOPOBJDIR)/config/makefiles/xpidl/xpidl
@ -126,6 +127,7 @@ $(addprefix $(TOPOBJDIR)/,$(MANIFEST_TARGETS)): FORCE
# Files to build with the recursive backend and simply copy
$(TOPOBJDIR)/dist/bin/platform.ini: $(TOPOBJDIR)/toolkit/xre/platform.ini
$(TOPOBJDIR)/dist/bin/webapprt/webapprt.ini: $(TOPOBJDIR)/webapprt/webapprt.ini
# The xpidl target in config/makefiles/xpidl requires the install manifest for
# dist/idl to have been processed.

View File

@ -9,4 +9,10 @@ include $(topsrcdir)/config/rules.mk
MOZ_APP_BUILDID := $(shell cat $(DEPTH)/config/buildid)
DEFINES += -DMOZ_APP_BUILDID=$(MOZ_APP_BUILDID)
$(FINAL_TARGET)/webapprt.ini: $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt
webapprt.ini: application.ini.in $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt
$(call py_action,preprocessor,$(DEFINES) $< -o $@)
libs:: webapprt.ini
$(INSTALL) webapprt.ini $(FINAL_TARGET)
GARBAGE += webapprt.ini

View File

@ -53,7 +53,3 @@ JAR_MANIFESTS += ['jar.mn']
JS_PREFERENCE_FILES += [
'prefs.js',
]
DIST_FILES += [
'webapprt.ini',
]