Commit 29080913 authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge "msvs-build: use msbuild for vs >= 2005"

parents 94c481f9 73c4e284
...@@ -74,8 +74,13 @@ parse_project() { ...@@ -74,8 +74,13 @@ parse_project() {
# assume that all projects have the same list of possible configurations, # assume that all projects have the same list of possible configurations,
# so overwriting old config_lists is not a problem # so overwriting old config_lists is not a problem
config_list=`grep -A1 '<Configuration' $file | if [ "$sfx" = "vcproj" ]; then
grep Name | cut -d\" -f2` config_list=`grep -A1 '<Configuration' $file |
grep Name | cut -d\" -f2`
else
config_list=`grep -B1 'Label="Configuration"' $file |
grep Condition | cut -d\' -f4`
fi
proj_list="${proj_list} ${var}" proj_list="${proj_list} ${var}"
} }
...@@ -168,9 +173,14 @@ process_makefile() { ...@@ -168,9 +173,14 @@ process_makefile() {
IFS=$'\r'$'\n' IFS=$'\r'$'\n'
local TAB=$'\t' local TAB=$'\t'
cat <<EOF cat <<EOF
found_devenv := \$(shell which devenv.com >/dev/null 2>&1 && echo yes) ifeq (\$(CONFIG_VS_VERSION),7)
MSBUILD_TOOL := devenv.com
else
MSBUILD_TOOL := msbuild.exe
endif
found_devenv := \$(shell which \$(MSBUILD_TOOL) >/dev/null 2>&1 && echo yes)
.nodevenv.once: .nodevenv.once:
${TAB}@echo " * devenv.com not found in path." ${TAB}@echo " * \$(MSBUILD_TOOL) not found in path."
${TAB}@echo " * " ${TAB}@echo " * "
${TAB}@echo " * You will have to build all configurations manually using the" ${TAB}@echo " * You will have to build all configurations manually using the"
${TAB}@echo " * Visual Studio IDE. To allow make to build them automatically," ${TAB}@echo " * Visual Studio IDE. To allow make to build them automatically,"
...@@ -195,16 +205,17 @@ ${TAB}rm -rf "$platform"/"$config" ...@@ -195,16 +205,17 @@ ${TAB}rm -rf "$platform"/"$config"
ifneq (\$(found_devenv),) ifneq (\$(found_devenv),)
ifeq (\$(CONFIG_VS_VERSION),7) ifeq (\$(CONFIG_VS_VERSION),7)
$nows_sln_config: $outfile $nows_sln_config: $outfile
${TAB}devenv.com $outfile -build "$config" ${TAB}\$(MSBUILD_TOOL) $outfile -build "$config"
else else
$nows_sln_config: $outfile $nows_sln_config: $outfile
${TAB}devenv.com $outfile -build "$sln_config" ${TAB}\$(MSBUILD_TOOL) $outfile -m -t:Build \\
${TAB}${TAB}-p:Configuration="$config" -p:Platform="$platform"
endif endif
else else
$nows_sln_config: $outfile .nodevenv.once $nows_sln_config: $outfile .nodevenv.once
${TAB}@echo " * Skipping build of $sln_config (devenv.com not in path)." ${TAB}@echo " * Skipping build of $sln_config (\$(MSBUILD_TOOL) not in path)."
${TAB}@echo " * " ${TAB}@echo " * "
endif endif
......
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