From 7fbac3c240bae6d6f95b9afd184911fd52de7010 Mon Sep 17 00:00:00 2001 From: ski Date: Fri, 11 Nov 2016 17:00:25 +0300 Subject: [PATCH] 0028077: Add option for genproj to generate UWP projects Ability to generate UWP solution was added to genproj command, applied when VC version set to "vc14-uwp". Environment variables are used to find installed Microsoft SDKs. Visual Studio project option "Use precompiled headers" is set to "Not Using" by default. Character set option of VS project Unicode is used instead of preprocessor definitions for UWP projects. --- adm/genproj.tcl | 143 ++++++++++++++++++++++++++++++------ adm/templates/msvc.bat | 2 + adm/templates/template.vc10 | 25 ++++++- 3 files changed, 143 insertions(+), 27 deletions(-) diff --git a/adm/genproj.tcl b/adm/genproj.tcl index 18203f810b..88fb1e091b 100644 --- a/adm/genproj.tcl +++ b/adm/genproj.tcl @@ -256,7 +256,7 @@ proc genAllResources {} { # Wrapper-function to generate VS project files proc genproj {theIDE args} { - set aSupportedIDEs { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "cbp" "xcd" } + set aSupportedIDEs { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "vc14-uwp" "cbp" "xcd"} set aSupportedPlatforms { "wnt" "lin" "mac" "ios" "qnx" } set isHelpRequire false @@ -305,14 +305,15 @@ proc genproj {theIDE args} { puts "usage: genproj IDE \[Platform\] \[-static\] \[-h|-help|--help\] IDE must be one of: - vc8 - Visual Studio 2005 - vc9 - Visual Studio 2008 - vc10 - Visual Studio 2010 - vc11 - Visual Studio 2012 - vc12 - Visual Studio 2013 - vc14 - Visual Studio 2015 - cbp - CodeBlocks - xcd - XCode + vc8 - Visual Studio 2005 + vc9 - Visual Studio 2008 + vc10 - Visual Studio 2010 + vc11 - Visual Studio 2012 + vc12 - Visual Studio 2013 + vc14 - Visual Studio 2015 + vc14-uwp - Visual Studio 2015 for Universal Windows Platform project + cbp - CodeBlocks + xcd - XCode Platform (optional, only for CodeBlocks and XCode): wnt - Windows @@ -370,7 +371,7 @@ proc genprojbat {theIDE thePlatform} { file copy -force -- "$::THE_CASROOT/adm/templates/draw.${aTargetPlatformExt}" "$::path/draw.${aTargetPlatformExt}" } - if {[regexp {(vc)[0-9]*$} $theIDE] == 1} { + if {[regexp {(vc)[0-9]*$} $theIDE] == 1 || [regexp {(vc)[0-9]*-uwp$} $theIDE] == 1} { file copy -force -- "$::THE_CASROOT/adm/templates/msvc.bat" "$::path/msvc.bat" } else { switch -exact -- "$theIDE" { @@ -413,7 +414,7 @@ proc OS:MKPRC { theOutDir theIDE theLibType thePlatform theCmpl } { # Create output directory set aWokStation "$thePlatform" - if { [lsearch -exact {vc7 vc8 vc9 vc10 vc11 vc12 vc14} $theIDE] != -1 } { + if { [lsearch -exact {vc7 vc8 vc9 vc10 vc11 vc12 vc14 vc14-uwp} $theIDE] != -1 } { set aWokStation "msvc" } @@ -441,6 +442,14 @@ proc OS:MKPRC { theOutDir theIDE theLibType thePlatform theCmpl } { set aModules [osutils:juststation $goaway $aModules] } + # Draw module is turned off due to it is not supported on UWP + if { [regexp {(vc)[0-9]*-uwp$} $theIDE] == 1 } { + set aDrawIndex [lsearch -exact ${aModules} "Draw"] + if { ${aDrawIndex} != -1 } { + set aModules [lreplace ${aModules} ${aDrawIndex} ${aDrawIndex}] + } + } + # generate one solution for all projects if complete OS or VAS is processed set anAllSolution "OCCT" @@ -465,12 +474,13 @@ proc OS:MKPRC { theOutDir theIDE theLibType thePlatform theCmpl } { "vc7" - "vc8" - "vc9" - - "vc10" - - "vc11" - - "vc12" - - "vc14" { OS:MKVC $anOutDir $aModules $anAllSolution $theIDE } - "cbp" { OS:MKCBP $anOutDir $aModules $anAllSolution $thePlatform $theCmpl } - "xcd" { + "vc10" - + "vc11" - + "vc12" - + "vc14" - + "vc14-uwp" { OS:MKVC $anOutDir $aModules $anAllSolution $theIDE } + "cbp" { OS:MKCBP $anOutDir $aModules $anAllSolution $thePlatform $theCmpl } + "xcd" { set ::THE_GUIDS_LIST($::aTKNullKey) "000000000000000000000000" OS:MKXCD $anOutDir $aModules $anAllSolution $theLibType $thePlatform } @@ -907,7 +917,7 @@ proc osutils:vcsolution:header { vcversion } { append var \ "Microsoft Visual Studio Solution File, Format Version 13.00\n" \ "# Visual Studio 2013\n" - } elseif { "$vcversion" == "vc14" } { + } elseif { "$vcversion" == "vc14" || "$vcversion" == "vc14-uwp"} { append var \ "Microsoft Visual Studio Solution File, Format Version 12.00\n" \ "# Visual Studio 14\n" @@ -1144,19 +1154,41 @@ proc osutils:vcproj:readtemplate {theVcVer isexec} { set aVerExt "v${aVerExt}0" set aCmpl32 "" set aCmpl64 "" + set aCharSet "MultiByte" if { $isexec } { set anExt "${anExt}x" set what "$what executable" } if { "$theVcVer" == "vc10" } { # SSE2 is enabled by default in vc11+, but not in vc10 for 32-bit target - set aCmpl32 "\n StreamingSIMDExtensions2" + set aCmpl32 "StreamingSIMDExtensions2" } set aTmpl [osutils:readtemplate $anExt "MS VC++ project ($what)"] - regsub -all -- {__VCVER__} $aTmpl $theVcVer aTmpl - regsub -all -- {__VCVEREXT__} $aTmpl $aVerExt aTmpl - regsub -all -- {__VCMPL32__} $aTmpl $aCmpl32 aTmpl - regsub -all -- {__VCMPL64__} $aTmpl $aCmpl64 aTmpl + + if { $theVcVer == "vc14-uwp" } { + set aVerExt "v140" + set UwpWinRt "false" + foreach bitness {32 64} { + set indent "" + if {"[set aCmpl${bitness}]" != ""} { + set indent "\n " + } + set aCmpl${bitness} "[set aCmpl${bitness}]${indent}${UwpWinRt}" + } + set aCharSet "Unicode" + } + + foreach bitness {32 64} { + set format_template "" + if {"[set aCmpl${bitness}]" == ""} { + set format_template "\[\\r\\n\\s\]*" + } + regsub -all -- "${format_template}__VCMPL${bitness}__" $aTmpl "[set aCmpl${bitness}]" aTmpl + } + + regsub -all -- {__VCVER__} $aTmpl $theVcVer aTmpl + regsub -all -- {__VCVEREXT__} $aTmpl $aVerExt aTmpl + regsub -all -- {__VCCHARSET__} $aTmpl $aCharSet aTmpl return $aTmpl } @@ -1600,7 +1632,14 @@ proc osutils:vcproj { theVcVer theOutDir theToolKit theGuidsMap {theProjTmpl {} } regsub -all -- {__PROJECT_GUID__} $theProjTmpl $aGuidsMap($theToolKit) theProjTmpl + set theProjTmpl [osutils:uwp:proj ${theVcVer} ${theProjTmpl}] + set aUsedLibs [list] + + if { "$theVcVer" == "vc14-uwp" } { + lappend aUsedLibs "WindowsApp.lib" + } + foreach tkx [osutils:commonUsedTK $theToolKit] { lappend aUsedLibs "${tkx}.lib" } @@ -3227,3 +3266,61 @@ proc osutils:xcdx { theOutDir theExecutable theGuidsMap } { puts $aPlistFile $aPlistTmpl close $aPlistFile } + +# Returns available Windows SDKs versions +proc osutils:sdk { theSdkMajorVer {isQuietMode false} {theSdkDirectories {}} } { + if { ![llength ${theSdkDirectories}] } { + foreach anEnvVar { "ProgramFiles" "ProgramFiles\(x86\)" "ProgramW6432" } { + if {[ info exists ::env(${anEnvVar}) ]} { + lappend theSdkDirectories "$::env(${anEnvVar})/Windows Kits/${theSdkMajorVer}/Include" + } + } + } + + set sdk_versions {} + foreach sdk_dir ${theSdkDirectories} { + if { [file isdirectory ${sdk_dir}] } { + lappend sdk_versions [glob -tails -directory "${sdk_dir}" -type d *] + } + } + + if {![llength ${sdk_versions}] && !${isQuietMode}} { + error "Error : Could not find Windows SDK ${theSdkMajorVer}" + } + + return [join [lsort -unique ${sdk_versions}] " "] +} + +# Generate global properties to Visual Studio project file for UWP solution +proc osutils:uwp:proj { theVcVer theProjTmpl } { + + set uwp_properties "" + set uwp_generate_metadata "" + set uwp_app_container "" + + set format_template "" + + if { ${theVcVer} == "vc14-uwp" } { + set sdk_versions [osutils:sdk 10] + set sdk_max_ver [lindex ${sdk_versions} end] + + set uwp_properties "en-US\n \ +Windows Store\n \ +10.0\n \ +14.0\n \ +true\n \ +${sdk_max_ver}\n \ +${sdk_max_ver}" + + set uwp_generate_metadata "false" + + regsub -all -- {[\r\n\s]*EnableFastChecks} ${theProjTmpl} "" theProjTmpl + } else { + set format_template "\[\\r\\n\\s\]*" + } + + regsub -all -- "${format_template}__UWP_PROPERTIES__" ${theProjTmpl} "${uwp_properties}" theProjTmpl + regsub -all -- "${format_template}__UWP_GENERATE_METADATA__" ${theProjTmpl} "${uwp_generate_metadata}" theProjTmpl + + return ${theProjTmpl} +} diff --git a/adm/templates/msvc.bat b/adm/templates/msvc.bat index 3c4b5efdc4..c2fa75bce2 100644 --- a/adm/templates/msvc.bat +++ b/adm/templates/msvc.bat @@ -28,6 +28,8 @@ if /I "%VCVER%" == "vc8" ( set "VisualStudioExpressName=WDExpress" ) else if /I "%VCVER%" == "vc14" ( set "DevEnvDir=%VS140COMNTOOLS%..\IDE" +) else if /I "%VCVER%" == "vc14-uwp" ( + set "DevEnvDir=%VS140COMNTOOLS%..\IDE" ) else ( echo Error: wrong VS identifier exit /B diff --git a/adm/templates/template.vc10 b/adm/templates/template.vc10 index 6be03f7c33..9c14b9c80c 100644 --- a/adm/templates/template.vc10 +++ b/adm/templates/template.vc10 @@ -20,23 +20,28 @@ __PROJECT_GUID__ + __UWP_PROPERTIES__ DynamicLibrary __VCVEREXT__ + __VCCHARSET__ DynamicLibrary __VCVEREXT__ + __VCCHARSET__ DynamicLibrary __VCVEREXT__ + __VCCHARSET__ DynamicLibrary __VCVEREXT__ + __VCCHARSET__ @@ -96,7 +101,9 @@ Level4 true %(DisableSpecificWarnings) - Precise__VCMPL32__ + Precise + NotUsing + __VCMPL32__ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) @@ -111,6 +118,7 @@ .\..\..\..\win32\__VCVER__\bin\__TKNAM__.pdb Console ..\..\..\win32\__VCVER__\lib\__TKNAM__.lib + __UWP_GENERATE_METADATA__ @@ -141,7 +149,9 @@ Default %(DisableSpecificWarnings) EnableFastChecks - Precise__VCMPL32__ + Precise + NotUsing + __VCMPL32__ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) @@ -156,6 +166,7 @@ ..\..\..\win32\__VCVER__\bind\__TKNAM__.pdb Console ..\..\..\win32\__VCVER__\libd\__TKNAM__.lib + __UWP_GENERATE_METADATA__ @@ -185,7 +196,9 @@ Level4 true %(DisableSpecificWarnings) - Precise__VCMPL64__ + Precise + NotUsing + __VCMPL64__ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) @@ -200,6 +213,7 @@ .\..\..\..\win64\__VCVER__\bin\__TKNAM__.pdb Console ..\..\..\win64\__VCVER__\lib\__TKNAM__.lib + __UWP_GENERATE_METADATA__ @@ -230,7 +244,9 @@ Default %(DisableSpecificWarnings) EnableFastChecks - Precise__VCMPL64__ + Precise + NotUsing + __VCMPL64__ ..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories) @@ -245,6 +261,7 @@ ..\..\..\win64\__VCVER__\bind\__TKNAM__.pdb Console ..\..\..\win64\__VCVER__\libd\__TKNAM__.lib + __UWP_GENERATE_METADATA__