Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-11 10:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1257434 - Move --enable-instruments to moz.configure. r=ted

Browse Source
This commit is contained in:
Mike Hommey 2016-03-17 16:12:44 +09:00
parent baacddb8dc
commit 89cb71ad55
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/moz.configure/init.configure
View File

@ -261,6 +261,7 @@ def wanted_mozconfig_variables(help):
'MOZ_BUILD_APP',
'MOZ_FMP4',
'MOZ_INSTRUMENT_EVENT_LOOP',
'MOZ_INSTRUMENTS',
'MOZ_JPROF',
'MOZ_USE_SYSTRACE',
'MOZTTDIR',

1
build/moz.configure/old.configure
View File

@ -210,7 +210,6 @@ def old_configure_options(*options):
'--enable-hardware-aec-ns',
'--enable-icf',
'--enable-install-strip',
'--enable-instruments',
'--enable-ion',
'--enable-ios-target',
'--enable-ipdl-tests',

16
js/moz.configure
View File

@ -68,3 +68,19 @@ def disable_export_js(value):
error('Setting %s is deprecated, use %s instead.'
% (value.format('DISABLE_EXPORT_JS'), suggestion))
# Profiling
# =======================================================
js_option('--enable-instruments', env='MOZ_INSTRUMENTS',
help='Enable instruments remote profiling')
@depends('--enable-instruments', target)
def instruments(value, target):
if value and target.os != 'OSX':
error('--enable-instruments cannot be used when targeting %s'
% target.os)
if value:
set_config('MOZ_INSTRUMENTS', '1')
set_define('MOZ_INSTRUMENTS', '1')
add_old_configure_assignment('MOZ_INSTRUMENTS', '1')

6
js/src/old-configure.in
View File

@ -2346,13 +2346,8 @@ fi
dnl ========================================================
dnl instruments
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(instruments,
[ --enable-instruments Enable instruments remote profiling. Implies --enable-profiling.],
MOZ_INSTRUMENTS=1,
MOZ_INSTRUMENTS= )
if test -n "$MOZ_INSTRUMENTS"; then
MOZ_PROFILING=1
AC_DEFINE(MOZ_INSTRUMENTS)
LIBS="$LIBS -framework CoreFoundation"
fi
@ -2782,7 +2777,6 @@ AC_SUBST(MOZ_DEBUG)
AC_SUBST(MOZ_DEBUG_SYMBOLS)
AC_SUBST(MOZ_DEBUG_LDFLAGS)
AC_SUBST(WARNINGS_AS_ERRORS)
AC_SUBST(MOZ_INSTRUMENTS)
AC_SUBST(MOZ_CALLGRIND)
AC_SUBST(MOZ_VTUNE)
AC_SUBST(MOZ_PROFILING)

6
old-configure.in
View File

@ -1219,13 +1219,8 @@ fi
dnl ========================================================
dnl instruments
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(instruments,
[ --enable-instruments Enable instruments remote profiling. Implies --enable-profiling.],
MOZ_INSTRUMENTS=1,
MOZ_INSTRUMENTS= )
if test -n "$MOZ_INSTRUMENTS"; then
MOZ_PROFILING=1
AC_DEFINE(MOZ_INSTRUMENTS)
fi
dnl ========================================================
@ -7396,7 +7391,6 @@ AC_SUBST(MOZ_DEBUG_SYMBOLS)
AC_SUBST(MOZ_DEBUG_LDFLAGS)
AC_SUBST(WARNINGS_AS_ERRORS)
AC_SUBST_SET(MOZ_EXTENSIONS)
AC_SUBST(MOZ_INSTRUMENTS)
AC_SUBST(MOZ_CALLGRIND)
AC_SUBST(MOZ_VTUNE)
AC_SUBST(MOZ_PROFILING)