Bug 1210642 - s/APP_BUILDID/MOZ_APP_BUILDID/ to use the same variable name across products. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 01 Oct 2015 13:10:38 +0900
changeset 266205 1f0ba759efbc710e2db64b215127b7b0f2bf8910
parent 266204 6b5dc81ee5789a0e4b7775c07c0941cb3a387df2
child 266206 f2fdb9d0bc086f1ecb5986805254ef988e8520be
push id29483
push usercbook@mozilla.com
push dateTue, 06 Oct 2015 10:01:59 +0000
treeherdermozilla-central@89732fcdb0ba [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1210642
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1210642 - s/APP_BUILDID/MOZ_APP_BUILDID/ to use the same variable name across products. r=gps
build/Makefile.in
build/application.ini
config/faster/rules.mk
mobile/android/base/AppConstants.java.in
testing/taskcluster/scripts/builder/build-simulator.sh
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -8,20 +8,20 @@ include $(topsrcdir)/config/makefiles/ma
 
 ifdef MOZ_APP_BASENAME
 ifdef LIBXUL_SDK
 APP_INI_DEPS = $(LIBXUL_DIST)/bin/platform.ini
 else
 APP_INI_DEPS = $(topsrcdir)/config/milestone.txt
 endif
 
-APP_BUILDID := $(shell cat $(DEPTH)/config/buildid)
+MOZ_APP_BUILDID := $(shell cat $(DEPTH)/config/buildid)
 APP_INI_DEPS += $(DEPTH)/config/buildid
 
-DEFINES += -DAPP_BUILDID=$(APP_BUILDID)
+DEFINES += -DMOZ_APP_BUILDID=$(MOZ_APP_BUILDID)
 
 APP_INI_DEPS += $(DEPTH)/config/autoconf.mk
 
 MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template='{node}\n' 2>/dev/null))
 ifdef MOZ_SOURCE_STAMP
 DEFINES += -DMOZ_SOURCE_STAMP='$(MOZ_SOURCE_STAMP)'
 endif
 
--- a/build/application.ini
+++ b/build/application.ini
@@ -21,17 +21,17 @@ Name=@MOZ_APP_BASENAME@
 RemotingName=@MOZ_APP_REMOTINGNAME@
 #ifdef MOZ_APP_DISPLAYNAME
 CodeName=@MOZ_APP_DISPLAYNAME@
 #endif
 Version=@MOZ_APP_VERSION@
 #ifdef MOZ_APP_PROFILE
 Profile=@MOZ_APP_PROFILE@
 #endif
-BuildID=@APP_BUILDID@
+BuildID=@MOZ_APP_BUILDID@
 #ifdef MOZ_SOURCE_REPO
 SourceRepository=@MOZ_SOURCE_REPO@
 #endif
 #ifdef MOZ_SOURCE_STAMP
 SourceStamp=@MOZ_SOURCE_STAMP@
 #endif
 ID=@MOZ_APP_ID@
 
@@ -42,10 +42,10 @@ MaxVersion=@GRE_MILESTONE@
 [XRE]
 #ifdef MOZ_PROFILE_MIGRATOR
 EnableProfileMigrator=1
 #endif
 
 #if MOZ_CRASHREPORTER
 [Crash Reporter]
 Enabled=1
-ServerURL=https://crash-reports.mozilla.com/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSION@&buildid=@APP_BUILDID@
+ServerURL=https://crash-reports.mozilla.com/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSION@&buildid=@MOZ_APP_BUILDID@
 #endif
--- a/config/faster/rules.mk
+++ b/config/faster/rules.mk
@@ -86,17 +86,17 @@ ACDEFINES += -DBUILD_FASTER
 $(addprefix install-,$(INSTALL_MANIFESTS)): install-%:
 	$(PYTHON) -m mozbuild.action.process_install_manifest \
 		--no-remove \
 		--no-remove-empty-directories \
 		$(TOPOBJDIR)/$* \
 		install_$(subst /,_,$*)
 
 # Preprocessed files. Ideally they would be using install manifests but
-# right now, it's not possible because of things like APP_BUILDID or
+# right now, it's not possible because of things like MOZ_APP_BUILDID or
 # nsURLFormatter.js.
 #
 # The list of preprocessed files is defined in PP_TARGETS. The list is
 # relative to TOPOBJDIR.
 # The source file for each of those preprocessed files is defined as a Make
 # dependency for the $(TOPOBJDIR)/path target. For example:
 #   PP_TARGETS = foo/bar
 #   $(TOPOBJDIR)/foo/bar: /path/to/source/for/foo/bar.in
@@ -189,17 +189,17 @@ jar-%:
 $(foreach p,linux osx windows,jar-browser-themes-$(p)-jar.mn): \
 jar-browser-themes-%-jar.mn: \
 	$(TOPOBJDIR)/browser/themes/%/tab-selected-end.svg \
 	$(TOPOBJDIR)/browser/themes/%/tab-selected-start.svg
 
 # Extra dependencies and/or definitions for preprocessed files.
 $(TOPOBJDIR)/dist/bin/application.ini: $(TOPOBJDIR)/config/buildid
 $(TOPOBJDIR)/dist/bin/application.ini: defines += \
-	-DAPP_BUILDID=$(shell cat $(TOPOBJDIR)/config/buildid)
+	-DMOZ_APP_BUILDID=$(shell cat $(TOPOBJDIR)/config/buildid)
 
 # Files to build with the recursive backend and simply copy
 $(TOPOBJDIR)/dist/bin/greprefs.js: $(TOPOBJDIR)/modules/libpref/greprefs.js
 $(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.
--- a/mobile/android/base/AppConstants.java.in
+++ b/mobile/android/base/AppConstants.java.in
@@ -89,20 +89,19 @@ public class AppConstants {
      */
     public static final String MOZ_ANDROID_SEARCH_INTENT_CLASS = "@MOZ_ANDROID_SEARCH_INTENT_CLASS@";
 
     public static final String GRE_MILESTONE = "@GRE_MILESTONE@";
 
     public static final String MOZ_APP_ABI = "@MOZ_APP_ABI@";
     public static final String MOZ_APP_BASENAME = "@MOZ_APP_BASENAME@";
 
-    // For the benefit of future archaeologists: APP_BUILDID and
-    // MOZ_APP_BUILDID are *exactly* the same.
-    // GRE_BUILDID is exactly the same unless you're running on XULRunner,
-    // which is never the case on Android.
+    // For the benefit of future archaeologists:
+    // GRE_BUILDID is exactly the same as MOZ_APP_BUILDID unless you're running
+    // on XULRunner, which is never the case on Android.
     public static final String MOZ_APP_BUILDID = "@MOZ_APP_BUILDID@";
     public static final String MOZ_APP_ID = "@MOZ_APP_ID@";
     public static final String MOZ_APP_NAME = "@MOZ_APP_NAME@";
     public static final String MOZ_APP_VENDOR = "@MOZ_APP_VENDOR@";
     public static final String MOZ_APP_VERSION = "@MOZ_APP_VERSION@";
     public static final String MOZ_APP_DISPLAYNAME = "@MOZ_APP_DISPLAYNAME@";
 
     // MOZILLA_VERSION is already quoted when it gets substituted in. If we
--- a/testing/taskcluster/scripts/builder/build-simulator.sh
+++ b/testing/taskcluster/scripts/builder/build-simulator.sh
@@ -74,22 +74,22 @@ rm -rf $WORKDIR/firefox/gaia $WORKDIR/fi
 # - disable the FTU
 # - set custom prefs to enable devtools debugger server
 # - set custom settings to disable lockscreen and screen timeout
 # - only ship production apps
 NOFTU=1 GAIA_APP_TARGET=production SETTINGS_PATH=$SIM_DIR/custom-settings.json make -j1 -C $GAIA_DIR profile
 mv $GAIA_DIR/profile $WORKDIR/
 cat $SIM_DIR/custom-prefs.js >> $WORKDIR/profile/user.js
 
-APP_BUILDID=$(sed -n "s/BuildID=\([0-9]\{8\}\)/\1/p" $WORKDIR/firefox/application.ini)
-echo "BUILDID $APP_BUILDID -- VERSION $VERSION"
+MOZ_APP_BUILDID=$(sed -n "s/BuildID=\([0-9]\{8\}\)/\1/p" $WORKDIR/firefox/application.ini)
+echo "BUILDID $MOZ_APP_BUILDID -- VERSION $VERSION"
 
-XPI_NAME=fxos-simulator-$VERSION.$APP_BUILDID-$PLATFORM.xpi
+XPI_NAME=fxos-simulator-$VERSION.$MOZ_APP_BUILDID-$PLATFORM.xpi
 ADDON_ID=fxos_$(echo $VERSION | sed "s/\./_/")_simulator@mozilla.org
-ADDON_VERSION=$VERSION.$APP_BUILDID
+ADDON_VERSION=$VERSION.$MOZ_APP_BUILDID
 ADDON_NAME="Firefox OS $VERSION Simulator"
 ADDON_DESCRIPTION="a Firefox OS $VERSION Simulator"
 
 echo "ADDON_ID: $ADDON_ID"
 echo "ADDON_VERSION: $ADDON_VERSION"
 
 FTP_ROOT_PATH=/pub/mozilla.org/labs/fxos-simulator
 UPDATE_PATH=$VERSION/$PLATFORM