OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0031471: Confuguration, genproj - unable to build OCC Products

Browse Source 
Restored parsing of src/VAS/Products.tcl.
This commit is contained in:
kgv 2020-03-30 17:55:16 +03:00 committed by bugmaster
parent 128654b60b
commit 6d43db4f74
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
adm/genproj.tcl
View File

@ -490,7 +490,10 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl theSolution }
} }
# make list of modules and platforms # make list of modules and platforms
set aModules [OS:init Modules] set aModules [OS:init OS Modules]
if { [llength $aModules] == 0 } {
set aModules [OS:init VAS Products]
}
if { "$thePlatform" == "ios" } { if { "$thePlatform" == "ios" } {
set goaway [list Draw] set goaway [list Draw]
set aModules [osutils:juststation $goaway $aModules] set aModules [osutils:juststation $goaway $aModules]
@ -517,7 +520,10 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl theSolution }
# make list of Inspector tools # make list of Inspector tools
set aTools {} set aTools {}
if { "$::BUILD_Inspector" == "true" } { if { "$::BUILD_Inspector" == "true" } {
set aTools [OS:init Tools] set aTools [OS:init OS Tools]
if { [llength $aTools] == 0 } {
set aTools [OS:init VAS Tools]
}
# create the out dir if it does not exist # create the out dir if it does not exist
if (![file isdirectory $path/inc/inspector]) { if (![file isdirectory $path/inc/inspector]) {
@ -594,22 +600,26 @@ proc OS:MKVC { theOutDir theModules theTools theAllSolution theVcVer isUWP } {
puts "The Visual Studio solution and project files are stored in the $theOutDir directory" puts "The Visual Studio solution and project files are stored in the $theOutDir directory"
} }
proc OS:init {theNameOfDefFile {os {}}} { proc OS:init {theVas theNameOfDefFile {os {}}} {
set askplat $os set askplat $os
set aModules {} set aModules {}
if { "$os" == "" } { if { "$os" == "" } {
set os $::tcl_platform(os) set os $::tcl_platform(os)
} }
if { ![file exists "$::path/src/${theVas}/${theNameOfDefFile}.tcl"]} {
return $aModules
}
# Load list of OCCT modules and their definitions # Load list of OCCT modules and their definitions
source "$::path/src/OS/${theNameOfDefFile}.tcl" source "$::path/src/${theVas}/${theNameOfDefFile}.tcl"
foreach aModuleIter [OS:Modules] { foreach aModuleIter [${theVas}:${theNameOfDefFile}] {
set aFileTcl "$::path/src/OS/${aModuleIter}.tcl" set aFileTcl "$::path/src/${theVas}/${aModuleIter}.tcl"
if [file exists $aFileTcl] { if [file exists $aFileTcl] {
source $aFileTcl source $aFileTcl
lappend aModules $aModuleIter lappend aModules $aModuleIter
} else { } else {
puts stderr "Definition file for $aModuleIter is not found in unit OS" puts stderr "Definition file for $aModuleIter is not found in unit ${theVas}"
} }
} }

2
src/OS/Tools.tcl
View File

@ -14,7 +14,7 @@
;# ;#
;# Returns an ordered list of module names ;# Returns an ordered list of module names
;# ;#
proc OS:Modules { {plat ""} } { proc OS:Tools { {plat ""} } {
set ret [list TModelingData \ set ret [list TModelingData \
TVisualization \ TVisualization \
TApplicationFramework \ TApplicationFramework \