Bug 1102602 - part 2: Rename the XULRunner stub, so that we can compile it. r=gps
authorAlexander J. Vincent <ajvincent@gmail.com>
Thu, 20 Nov 2014 17:08:40 -0800
changeset 217054 60943ff53aebaa01d0186a5baab60a3dd7eba669
parent 217053 0c83767de482e983650a8b125718ab5e9cb3fe77
child 217055 0e1bd8c6328460f0b459a7d36c09dac5337cbf5d
push id52218
push usercbook@mozilla.com
push dateMon, 24 Nov 2014 08:44:31 +0000
treeherdermozilla-inbound@3aca2904c54a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1102602
milestone36.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 1102602 - part 2: Rename the XULRunner stub, so that we can compile it. r=gps
configure.in
xulrunner/app/install_app.py
--- a/configure.in
+++ b/configure.in
@@ -3983,23 +3983,17 @@ MOZ_ARG_ENABLE_STRING(application,
                             tools/update-packaging (AUS-related packaging tools)],
 [ MOZ_BUILD_APP=$enableval ] )
 
 MOZ_ARG_WITH_STRING(xulrunner-stub-name,
 [  --with-xulrunner-stub-name=appname   Create the xulrunner stub with the given name],
   XULRUNNER_STUB_NAME=$withval)
 
 if test -z "$XULRUNNER_STUB_NAME"; then
-  case "$target_os" in
-  darwin*)
-    XULRUNNER_STUB_NAME=xulrunner
-    ;;
-  *)
-    XULRUNNER_STUB_NAME=xulrunner-stub
-  esac
+  XULRUNNER_STUB_NAME=xulrunner-stub
 fi
 AC_SUBST(XULRUNNER_STUB_NAME)
 
 AC_MSG_CHECKING([for application to build])
 if test -z "$MOZ_BUILD_APP"; then
   AC_MSG_RESULT([browser])
   MOZ_BUILD_APP=browser
 else
--- a/xulrunner/app/install_app.py
+++ b/xulrunner/app/install_app.py
@@ -33,17 +33,17 @@ if sys.platform.startswith('linux'):
 
 elif sys.platform == "win32":
     xulrunnerStubName = "xulrunner-stub.exe"
 
     def makeAppName(leafName):
         return leafName + ".exe"
 
 elif sys.platform == "darwin":
-    xulrunnerStubName = "xulrunner"
+    xulrunnerStubName = "xulrunner-stub"
 
     def installApp(appLocation, installDir, appName, greDir):
         zipApp, iniparser, appName = validateArguments(appLocation, installDir, appName, greDir)
         installDir += "/" + appName + ".app"
         resourcesDir = os.path.join(installDir, "Contents/Resources")
         if (zipApp):
             zipApp.extractAll(resourcesDir)
         else: