Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 15:55:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1620165 - Prepare win32 mozconfigs for cross-compilation. r=dmajor

Browse Source 
The tweaks are essentially the same as for win64 builds, with the only
difference being the path for the VC binary directory.

Differential Revision: https://phabricator.services.mozilla.com/D65480

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2020-03-05 23:03:30 +00:00
parent d2ca2acccf
commit b15f46f4c9
3 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
browser/config/mozconfigs/win32/common-opt
View File

@ -6,10 +6,16 @@
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --with-google-location-service-api-keyfile=${WORKSPACE}/gls-gapi.data
ac_add_options --with-google-safebrowsing-api-keyfile=${WORKSPACE}/sb-gapi.data
if test `uname -s` != Linux; then
APIKEYDIR="${APIKEYDIR:-${WORKSPACE}}"
else
APIKEYDIR="${APIKEYDIR:-/builds}"
fi
ac_add_options --with-mozilla-api-keyfile=${WORKSPACE}/mozilla-desktop-geoloc-api.key
ac_add_options --with-google-location-service-api-keyfile=${APIKEYDIR}/gls-gapi.data
ac_add_options --with-google-safebrowsing-api-keyfile=${APIKEYDIR}/sb-gapi.data
ac_add_options --with-mozilla-api-keyfile=${APIKEYDIR}/mozilla-desktop-geoloc-api.key
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1

30
browser/config/mozconfigs/win32/common-win32
View File

@ -3,3 +3,33 @@
ac_add_options --target=i686-pc-mingw32
. $topsrcdir/build/win32/mozconfig.vs-latest
if test `uname -s` = Linux; then
# Configure expects executables for check_prog, so set the relevant files
# as executable on the first evaluation of the mozconfig where they exist.
if [ -d "${VSPATH}" -a ! -x "${VSPATH}/VC/bin/Hostx64/x86/cl.exe" ]; then
find "${VSPATH}" -type f -name \*.exe -exec chmod +x {} \;
fi
export MAKENSISU="${MOZ_FETCHES_DIR}/nsis-3.01/makensis.exe"
if [ -d "${MAKENSISU%/*}" -a ! -x "${MAKENSISU}" ]; then
chmod +x "${MAKENSISU}"
fi
export MAKECAB="${TOOLTOOL_DIR}/makecab.exe"
if [ -f "${MAKECAB}" ]; then
chmod +x "${MAKECAB}"
fi
export UPX="${MOZ_FETCHES_DIR}/upx-3.95-win64/upx.exe"
if [ -f "${UPX}" ]; then
chmod +x "${UPX}"
fi
CLANG_CL_EXE_DIR="${MOZ_FETCHES_DIR}/clang-cl/clang/bin"
if [ -d "${CLANG_CL_EXE_DIR}" ]; then
chmod +x "${CLANG_CL_EXE_DIR}/clang-cl.exe"
fi
export WINE=${MOZ_FETCHES_DIR}/wine/bin/wine64
mk_add_options "export PATH=${VSPATH}/VC/bin/Hostx64/x86:${MOZ_FETCHES_DIR}/nsis-3.01:${CLANG_CL_EXE_DIR}:${PATH}"
unset VC_PATH
fi

2
build/win32/mozconfig.vs2017
View File

@ -4,7 +4,7 @@ if [ -z "${VSPATH}" ]; then
fi
if [ -d "${VSPATH}" ]; then
VSWINPATH="$(cd ${VSPATH} && pwd -W)"
VSWINPATH="$(cd ${VSPATH} && (pwd -W 2>/dev/null || pwd))"
export WINDOWSSDKDIR="${VSWINPATH}/SDK"
export WIN32_REDIST_DIR="${VSPATH}/VC/redist/x86/Microsoft.VC141.CRT"