Bug 1406662 - When defined in the configure.sh, use the MOZ_MACBUNDLE_ID r=glandium
authorSylvestre Ledru <sledru@mozilla.com>
Thu, 16 Nov 2017 09:44:35 +0100
changeset 392396 7148babfe2ab4a68fb855cb0d2d60cfad3347b74
parent 392395 54128381bfe5310e1f5c2ee1e64462e25e601394
child 392397 400bffaca3646dfb4b6c85be8f464425713c92dc
push id55557
push usersledru@mozilla.com
push dateFri, 17 Nov 2017 14:39:05 +0000
treeherderautoland@7148babfe2ab [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1406662
milestone59.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 1406662 - When defined in the configure.sh, use the MOZ_MACBUNDLE_ID r=glandium Preserving the MOZ_MACBUNDLE_ID will avoid issue related to bundle identifier MozReview-Commit-ID: IDIZGl6usXA
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -4545,17 +4545,21 @@ fi
 if test "$MOZ_DEBUG"; then
   MOZ_MACBUNDLE_NAME=${MOZ_MACBUNDLE_NAME}Debug.app
 else
   MOZ_MACBUNDLE_NAME=${MOZ_MACBUNDLE_NAME}.app
 fi
 AC_SUBST(MOZ_MACBUNDLE_NAME)
 
 dnl Mac bundle identifier (based on MOZ_APP_DISPLAYNAME)
-MOZ_MACBUNDLE_ID=`echo $MOZ_APP_DISPLAYNAME | tr '[A-Z]' '[a-z]'`
+# If the MOZ_MACBUNDLE_ID is defined in the configure.sh, use it
+# Otherwise, use MOZ_APP_DISPLAYNAME
+if test -z "$MOZ_MACBUNDLE_ID"; then
+   MOZ_MACBUNDLE_ID=`echo $MOZ_APP_DISPLAYNAME | tr '[A-Z]' '[a-z]'`
+fi
 MOZ_MACBUNDLE_ID=${MOZ_DISTRIBUTION_ID}.${MOZ_MACBUNDLE_ID}
 if test "$MOZ_DEBUG"; then
   MOZ_MACBUNDLE_ID=${MOZ_MACBUNDLE_ID}debug
 fi
 
 AC_DEFINE_UNQUOTED(MOZ_MACBUNDLE_ID,$MOZ_MACBUNDLE_ID)
 AC_SUBST(MOZ_MACBUNDLE_ID)