Skip to content

C
core
Kaydet (Commit) 987d991e authored tarafından Peter Foley's avatar Peter Foley
Dosyalara gözat
Seçenekler

formating cleanup 

Change-Id: I851f4f82caa8483a296da3c8337ccbedccf7c5de
üst 56da3f2a
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 62 deletions
configure.ac
Dosyayı görüntüle @ 987d991e
...@@ -3032,9 +3032,10 @@ AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS) ...@@ -3032,9 +3032,10 @@ AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
dnl =================================================================== dnl ===================================================================
dnl Check which Microsoft C/C++ or MinGW compiler is used for WINNT dnl Check which Microsoft C/C++ or MinGW compiler is used for WINNT
dnl =================================================================== dnl ===================================================================
find_msvs() { find_msvs()
# find Visual Studio 2012/2010/2008 {
for ver in 11.0 10.0 9.0; do # find Visual Studio 2012/2010/2008
for ver in 11.0 10.0 9.0; do
reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/ProductDir reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/ProductDir
if test -n "$regvalue"; then if test -n "$regvalue"; then
vstest=$regvalue vstest=$regvalue
...@@ -3045,12 +3046,13 @@ for ver in 11.0 10.0 9.0; do ...@@ -3045,12 +3046,13 @@ for ver in 11.0 10.0 9.0; do
vstest=$regvalue vstest=$regvalue
break break
fi fi
done done
} }
find_msvc() { find_msvc()
# find Visual Studio 2012/2010/2008 {
for ver in 11.0 10.0 9.0; do # find Visual Studio 2012/2010/2008
for ver in 11.0 10.0 9.0; do
reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VC/ProductDir reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VC/ProductDir
if test -n "$regvalue"; then if test -n "$regvalue"; then
vctest=$regvalue vctest=$regvalue
...@@ -3061,7 +3063,7 @@ for ver in 11.0 10.0 9.0; do ...@@ -3061,7 +3063,7 @@ for ver in 11.0 10.0 9.0; do
vctest=$regvalue vctest=$regvalue
break break
fi fi
done done
} }
SHOWINCLUDES_PREFIX= SHOWINCLUDES_PREFIX=
...@@ -4731,8 +4733,9 @@ dnl that to mean Visual Studio .NET 2003 ? And does this also ...@@ -4731,8 +4733,9 @@ dnl that to mean Visual Studio .NET 2003 ? And does this also
dnl in fact apply equally to what we actually support, i.e. dnl in fact apply equally to what we actually support, i.e.
dnl Visual Studio 2008 and 2010?) dnl Visual Studio 2008 and 2010?)
dnl =================================================================== dnl ===================================================================
find_csc() { find_csc()
if test $VCVER -eq 90; then {
if test $VCVER -eq 90; then
reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework Setup/NDP/v3.5/InstallPath" reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework Setup/NDP/v3.5/InstallPath"
if test -n "$regvalue"; then if test -n "$regvalue"; then
csctest=$regvalue csctest=$regvalue
...@@ -4742,63 +4745,67 @@ if test $VCVER -eq 90; then ...@@ -4742,63 +4745,67 @@ if test $VCVER -eq 90; then
if test -n "$regvalue"; then if test -n "$regvalue"; then
csctest=${regvalue}"v2.0.50727" csctest=${regvalue}"v2.0.50727"
fi fi
else else
reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework Setup/NDP/v4/Client/InstallPath" reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework Setup/NDP/v4/Client/InstallPath"
if test -n "$regvalue"; then if test -n "$regvalue"; then
csctest=$regvalue csctest=$regvalue
break break
fi fi
fi fi
} }
find_al() { find_al()
for x in `ls /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft\ SDKs/Windows`; do {
for x in `ls /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft\ SDKs/Windows`; do
reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/$x/WinSDK-NetFx40Tools/InstallationFolder" reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/$x/WinSDK-NetFx40Tools/InstallationFolder"
if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f "$regvalue/bin/al.exe" \); then if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f "$regvalue/bin/al.exe" \); then
altest=$regvalue altest=$regvalue
break break
fi fi
done done
} }
find_dotnetsdk() { find_dotnetsdk()
for ver in 1.1 2.0; do {
for ver in 1.1 2.0; do
reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv$ver reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv$ver
if test -n "$regvalue"; then if test -n "$regvalue"; then
frametest=$regvalue frametest=$regvalue
break break
fi fi
done done
} }
find_winsdk() { find_winsdk()
reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows Kits/Installed Roots/KitsRoot" {
if test -n "$regvalue"; then reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows Kits/Installed Roots/KitsRoot"
if test -n "$regvalue"; then
winsdktest=$regvalue winsdktest=$regvalue
return return
fi fi
reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/CurrentInstallFolder" reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/CurrentInstallFolder"
if test -n "$regvalue"; then if test -n "$regvalue"; then
winsdktest=$regvalue winsdktest=$regvalue
return return
fi fi
reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir" reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir"
if test -n "$regvalue"; then if test -n "$regvalue"; then
winsdktest=$regvalue winsdktest=$regvalue
return return
fi fi
for x in `ls /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs`; do for x in `ls /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs`; do
reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/$x/Install Dir" reg_get_value "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/$x/Install Dir"
if test -n "$regvalue"; then if test -n "$regvalue"; then
winsdktest=$regvalue winsdktest=$regvalue
break break
fi fi
done done
} }
#TODO: move copy_* functions to external/ module once gbuildified #TODO: move copy_* functions to external/ module once gbuildified
copy_msms() { copy_msms()
for ver in 9.0 10.0 11.0; do {
for ver in 9.0 10.0 11.0; do
reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir
if test -n "$regvalue"; then if test -n "$regvalue"; then
if test -e "$regvalue/Microsoft_VC${VCVER}_CRT_x86.msm"; then if test -e "$regvalue/Microsoft_VC${VCVER}_CRT_x86.msm"; then
...@@ -4806,65 +4813,66 @@ for ver in 9.0 10.0 11.0; do ...@@ -4806,65 +4813,66 @@ for ver in 9.0 10.0 11.0; do
break break
fi fi
fi fi
done done
msmdir=`cygpath -d "$msmdir"` msmdir=`cygpath -d "$msmdir"`
msmdir=`cygpath -u "$msmdir"` msmdir=`cygpath -u "$msmdir"`
if test -z "$msmdir"; then if test -z "$msmdir"; then
AC_MSG_ERROR([Merge modules not found]) AC_MSG_ERROR([Merge modules not found])
fi fi
if test $VCVER -eq 90; then if test $VCVER -eq 90; then
cp $msmdir/policy_9_0_Microsoft_VC90_CRT_x86.msm ./external/msm90 cp $msmdir/policy_9_0_Microsoft_VC90_CRT_x86.msm ./external/msm90
if test $? -ne 0; then if test $? -ne 0; then
AC_MSG_ERROR([Failed to copy merge modules]) AC_MSG_ERROR([Failed to copy merge modules])
fi fi
fi fi
cp $msmdir/Microsoft_VC${VCVER}_CRT_x86.msm ./external/msm${VCVER} cp $msmdir/Microsoft_VC${VCVER}_CRT_x86.msm ./external/msm${VCVER}
if test $? -ne 0; then if test $? -ne 0; then
AC_MSG_ERROR([Failed to copy merge modules]) AC_MSG_ERROR([Failed to copy merge modules])
fi fi
cp $msmdir/Microsoft_VC${VCVER}_CRT_x64.msm ./external/msm${VCVER} cp $msmdir/Microsoft_VC${VCVER}_CRT_x64.msm ./external/msm${VCVER}
if test $? -ne 0; then if test $? -ne 0; then
AC_MSG_WARN([Failed to copy x64 merge modules, installation will lack the 64-bit Explorer extension]) AC_MSG_WARN([Failed to copy x64 merge modules, installation will lack the 64-bit Explorer extension])
fi fi
} }
copy_msvc_dlls() { copy_msvc_dlls()
{
if test $CPUNAME == INTEL; then if test $CPUNAME == INTEL; then
vsarch=x86 vsarch=x86
else else
vsarch=amd64 vsarch=amd64
fi fi
if test -f $with_cl_home/redist/$vsarch/Microsoft.VC${VCVER}.CRT/msvcp${VCVER}.dll; then if test -f $with_cl_home/redist/$vsarch/Microsoft.VC${VCVER}.CRT/msvcp${VCVER}.dll; then
vsdlldir=$with_cl_home/redist/$vsarch/Microsoft.VC${VCVER}.CRT vsdlldir=$with_cl_home/redist/$vsarch/Microsoft.VC${VCVER}.CRT
else else
AC_MSG_ERROR([can't find VS dll $with_cl_home/redist/$vsarch/Microsoft.VC${VCVER}.CRT/msvcp${VCVER}.dll]) AC_MSG_ERROR([can not find VS dll $with_cl_home/redist/$vsarch/Microsoft.VC${VCVER}.CRT/msvcp${VCVER}.dll])
fi fi
cp $vsdlldir/msvcp${VCVER}.dll $vsdlldir/msvcr${VCVER}.dll ./external/msvcp${VCVER} cp $vsdlldir/msvcp${VCVER}.dll $vsdlldir/msvcr${VCVER}.dll ./external/msvcp${VCVER}
if test $VCVER == 90; then if test $VCVER == 90; then
cp $vsdlldir/msvcm${VCVER}.dll $vsdlldir/Microsoft.VC90.CRT.manifest ./external/msvcp${VCVER} cp $vsdlldir/msvcm${VCVER}.dll $vsdlldir/Microsoft.VC90.CRT.manifest ./external/msvcp${VCVER}
if test $? -ne 0; then if test $? -ne 0; then
AC_MSG_ERROR([Failed to copy VS dlls]) AC_MSG_ERROR([Failed to copy VS dlls])
fi fi
fi fi
} }
copy_dbghelp_dll() { copy_dbghelp_dll()
if test ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/$DBGHELP_DLL; then {
if test ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/$DBGHELP_DLL; then
cp $TARFILE_LOCATION/$DBGHELP_DLL ./external/dbghelp/dbghelp.dll; cp $TARFILE_LOCATION/$DBGHELP_DLL ./external/dbghelp/dbghelp.dll;
fi fi
if test ! -f ./external/dbghelp/dbghelp.dll; then if test ! -f ./external/dbghelp/dbghelp.dll; then
echo "dbghelp.dll is missing in external/dbghelp/." echo "dbghelp.dll is missing in external/dbghelp/."
echo "Get it from the Microsoft site and put it there." echo "Get it from the Microsoft site and put it there."
echo "(Note: Microsoft seems to enjoy changing the exact location of this file." echo "(Note: Microsoft seems to enjoy changing the exact location of this file."
echo "You may have to search Microsoft's website.) Last time it was seen at:" echo "You may have to search Microsoft's website.) Last time it was seen at:"
echo "<http://www.microsoft.com/downloads/release.asp?releaseid=30682>." echo "<http://www.microsoft.com/downloads/release.asp?releaseid=30682>."
exit 1 exit 1
fi fi
} }
if test "$build_os" = "cygwin"; then if test "$build_os" = "cygwin"; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment