From f3ce30b5c52235c05f958ed34fa9a4be86c3eafb Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 1 Oct 2015 13:10:38 +0900 Subject: [PATCH] Bug 1210642 - s/APP_BUILDID/MOZ_APP_BUILDID/ to use the same variable name across products. r=gps --- build/Makefile.in | 4 ++-- build/application.ini | 4 ++-- config/faster/rules.mk | 4 ++-- mobile/android/base/AppConstants.java.in | 7 +++---- testing/taskcluster/scripts/builder/build-simulator.sh | 8 ++++---- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/build/Makefile.in b/build/Makefile.in index f248511ba3b..86d09ee9b6c 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -13,10 +13,10 @@ 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 diff --git a/build/application.ini b/build/application.ini index 041bf200d8b..74b0139d252 100644 --- a/build/application.ini +++ b/build/application.ini @@ -26,7 +26,7 @@ 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 @@ -47,5 +47,5 @@ EnableProfileMigrator=1 #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 diff --git a/config/faster/rules.mk b/config/faster/rules.mk index 05d3fa0aac2..d6c87bf5b33 100644 --- a/config/faster/rules.mk +++ b/config/faster/rules.mk @@ -91,7 +91,7 @@ $(addprefix install-,$(INSTALL_MANIFESTS)): install-%: 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 @@ -194,7 +194,7 @@ jar-browser-themes-%-jar.mn: \ # 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 diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in index 1555a6b66ed..b5fadcfb448 100644 --- a/mobile/android/base/AppConstants.java.in +++ b/mobile/android/base/AppConstants.java.in @@ -94,10 +94,9 @@ public class AppConstants { 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@"; diff --git a/testing/taskcluster/scripts/builder/build-simulator.sh b/testing/taskcluster/scripts/builder/build-simulator.sh index 750efe7069f..d6094617a1d 100755 --- a/testing/taskcluster/scripts/builder/build-simulator.sh +++ b/testing/taskcluster/scripts/builder/build-simulator.sh @@ -79,12 +79,12 @@ NOFTU=1 GAIA_APP_TARGET=production SETTINGS_PATH=$SIM_DIR/custom-settings.json m 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"