Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1256568 - Move doxygen, zip, unzip, xargs, rpmbuild, genisoimage and dsymutil detection to moz.configure. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2016-03-15 11:38:06 +09:00
parent 254313370d
commit 986945d9e4
5 changed files with 20 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/moz.configure/checks.configure
View File

@ -68,9 +68,8 @@ def check_prog(var, progs, allow_missing=False):
@depends(check)
@advanced
def postcheck(value):
if value is not not_found:
set_config(var, value)
elif not allow_missing:
set_config(var, ':' if value is not_found else value)
if not value and not allow_missing:
from mozbuild.shellutil import quote
error('Cannot find %s (tried: %s)'
% (var.lower(), ', '.join(quote(p) for p in progs)))

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

@ -251,11 +251,18 @@ def wanted_mozconfig_variables(help):
'AWK',
'DISABLE_EXPORT_JS',
'DISABLE_SHARED_JS',
'DOXYGEN',
'DSYMUTIL',
'EXTERNAL_SOURCE_DIR',
'GENISOIMAGE',
'MOZILLABUILD',
'MOZ_ARTIFACT_BUILDS',
'MOZ_BUILD_APP',
'PERL',
'RPMBUILD',
'UNZIP',
'XARGS',
'ZIP',
])

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

@ -470,12 +470,6 @@ if test -z "$COMPILE_ENVIRONMENT"; then
fi
AC_SUBST(NSINSTALL_BIN)
MOZ_PATH_PROG(DOXYGEN, doxygen, :)
MOZ_PATH_PROG(XARGS, xargs)
if test -z "$XARGS" -o "$XARGS" = ":"; then
AC_MSG_ERROR([xargs not found in \$PATH .])
fi
if test "$COMPILE_ENVIRONMENT"; then
dnl ========================================================
@ -1102,8 +1096,6 @@ case "$target" in
RANLIB='echo not_ranlib'
STRIP='echo not_strip'
PKG_SKIP_STRIP=1
XARGS=xargs
DOXYGEN=:
OBJ_SUFFIX=obj
LIB_SUFFIX=lib
DLL_PREFIX=

11
moz.configure
View File

@ -111,5 +111,16 @@ def perl_version_check(min_version):
perl_version_check('5.006')
# Miscellaneous programs
# ==============================================================
check_prog('DOXYGEN', ('doxygen',), allow_missing=True)
check_prog('DSYMUTIL', ('dsymutil', 'llvm-dsymutil'), allow_missing=True)
check_prog('GENISOIMAGE', ('genisoimage',), allow_missing=True)
check_prog('RPMBUILD', ('rpmbuild',), allow_missing=True)
check_prog('UNZIP', ('unzip',))
check_prog('XARGS', ('xargs',))
check_prog('ZIP', ('zip',))
# Fallthrough to autoconf-based configure
include('build/moz.configure/old.configure')

24
old-configure.in
View File

@ -699,26 +699,6 @@ if test -z "$COMPILE_ENVIRONMENT"; then
fi
AC_SUBST(NSINSTALL_BIN)
MOZ_PATH_PROG(DOXYGEN, doxygen, :)
MOZ_PATH_PROGS(UNZIP, unzip)
if test -z "$UNZIP" -o "$UNZIP" = ":"; then
AC_MSG_ERROR([unzip not found in \$PATH])
fi
MOZ_PATH_PROGS(ZIP, zip)
if test -z "$ZIP" -o "$ZIP" = ":"; then
AC_MSG_ERROR([zip not found in \$PATH])
fi
MOZ_PATH_PROG(XARGS, xargs)
if test -z "$XARGS" -o "$XARGS" = ":"; then
AC_MSG_ERROR([xargs not found in \$PATH .])
fi
MOZ_PATH_PROG(RPMBUILD, rpmbuild, :)
AC_SUBST(RPMBUILD)
MOZ_PATH_PROG(GENISOIMAGE, genisoimage, :)
MOZ_PATH_PROG(DSYMUTIL, dsymutil, llvm-dsymutil :)
if test "$COMPILE_ENVIRONMENT"; then
dnl ========================================================
@ -1668,10 +1648,6 @@ case "$target" in
RANLIB='echo not_ranlib'
STRIP='echo not_strip'
PKG_SKIP_STRIP=1
XARGS=xargs
ZIP=zip
UNZIP=unzip
DOXYGEN=:
OBJ_SUFFIX=obj
LIB_SUFFIX=lib
DLL_PREFIX=