зеркало из https://github.com/mozilla/gecko-dev.git
Bug 923979: re-add xulrunner-stub to the OSX builds of XULRunner. r=bsmedberg
This commit is contained in:
Родитель
8bacbf99f6
Коммит
4a712f7ad2
|
@ -4,5 +4,6 @@ export MOZILLA_OFFICIAL=1
|
|||
|
||||
ac_add_options --enable-application=xulrunner
|
||||
ac_add_options --disable-tests
|
||||
ac_add_options --with-xulrunner-stub-name=xulrunner-stub
|
||||
|
||||
. "$topsrcdir/xulrunner/config/mozconfigs/common.override"
|
||||
|
|
|
@ -8,8 +8,8 @@ MODULE = 'xulrunner'
|
|||
|
||||
# The value of XULRUNNER_STUB_NAME is generated by configure to allow XULRunner
|
||||
# apps to override it using the --with-xulrunner-stub-name=<appname> argument.
|
||||
# If this configure argument is not present then the default name is 'xulrunner'
|
||||
# for Mac OS X and 'xulrunner-stub' for all other platforms.
|
||||
# If this configure argument is not present then the default name is
|
||||
# 'xulrunner-stub'.
|
||||
PROGRAM = CONFIG['XULRUNNER_STUB_NAME']
|
||||
|
||||
SOURCES += [
|
||||
|
|
|
@ -350,7 +350,7 @@ main(int argc, char **argv)
|
|||
|
||||
if (!greFound) {
|
||||
#ifdef XP_MACOSX
|
||||
// Check for <bundle>/Contents/Frameworks/XUL.framework/libxpcom.dylib
|
||||
// Check for <bundle>/Contents/Frameworks/XUL.framework/Versions/Current/libmozglue.dylib
|
||||
CFURLRef fwurl = CFBundleCopyPrivateFrameworksURL(appBundle);
|
||||
CFURLRef absfwurl = nullptr;
|
||||
if (fwurl) {
|
||||
|
@ -361,13 +361,13 @@ main(int argc, char **argv)
|
|||
if (absfwurl) {
|
||||
CFURLRef xulurl =
|
||||
CFURLCreateCopyAppendingPathComponent(nullptr, absfwurl,
|
||||
CFSTR("XUL.framework"),
|
||||
CFSTR("XUL.framework/Versions/Current"),
|
||||
true);
|
||||
|
||||
if (xulurl) {
|
||||
CFURLRef xpcomurl =
|
||||
CFURLCreateCopyAppendingPathComponent(nullptr, xulurl,
|
||||
CFSTR("libxpcom.dylib"),
|
||||
CFSTR("libmozglue.dylib"),
|
||||
false);
|
||||
|
||||
if (xpcomurl) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче