From cf4bee7c0c0b9a0fcbe84f706217375127ff33ff Mon Sep 17 00:00:00 2001 From: kgv Date: Fri, 2 Nov 2018 17:55:03 +0300 Subject: [PATCH] 0027115: Configuration, genproj - add headers to generated MS VS projects Header files and non-compilable source files are now included within generated VS projects. genproj now generates DRAWEXE.rc. --- adm/genproj.tcl | 193 ++++++++++++++++------------------- adm/templates/template.vc10x | 6 +- src/Font/FILES | 1 - src/WNT/WNT_WClass.cxx | 4 +- src/WNT/WNT_Window.cxx | 6 +- 5 files changed, 100 insertions(+), 110 deletions(-) diff --git a/adm/genproj.tcl b/adm/genproj.tcl index abf698fb4f..31bb630d30 100644 --- a/adm/genproj.tcl +++ b/adm/genproj.tcl @@ -1263,12 +1263,16 @@ proc wokUtils:FILES:FileToString { fin } { # List extensions of compilable files in OCCT proc osutils:compilable {thePlatform} { - if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } { - return [list .c .cxx .cpp .mm] - } + if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } { return [list .c .cxx .cpp .mm] } return [list .c .cxx .cpp] } +# List extensions of header file in OCCT +proc osutils:fileExtensionsHeaders {thePlatform} { + if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } { return [list .h .hxx .hpp .lxx .pxx .gxx ] } + return [list .h .hxx .hpp .lxx .pxx .gxx .mm ] +} + proc osutils:commonUsedTK { theToolKit } { set anUsedToolKits [list] set aDepToolkits [LibToLink $theToolKit] @@ -1465,8 +1469,7 @@ proc osutils:tk:units { tkloc } { } proc osutils:justwnt { listloc } { - # ImageUtility is required for support for old (<6.5.4) versions of OCCT - set goaway [list Xdps Xw ImageUtility WOKUnix] + set goaway [list Xw] return [osutils:juststation $goaway $listloc] } @@ -1556,31 +1559,28 @@ proc wokUtils:FILES:wtail { f n } { } # Generate entry for one source file in Visual Studio 10 project file -proc osutils:vcxproj:file { file params } { - append text " \n" - if { $params != "" } { - append text " [string trim ${params}] %(AdditionalOptions)\n" - } - - if { $params != "" } { - append text " [string trim ${params}] %(AdditionalOptions)\n" - } - - if { $params != "" } { - append text " [string trim ${params}] %(AdditionalOptions)\n" - } - - if { $params != "" } { - append text " [string trim ${params}] %(AdditionalOptions)\n" +proc osutils:vcxproj:cxxfile { theFile theParams } { + if { $theParams == "" } { + return " \n" } + set aParams [string trim ${theParams}] + append text " \n" + append text " ${aParams} %(AdditionalOptions)\n" + append text " ${aParams} %(AdditionalOptions)\n" + append text " ${aParams} %(AdditionalOptions)\n" + append text " ${aParams} %(AdditionalOptions)\n" append text " \n" return $text } +# Generate entry for one header file in Visual Studio 10 project file +proc osutils:vcxproj:hxxfile { theFile } { return " \n" } + # Generate Visual Studio 2010 project filters file -proc osutils:vcxproj:filters { dir proj theFilesMap } { - upvar $theFilesMap aFilesMap +proc osutils:vcxproj:filters { dir proj theCxxFilesMap theHxxFilesMap } { + upvar $theCxxFilesMap aCxxFilesMap + upvar $theHxxFilesMap aHxxFilesMap # header append text "\n" @@ -1591,60 +1591,25 @@ proc osutils:vcxproj:filters { dir proj theFilesMap } { append text " \n" append text " [OS:genGUID]\n" append text " \n" - foreach unit $aFilesMap(units) { - append text " \n" - append text " [OS:genGUID]\n" - append text " \n" - } - append text " \n" - - # list of files - append text " \n" - foreach unit $aFilesMap(units) { - foreach file $aFilesMap($unit) { - append text " \n" - append text " Source files\\${unit}\n" - append text " \n" - } - } - append text " \n" - - # end - append text "" - - # write file - set fp [open [set fvcproj [file join $dir ${proj}.vcxproj.filters]] w] - fconfigure $fp -translation crlf - puts $fp $text - close $fp - - return ${proj}.vcxproj.filters -} - -# Generate Visual Studio 2011 project filters file -proc osutils:vcx1proj:filters { dir proj theFilesMap } { - upvar $theFilesMap aFilesMap - - # header - append text "\n" - append text "\n" - - # list of "filters" (units) - append text " \n" - append text " \n" + append text " \n" append text " [OS:genGUID]\n" append text " \n" - foreach unit $aFilesMap(units) { + foreach unit $aCxxFilesMap(units) { append text " \n" append text " [OS:genGUID]\n" append text " \n" } + foreach unit $aHxxFilesMap(units) { + append text " \n" + append text " [OS:genGUID]\n" + append text " \n" + } append text " \n" - # list of files + # list of cxx files append text " \n" - foreach unit $aFilesMap(units) { - foreach file $aFilesMap($unit) { + foreach unit $aCxxFilesMap(units) { + foreach file $aCxxFilesMap($unit) { append text " \n" append text " Source files\\${unit}\n" append text " \n" @@ -1652,8 +1617,19 @@ proc osutils:vcx1proj:filters { dir proj theFilesMap } { } append text " \n" + # list of hxx files append text " \n" - append text " " + foreach unit $aHxxFilesMap(units) { + foreach file $aHxxFilesMap($unit) { + append text " \n" + append text " Header files\\${unit}\n" + append text " \n" + } + } + append text " \n" + + append text " \n" + append text " \n" append text " \n" # end @@ -1726,9 +1702,9 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } { set anIncPaths "..\\..\\..\\inc" # set aTKDefines "" set aFilesSection "" - set aVcFilesX(units) "" + set aVcFilesCxx(units) "" + set aVcFilesHxx(units) "" set listloc [osutils:tk:units $theToolKit] - set resultloc [osutils:justwnt $listloc] if [array exists written] { unset written } #puts "\t1 [wokparam -v %CMPLRS_CXX_Options [w_info -f]] father" #puts "\t2 [wokparam -v %CMPLRS_CXX_Options] branch" @@ -1737,9 +1713,10 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } { set fxloparamfcxx [lindex [osutils:intersect3 [_get_options wnt cmplrs_cxx f] [_get_options wnt cmplrs_cxx b]] 2] set fxloparamfc [lindex [osutils:intersect3 [_get_options wnt cmplrs_c f] [_get_options wnt cmplrs_c b]] 2] set fxloparam "" - foreach fxlo $resultloc { + foreach fxlo $listloc { set xlo $fxlo - set aSrcFiles [osutils:tk:files $xlo wnt] + set aSrcFiles [osutils:tk:cxxfiles $xlo wnt] + set aHxxFiles [osutils:tk:hxxfiles $xlo wnt] set fxlo_cmplrs_options_cxx [_get_options wnt cmplrs_cxx $fxlo] if {$fxlo_cmplrs_options_cxx == ""} { set fxlo_cmplrs_options_cxx [_get_options wnt cmplrs_cxx b] @@ -1768,12 +1745,22 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } { foreach aSrcFile [lsort $aSrcFiles] { if { ![info exists written([file tail $aSrcFile])] } { set written([file tail $aSrcFile]) 1 - append aFilesSection [osutils:vcxproj:file $aSrcFile $needparam] + append aFilesSection [osutils:vcxproj:cxxfile $aSrcFile $needparam] } else { puts "Warning : in vcproj more than one occurences for [file tail $aSrcFile]" } - if { ! [info exists aVcFilesX($xlo)] } { lappend aVcFilesX(units) $xlo } - lappend aVcFilesX($xlo) $aSrcFile + if { ! [info exists aVcFilesCxx($xlo)] } { lappend aVcFilesCxx(units) $xlo } + lappend aVcFilesCxx($xlo) $aSrcFile + } + foreach aHxxFile [lsort $aHxxFiles] { + if { ![info exists written([file tail $aHxxFile])] } { + set written([file tail $aHxxFile]) 1 + append aFilesSection [osutils:vcxproj:hxxfile $aHxxFile] + } else { + puts "Warning : in vcproj more than one occurences for [file tail $aHxxFile]" + } + if { ! [info exists aVcFilesHxx($xlo)] } { lappend aVcFilesHxx(units) $xlo } + lappend aVcFilesHxx($xlo) $aHxxFile } } else { append aFilesSection "\t\t\t\n" } - - # macros -# append aTKDefines ";__${xlo}_DLL" - # common includes -# append anIncPaths ";..\\..\\..\\src\\${xlo}" } regsub -all -- {__TKINC__} $theProjTmpl $anIncPaths theProjTmpl -# regsub -all -- {__TKDEFS__} $theProjTmpl $aTKDefines theProjTmpl regsub -all -- {__FILES__} $theProjTmpl $aFilesSection theProjTmpl # write file @@ -1807,12 +1788,8 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } { close $aFile # write filters file for vc10+ - if { "$theVcVer" == "vc7" || "$theVcVer" == "vc8" || "$theVcVer" == "vc9" } { - # nothing - } elseif { "$theVcVer" == "vc10" } { - lappend aVcFiles [osutils:vcxproj:filters $theOutDir $theToolKit aVcFilesX] - } else { - lappend aVcFiles [osutils:vcx1proj:filters $theOutDir $theToolKit aVcFilesX] + if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } { + lappend aVcFiles [osutils:vcxproj:filters $theOutDir $theToolKit aVcFilesCxx aVcFilesHxx] } # write resource file @@ -1844,16 +1821,14 @@ proc osutils:tk:loadunit { loc map } { return } -# Returns the list of all compilable files name in a toolkit, or devunit of any type -# Tfiles lists for each unit the type of file that can be compiled. -proc osutils:tk:files { tkloc thePlatform } { +# Returns the list of all files name in a toolkit within specified list of file extensions. +proc osutils:tk:files { tkloc theExtensions } { set Tfiles(source,nocdlpack) {source pubinclude} set Tfiles(source,toolkit) {} set Tfiles(source,executable) {source pubinclude} set listloc [concat [osutils:tk:units $tkloc] $tkloc] #puts " listloc = $listloc" - set l_comp [osutils:compilable $thePlatform] set resultloc $listloc set lret {} foreach loc $resultloc { @@ -1878,7 +1853,7 @@ proc osutils:tk:files { tkloc thePlatform } { #puts $type foreach f $map($type) { #puts $f - if { [lsearch $l_comp [file extension $f]] != -1 } { + if { [lsearch $theExtensions [file extension $f]] != -1 } { lappend lret $f } } @@ -1887,10 +1862,16 @@ proc osutils:tk:files { tkloc thePlatform } { return $lret } +# Returns the list of all compilable files name in a toolkit. +proc osutils:tk:cxxfiles { tkloc thePlatform } { return [osutils:tk:files $tkloc [osutils:compilable $thePlatform]] } + +# Returns the list of all header files name in a toolkit. +proc osutils:tk:hxxfiles { tkloc thePlatform } { return [osutils:tk:files $tkloc [osutils:fileExtensionsHeaders $thePlatform]] } + # Generate Visual Studio project file for executable proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } { set aVcFiles {} - foreach f [osutils:tk:files $theToolKit wnt] { + foreach f [osutils:tk:cxxfiles $theToolKit wnt] { set aProjTmpl [osutils:vcproj:readtemplate $theVcVer $isUWP 1] set aProjName [file rootname [file tail $f]] @@ -1925,15 +1906,16 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } { regsub -all -- {__TKDEP__} $aProjTmpl $aUsedLibs aProjTmpl set aFilesSection "" - set aVcFilesX(units) "" + set aVcFilesCxx(units) "" + set aVcFilesHxx(units) "" if { ![info exists written([file tail $f])] } { set written([file tail $f]) 1 if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } { - append aFilesSection [osutils:vcxproj:file $f ""] - if { ! [info exists aVcFilesX($theToolKit)] } { lappend aVcFilesX(units) $theToolKit } - lappend aVcFilesX($theToolKit) $f + append aFilesSection [osutils:vcxproj:cxxfile $f ""] + if { ! [info exists aVcFilesCxx($theToolKit)] } { lappend aVcFilesCxx(units) $theToolKit } + lappend aVcFilesCxx($theToolKit) $f } else { append aFilesSection "\t\t\t -__FILES__ +__FILES__ + + + + diff --git a/src/Font/FILES b/src/Font/FILES index 234bb0142c..52c34e500e 100644 --- a/src/Font/FILES +++ b/src/Font/FILES @@ -14,6 +14,5 @@ Font_NListOfSystemFont.hxx Font_Rect.hxx Font_SystemFont.cxx Font_SystemFont.hxx -Font_NameOfFont.hxx Font_TextFormatter.hxx Font_TextFormatter.cxx \ No newline at end of file diff --git a/src/WNT/WNT_WClass.cxx b/src/WNT/WNT_WClass.cxx index d35d7c6175..cf168fb41d 100644 --- a/src/WNT/WNT_WClass.cxx +++ b/src/WNT/WNT_WClass.cxx @@ -12,7 +12,9 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include +#if defined(_WIN32) + #include +#endif #include diff --git a/src/WNT/WNT_Window.cxx b/src/WNT/WNT_Window.cxx index 4e71b6d29f..ed0643a3ee 100644 --- a/src/WNT/WNT_Window.cxx +++ b/src/WNT/WNT_Window.cxx @@ -12,8 +12,10 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -// include windows.h first to have all definitions available -#include +#if defined(_WIN32) + // include windows.h first to have all definitions available + #include +#endif #include