Bug 686466 part 2 - Use centralized application.ini creation for mobile. r=ted

mobile/xul/app/Makefile.in

@@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk
 DIRS = profile/extensions
 
 PREF_JS_EXPORTS = $(srcdir)/mobile.js
-DIST_FILES = application.ini
 
 ifndef LIBXUL_SDK
 ifneq (Android,$(OS_TARGET))
@@ -90,42 +89,13 @@ NSDISTMODE = copy
 
 include $(topsrcdir)/config/rules.mk
 
-GRE_MILESTONE = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
-GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
-ifndef MOZ_BUILD_DATE
-APP_BUILDID = $(shell $(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-buildid)
-else
-APP_BUILDID = $(MOZ_BUILD_DATE)
-endif
 APP_ICON = mobile
 
-DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) \
-           -DGRE_BUILDID=$(GRE_BUILDID) \
-           -DAPP_BUILDID=$(APP_BUILDID) \
-           -DAPP_NAME=$(MOZ_APP_NAME) \
-           -DAPP_VERSION=$(MOZ_APP_VERSION) \
-           -DMOZ_UPDATER=$(MOZ_UPDATER) \
-           $(NULL)
-
-ifdef MOZILLA_OFFICIAL
-DEFINES += -DMOZILLA_OFFICIAL
-endif
-
-SOURCE_STAMP := $(shell cd $(srcdir)/.. && hg identify 2>/dev/null | cut -f1 -d' ')
-ifdef SOURCE_STAMP
-DEFINES += -DMOZ_SOURCE_STAMP="$(SOURCE_STAMP)"
-endif
-
-# strip a trailing slash from the repo URL because it's not always present,
-# and we want to construct a working URL in buildconfig.html
-# make+shell+sed = awful
-_dollar=$$
-SOURCE_REPO := $(shell cd $(srcdir)/.. && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
-# extra sanity check for old versions of hg
-# that don't support showconfig
-ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))
-DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
-endif
+DEFINES += \
+  -DAPP_NAME=$(MOZ_APP_NAME) \
+  -DAPP_VERSION=$(MOZ_APP_VERSION) \
+  -DMOZ_UPDATER=$(MOZ_UPDATER) \
+  $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 REDIT_PATH = $(LIBXUL_DIST)/bin
@@ -155,7 +125,7 @@ else
 APPFILES = MacOS
 endif
 
-libs repackage:: application.ini
+libs repackage::
 	mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS
 	rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj
 	mkdir -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj

mobile/xul/app/application.ini

@@ -1,26 +0,0 @@
-#filter substitution
-[App]
-Vendor=Mozilla
-Name=Fennec
-Version=@APP_VERSION@
-BuildID=@APP_BUILDID@
-#ifdef MOZ_SOURCE_REPO
-SourceRepository=@MOZ_SOURCE_REPO@
-#endif
-#ifdef MOZ_SOURCE_STAMP
-SourceStamp=@MOZ_SOURCE_STAMP@
-#endif
-ID={a23983c0-fd0e-11dc-95ff-0800200c9a66}
-
-[Gecko]
-MinVersion=1.9.2b5pre
-MaxVersion=@GRE_MILESTONE@
-
-[XRE]
-EnableExtensionManager=1
-
-[Crash Reporter]
-#if MOZILLA_OFFICIAL
-Enabled=1
-#endif
-ServerURL=https://crash-reports.mozilla.com/submit

mobile/xul/confvars.sh

@@ -35,8 +35,8 @@
 #
 # ***** END LICENSE BLOCK *****
 
-MOZ_APP_NAME=fennec
-MOZ_APP_UA_NAME=Fennec
+MOZ_APP_BASENAME=Fennec
+MOZ_APP_VENDOR=Mozilla
 
 MOZ_APP_VERSION=11.0a1
 
@@ -67,3 +67,6 @@ MOZ_APP_COMPONENT_INCLUDE=nsBrowserComponents.h
 
 # use custom widget for html:select
 MOZ_USE_NATIVE_POPUP_WINDOWS=1
+
+MOZ_APP_ID={a23983c0-fd0e-11dc-95ff-0800200c9a66}
+MOZ_EXTENSION_MANAGER=1