From f6d8ca74d5d27ff1ee2170409b6e37d3bdbbdfdf Mon Sep 17 00:00:00 2001 From: nds Date: Sun, 9 Feb 2020 18:20:13 +0300 Subject: [PATCH] 0030749: Inspectors - compilation under tcl scripts - 'Search Qt4' is renamed into 'Search Qt'. Configuration uses Qt5 from now. For Qt4 use CMake configuration. - 'Build Inspector' check box is added. It causes 'tools' toolkits compilation. Activates automatically 'Search Qt' control. - Many Tcl procedures are extended with additional parameter to giving a directory of processed toolkits. The default directory is 'src', inspector directory is 'tools'. This way is similar Inspector compilation implemented in Cmake build procedure. - Dependency libraries in DEBUG are stored in __TKDEP_DEBUG__. Qt requires it as names of debug and release libraries are different. --- adm/UDLIST | 20 + adm/genconf.tcl | 27 +- adm/genconfdeps.tcl | 35 +- adm/genproj.tcl | 511 +++++++++++------- adm/templates/template.vc10 | 4 +- adm/templates/template.vc10x | 4 +- src/OS/ApplicationFramework.tcl | 4 - src/OS/DataExchange.tcl | 4 - src/OS/Draw.tcl | 4 - src/OS/FoundationClasses.tcl | 4 - src/OS/ModelingAlgorithms.tcl | 4 - src/OS/ModelingData.tcl | 4 - src/OS/TApplicationFramework.tcl | 41 ++ src/OS/TModelingData.tcl | 41 ++ src/OS/TTool.tcl | 44 ++ src/OS/TVisualization.tcl | 41 ++ src/OS/Tools.tcl | 24 + src/OS/Visualization.tcl | 4 - tools/DFBrowser/DFBrowser.qrc | 6 + .../icons/attribute.png | Bin .../icons/attribute_40x40.png | Bin .../icons/export_shape.png | Bin .../icons/folder_export.png | Bin .../icons/named_shape.png | Bin .../icons/named_shape_40x40.png | Bin tools/DFBrowserPane/DFBrowserPane.qrc | 13 - tools/DFBrowserPane/FILES | 1 - tools/DFBrowserPane/icons/imageres_4.ico | Bin 168098 -> 0 bytes tools/DFBrowserPane/icons/imageres_5.ico | Bin 168717 -> 0 bytes tools/DFBrowserPane/icons/label.png | Bin 370 -> 0 bytes .../icons/label_folder_16x16.png | Bin 181 -> 0 bytes .../icons/label_folder_20x20.png | Bin 185 -> 0 bytes .../icons/label_folder_40x40.png | Bin 386 -> 0 bytes .../icons/label_folder_expand_16x16.png | Bin 257 -> 0 bytes .../icons/label_folder_expand_20x20.png | Bin 300 -> 0 bytes .../icons/label_folder_expand_40x40.png | Bin 601 -> 0 bytes tools/TInspector/TInspector_Communicator.cxx | 53 +- tools/TInspector/TInspector_Communicator.hxx | 3 + tools/TInspectorEXE/TInspectorEXE.cxx | 6 +- tools/TKVInspector/EXTERNLIB | 1 + tools/TKView/EXTERNLIB | 1 + 41 files changed, 639 insertions(+), 265 deletions(-) create mode 100644 src/OS/TApplicationFramework.tcl create mode 100644 src/OS/TModelingData.tcl create mode 100644 src/OS/TTool.tcl create mode 100644 src/OS/TVisualization.tcl create mode 100644 src/OS/Tools.tcl rename tools/{DFBrowserPane => DFBrowser}/icons/attribute.png (100%) rename tools/{DFBrowserPane => DFBrowser}/icons/attribute_40x40.png (100%) rename tools/{DFBrowserPane => DFBrowser}/icons/export_shape.png (100%) rename tools/{DFBrowserPane => DFBrowser}/icons/folder_export.png (100%) rename tools/{DFBrowserPane => DFBrowser}/icons/named_shape.png (100%) rename tools/{DFBrowserPane => DFBrowser}/icons/named_shape_40x40.png (100%) delete mode 100644 tools/DFBrowserPane/DFBrowserPane.qrc delete mode 100644 tools/DFBrowserPane/icons/imageres_4.ico delete mode 100644 tools/DFBrowserPane/icons/imageres_5.ico delete mode 100644 tools/DFBrowserPane/icons/label.png delete mode 100644 tools/DFBrowserPane/icons/label_folder_16x16.png delete mode 100644 tools/DFBrowserPane/icons/label_folder_20x20.png delete mode 100644 tools/DFBrowserPane/icons/label_folder_40x40.png delete mode 100644 tools/DFBrowserPane/icons/label_folder_expand_16x16.png delete mode 100644 tools/DFBrowserPane/icons/label_folder_expand_20x20.png delete mode 100644 tools/DFBrowserPane/icons/label_folder_expand_40x40.png diff --git a/adm/UDLIST b/adm/UDLIST index 760103691c..f9645d7303 100644 --- a/adm/UDLIST +++ b/adm/UDLIST @@ -444,3 +444,23 @@ t TKRWMesh n RWGltf n RWMesh n RWObj +n DFBrowser +n DFBrowserPane +n DFBrowserPaneXDE +n ShapeView +n TInspector +n TInspectorAPI +x TInspectorEXE +t TKDFBrowser +t TKShapeView +t TKTInspector +t TKTInspectorAPI +t TKToolsDraw +t TKTreeModel +t TKView +t TKVInspector +n ToolsDraw +n TreeModel +n View +n ViewControl +n VInspector diff --git a/adm/genconf.tcl b/adm/genconf.tcl index 401656495d..0bad141320 100644 --- a/adm/genconf.tcl +++ b/adm/genconf.tcl @@ -223,9 +223,14 @@ proc wokdep:gui:UpdateList {} { wokdep:SearchRapidJson anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs } - if { "$::CHECK_QT4" == "true" } { - wokdep:SearchQt4 anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs + if {"$::BUILD_Inspector" == "true" } { + set ::CHECK_QT "true" } + + if { "$::CHECK_QT" == "true" } { + wokdep:SearchQt anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs + } + if { "$::CHECK_JDK" == "true" } { wokdep:SearchJDK anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs } @@ -494,11 +499,16 @@ ttk::label .myFrame.myChecks.myLzmaLbl -text "Use liblzma" checkbutton .myFrame.myChecks.myE57Check -offvalue "false" -onvalue "true" -variable HAVE_E57 -command wokdep:gui:UpdateList ttk::label .myFrame.myChecks.myE57Lbl -text "Use E57" -checkbutton .myFrame.myChecks.myQt4Check -offvalue "false" -onvalue "true" -variable CHECK_QT4 -command wokdep:gui:UpdateList -ttk::label .myFrame.myChecks.myQt4Lbl -text "Search Qt4" +checkbutton .myFrame.myChecks.myQtCheck -offvalue "false" -onvalue "true" -variable CHECK_QT -command wokdep:gui:UpdateList +ttk::label .myFrame.myChecks.myQtLbl -text "Search Qt" checkbutton .myFrame.myChecks.myJDKCheck -offvalue "false" -onvalue "true" -variable CHECK_JDK -command wokdep:gui:UpdateList ttk::label .myFrame.myChecks.myJDKLbl -text "Search JDK" +if { "$::tcl_platform(platform)" == "windows" } { + checkbutton .myFrame.myChecks.myInspectorBuild -offvalue "false" -onvalue "true" -variable BUILD_Inspector -command wokdep:gui:UpdateList + ttk::label .myFrame.myChecks.myInspectorLbl -text "Build Inspector" +} + # Additional headers search paths ttk::label .myFrame.myIncLbl -text "Additional headers search paths:" -padding {5 5 80 5} scrollbar .myFrame.myIncScrl -command ".myFrame.myIncList yview" @@ -602,8 +612,8 @@ if { "$::tcl_platform(os)" != "Darwin" } { grid .myFrame.myChecks.myZLibCheck -row $aCheckRowIter -column 6 -sticky e grid .myFrame.myChecks.myZLibLbl -row $aCheckRowIter -column 7 -sticky w -grid .myFrame.myChecks.myQt4Check -row $aCheckRowIter -column 12 -sticky e -grid .myFrame.myChecks.myQt4Lbl -row $aCheckRowIter -column 13 -sticky w +grid .myFrame.myChecks.myQtCheck -row $aCheckRowIter -column 12 -sticky e +grid .myFrame.myChecks.myQtLbl -row $aCheckRowIter -column 13 -sticky w incr aCheckRowIter grid .myFrame.myChecks.myFFmpegCheck -row $aCheckRowIter -column 0 -sticky e @@ -628,6 +638,11 @@ grid .myFrame.myChecks.myRapidJsonLbl -row $aCheckRowIter -column 1 -sticky w grid .myFrame.myChecks.myE57Check -row $aCheckRowIter -column 6 -sticky e grid .myFrame.myChecks.myE57Lbl -row $aCheckRowIter -column 7 -sticky w +if { "$::tcl_platform(platform)" == "windows" } { + grid .myFrame.myChecks.myInspectorBuild -row $aCheckRowIter -column 12 -sticky e + grid .myFrame.myChecks.myInspectorLbl -row $aCheckRowIter -column 13 -sticky w +} + incr aCheckRowIter # Additional headers search paths diff --git a/adm/genconfdeps.tcl b/adm/genconfdeps.tcl index 3897341ce2..1b15ac0e61 100644 --- a/adm/genconfdeps.tcl +++ b/adm/genconfdeps.tcl @@ -68,7 +68,7 @@ if { [info exists ::env(SHORTCUT_HEADERS)] } { } # fetch environment variables (e.g. set by custom.sh or custom.bat) and set them as tcl variables with the same name -set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_ZLIB HAVE_LIBLZMA HAVE_E57 HAVE_RAPIDJSON HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo} +set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_ZLIB HAVE_LIBLZMA HAVE_E57 HAVE_RAPIDJSON HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo BUILD_Inspector} foreach anEnvIter $THE_ENV_VARIABLES { set ${anEnvIter} "false" if { [info exists ::env(${anEnvIter})] } { @@ -1022,8 +1022,8 @@ proc wokdep:SearchVTK {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64 return "$isFound" } -# Search Qt4 libraries placement -proc wokdep:SearchQt4 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} { +# Search Qt libraries placement +proc wokdep:SearchQt {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} { upvar $theErrInc anErrInc upvar $theErrLib32 anErrLib32 upvar $theErrLib64 anErrLib64 @@ -1031,53 +1031,46 @@ proc wokdep:SearchQt4 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64 upvar $theErrBin64 anErrBin64 set isFound "true" - set aQMsgBoxHPath [wokdep:SearchHeader "QtGui/qmessagebox.h"] + set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt}*] "$::VCVER" "$::ARCH" ] + set aQMsgBoxHPath [wokdep:SearchHeader "QtGui/qguiapplication.h"] if { "$aQMsgBoxHPath" == "" } { - set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$::ARCH" ] - if { "$aPath" != "" && [file exists "$aPath/include/QtGui/qmessagebox.h"] } { + if { "$aPath" != "" && [file exists "$aPath/include/QtGui/qguiapplication.h"] } { lappend ::CSF_OPT_INC "$aPath/include" lappend ::CSF_OPT_INC "$aPath/include/Qt" lappend ::CSF_OPT_INC "$aPath/include/QtGui" lappend ::CSF_OPT_INC "$aPath/include/QtCore" + lappend ::CSF_OPT_INC "$aPath/include/QtWidgets" + lappend ::CSF_OPT_INC "$aPath/include/QtXml" } else { - if { [file exists "/usr/include/qt4/QtGui/qmessagebox.h"] } { - lappend ::CSF_OPT_INC "/usr/include/qt4" - lappend ::CSF_OPT_INC "/usr/include/qt4/Qt" - lappend ::CSF_OPT_INC "/usr/include/qt4/QtGui" - lappend ::CSF_OPT_INC "/usr/include/qt4/QtCore" - } else { - lappend anErrInc "Error: 'QtGui/qmessagebox.h' not found (Qt4)" + lappend anErrInc "Error: 'QtGui/qguiapplication.h' not found" set isFound "false" - } } } set aQtGuiLibName "QtGui" if { "$::tcl_platform(platform)" == "windows" } { - set aQtGuiLibName "QtGui4" + set aQtGuiLibName "Qt5Gui" } foreach anArchIter {64 32} { set aQMsgBoxLibPath [wokdep:SearchLib "${aQtGuiLibName}" "$anArchIter"] if { "$aQMsgBoxLibPath" == "" } { - set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$anArchIter" ] set aQMsgBoxLibPath [wokdep:SearchLib "${aQtGuiLibName}" "$anArchIter" "$aPath/lib"] if { "$aQMsgBoxLibPath" != "" } { lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib" } else { - lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}${aQtGuiLibName}.${::SYS_LIB_SUFFIX}' not found (Qt4)" + lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}${aQtGuiLibName}.${::SYS_LIB_SUFFIX}' not found (Qt)" if { "$::ARCH" == "$anArchIter"} { set isFound "false" } } } if { "$::tcl_platform(platform)" == "windows" } { - set aQMsgBoxDllPath [wokdep:SearchBin "QtGui4.dll" "$anArchIter"] + set aQMsgBoxDllPath [wokdep:SearchBin "${aQtGuiLibName}.dll" "$anArchIter"] if { "$aQMsgBoxDllPath" == "" } { - set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$anArchIter" ] - set aQMsgBoxDllPath [wokdep:SearchBin "QtGui4.dll" "$anArchIter" "$aPath/bin"] + set aQMsgBoxDllPath [wokdep:SearchBin "${aQtGuiLibName}.dll" "$anArchIter" "$aPath/bin"] if { "$aQMsgBoxDllPath" != "" } { lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin" } else { - lappend anErrBin$anArchIter "Error: 'QtGui4.dll' not found (Qt4)" + lappend anErrBin$anArchIter "Error: '${aQtGuiLibName}.dll' not found (Qt)" if { "$::ARCH" == "$anArchIter"} { set isFound "false" } } } diff --git a/adm/genproj.tcl b/adm/genproj.tcl index 513fe1dd7f..a1cc195d52 100644 --- a/adm/genproj.tcl +++ b/adm/genproj.tcl @@ -68,12 +68,12 @@ proc _get_type { name } { return "" } -proc _get_used_files { pk {inc true} {src true} } { +proc _get_used_files { pk theSrcDir {inc true} {src true} } { global path set type [_get_type $pk] set lret {} - set pk_path "$path/src/$pk" - set FILES_path "$path/src/$pk/FILES" + set pk_path "$path/$theSrcDir/$pk" + set FILES_path "$path/$theSrcDir/$pk/FILES" set FILES {} if {[file exists $FILES_path]} { set fd [open $FILES_path rb] @@ -100,12 +100,12 @@ proc _get_used_files { pk {inc true} {src true} } { return $lret } -# return location of the path within src directory -proc osutils:findSrcSubPath {theSubPath} { - if {[file exists "$::path/src/$theSubPath"]} { - return "$::path/src/$theSubPath" +# return location of the path within source directory +proc osutils:findSrcSubPath {theSrcDir theSubPath} { + if {[file exists "$::path/$theSrcDir/$theSubPath"]} { + return "$::path/$theSrcDir/$theSubPath" } - return "$::THE_CASROOT/src/$theSubPath" + return "$::THE_CASROOT/$theSrcDir/$theSubPath" } # Auxiliary tool comparing content of two files line-by-line. @@ -156,11 +156,11 @@ proc osutils:writeTextFile { theFile theContent {theEol lf} } { } # Function re-generating header files for specified text resource -proc genResources { theResource } { +proc genResources { theSrcDir theResource } { global path set aResFileList {} - set aResourceAbsPath [file normalize "${path}/src/${theResource}"] + set aResourceAbsPath [file normalize "${path}/$theSrcDir/${theResource}"] set aResourceDirectory "" set isResDirectory false @@ -193,13 +193,13 @@ proc genResources { theResource } { # generate set aContent {} - lappend aContent "// This file has been automatically generated from resource file src/${aResourceDirectory}/${aResFileIter}" + lappend aContent "// This file has been automatically generated from resource file $theSrcDir/${aResourceDirectory}/${aResFileIter}" lappend aContent "" # generate necessary structures set aLineList {} - if {[file exists "${path}/src/${aResourceDirectory}/${aResFileIter}"]} { - set anInputFile [open "${path}/src/${aResourceDirectory}/${aResFileIter}" rb] + if {[file exists "${path}/$theSrcDir/${aResourceDirectory}/${aResFileIter}"]} { + set anInputFile [open "${path}/$theSrcDir/${aResourceDirectory}/${aResFileIter}" rb] fconfigure $anInputFile -translation crlf set aLineList [split [read $anInputFile] "\n"] close $anInputFile @@ -226,9 +226,9 @@ proc genResources { theResource } { } # Save generated content to header file - set aHeaderFilePath "${path}/src/${aResourceDirectory}/${aHeaderFileName}" + set aHeaderFilePath "${path}/$theSrcDir/${aResourceDirectory}/${aHeaderFileName}" if { [osutils:writeTextFile $aHeaderFilePath $aContent] == true } { - puts "Generating header file from resource file: ${path}/src/${aResourceDirectory}/${aResFileIter}" + puts "Generating header file from resource file: ${path}/$theSrcDir/${aResourceDirectory}/${aResFileIter}" } else { #puts "Header file from resource ${path}/src/${aResourceDirectory}/${aResFileIter} is up-to-date" } @@ -236,7 +236,7 @@ proc genResources { theResource } { } # Function re-generating header files for all text resources -proc genAllResources {} { +proc genAllResources { theSrcDir } { global path set aCasRoot [file normalize $path] if {![file exists "$aCasRoot/adm/RESOURCES"]} { @@ -250,7 +250,7 @@ proc genAllResources {} { set anAdmResources [lsearch -inline -all -not -exact $anAdmResources ""] foreach line $anAdmResources { - genResources "${line}" + genResources $theSrcDir "${line}" } } @@ -351,7 +351,7 @@ proc genproj {theFormat args} { OS:MKPRC "$anAdmPath" "$theFormat" "$aLibType" "$aPlatform" "$aCmpl" "$aSolution" genprojbat "$theFormat" "$aPlatform" "$aSolution" - genAllResources + genAllResources "src" } # copy file providing warning if the target file exists and has @@ -397,6 +397,10 @@ proc genprojbat {theFormat thePlatform theSolution} { } copy_with_warning "$::THE_CASROOT/adm/templates/draw.${aTargetPlatformExt}" "$::path/draw.${aTargetPlatformExt}" + + if { "$::BUILD_Inspector" == "true" } { + copy_with_warning "$::THE_CASROOT/adm/templates/inspector.${aTargetPlatformExt}" "$::path/inspector.${aTargetPlatformExt}" + } } set aSolShList "" @@ -486,7 +490,7 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl theSolution } } # make list of modules and platforms - set aModules [OS:init] + set aModules [OS:init Modules] if { "$thePlatform" == "ios" } { set goaway [list Draw] set aModules [osutils:juststation $goaway $aModules] @@ -508,7 +512,23 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl theSolution } # collect all required header files puts "Collecting required header files into $path/inc ..." - osutils:collectinc $aModules $path/inc + osutils:collectinc $aModules "src" $path/inc + + # make list of Inspector tools + set aTools {} + if { "$::BUILD_Inspector" == "true" } { + set aTools [OS:init Tools] + + # create the out dir if it does not exist + if (![file isdirectory $path/inc/inspector]) { + puts "$path/inc/inspector folder does not exists and will be created" + wokUtils:FILES:mkdir $path/inc/inspector + } + + # collect all required header files + puts "Collecting required tools header files into $path/inc/inspector ..." + osutils:collectinc $aTools "tools" $path/inc/inspector + } if { "$theFormat" == "pro" } { return @@ -531,7 +551,7 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl theSolution } "vc14" - "vc141" - "vc142" - - "vclang" { OS:MKVC $anOutDir $aModules $theSolution $theFormat $isUWP} + "vclang" { OS:MKVC $anOutDir $aModules $aTools $theSolution $theFormat $isUWP} "cbp" { OS:MKCBP $anOutDir $aModules $theSolution $thePlatform $theCmpl } "xcd" { set ::THE_GUIDS_LIST($::aTKNullKey) "000000000000000000000000" @@ -550,54 +570,46 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl theSolution } } # Function to generate Visual Studio solution and project files -proc OS:MKVC { theOutDir theModules theAllSolution theVcVer isUWP } { +proc OS:MKVC { theOutDir theModules theTools theAllSolution theVcVer isUWP } { puts stderr "Generating VS project files for $theVcVer" # generate projects for toolkits and separate solution for each module foreach aModule $theModules { - OS:vcsolution $theVcVer $aModule $aModule $theOutDir ::THE_GUIDS_LIST - OS:vcproj $theVcVer $isUWP $aModule $theOutDir ::THE_GUIDS_LIST + OS:vcsolution $theVcVer $aModule $aModule $theOutDir ::THE_GUIDS_LIST "src" "" "" + OS:vcproj $theVcVer $isUWP $aModule $theOutDir ::THE_GUIDS_LIST "src" "" + } + + # generate projects for toolkits and separate solution for each tool + foreach aTool $theTools { + OS:vcsolution $theVcVer $aTool $aTool $theOutDir ::THE_GUIDS_LIST "tools" "" "src" + OS:vcproj $theVcVer $isUWP $aTool $theOutDir ::THE_GUIDS_LIST "tools" "src" } # generate single solution "OCCT" containing projects from all modules if { "$theAllSolution" != "" } { - OS:vcsolution $theVcVer $theAllSolution $theModules $theOutDir ::THE_GUIDS_LIST + OS:vcsolution $theVcVer $theAllSolution $theModules $theOutDir ::THE_GUIDS_LIST "src" $theTools "tools" } puts "The Visual Studio solution and project files are stored in the $theOutDir directory" } -proc OS:init {{os {}}} { +proc OS:init {theNameOfDefFile {os {}}} { set askplat $os set aModules {} if { "$os" == "" } { set os $::tcl_platform(os) } - if [file exists "$::path/src/VAS/Products.tcl"] { - source "$::path/src/VAS/Products.tcl" - foreach aModuleIter [VAS:Products] { - set aFileTcl "$::path/src/VAS/${aModuleIter}.tcl" - if [file exists $aFileTcl] { - source $aFileTcl - lappend aModules $aModuleIter - } else { - puts stderr "Definition file for module $aModuleIter is not found in unit VAS" - } - } - return $aModules - } - # Load list of OCCT modules and their definitions - source "$::path/src/OS/Modules.tcl" + source "$::path/src/OS/${theNameOfDefFile}.tcl" foreach aModuleIter [OS:Modules] { set aFileTcl "$::path/src/OS/${aModuleIter}.tcl" if [file exists $aFileTcl] { source $aFileTcl lappend aModules $aModuleIter } else { - puts stderr "Definition file for module $aModuleIter is not found in unit OS" + puts stderr "Definition file for $aModuleIter is not found in unit OS" } } @@ -716,10 +728,10 @@ proc OS:executable { module } { } # Topological sort of toolkits in tklm -proc osutils:tk:sort { tklm } { +proc osutils:tk:sort { tklm theSrcDir theSourceDirOther } { set tkby2 {} foreach tkloc $tklm { - set lprg [wokUtils:LIST:Purge [osutils:tk:close $tkloc]] + set lprg [wokUtils:LIST:Purge [osutils:tk:close $tkloc $theSrcDir $theSourceDirOther]] foreach tkx $lprg { if { [lsearch $tklm $tkx] != -1 } { lappend tkby2 [list $tkx $tkloc] @@ -740,26 +752,26 @@ proc osutils:tk:sort { tklm } { # close dependencies of ltk. (full wok pathes of toolkits) # The CURRENT WOK LOCATION MUST contains ALL TOOLKITS required. # (locate not performed.) -proc osutils:tk:close { ltk } { +proc osutils:tk:close { ltk theSrcDir theSourceDirOther } { set result {} set recurse {} foreach dir $ltk { - set ids [LibToLink $dir] + set ids [LibToLink $dir $theSrcDir $theSourceDirOther] # puts "osutils:tk:close($ltk) ids='$ids'" set eated [osutils:tk:eatpk $ids] set result [concat $result $eated] - set ids [LibToLink $dir] + set ids [LibToLink $dir $theSrcDir $theSourceDirOther] set result [concat $result $ids] foreach file $eated { - set kds [osutils:findSrcSubPath "$file/EXTERNLIB"] + set kds [osutils:findSrcSubPath $theSrcDir "$file/EXTERNLIB"] if { [osutils:tk:eatpk $kds] != {} } { lappend recurse $file } } } if { $recurse != {} } { - set result [concat $result [osutils:tk:close $recurse]] + set result [concat $result [osutils:tk:close $recurse $theSrcDir $theSourceDirOther]] } return $result } @@ -776,16 +788,19 @@ proc osutils:tk:eatpk { EXTERNLIB } { } # Define libraries to link using only EXTERNLIB file -proc LibToLink {theTKit} { +proc LibToLink {theTKit theSrcDir theSourceDirOther} { regexp {^.*:([^:]+)$} $theTKit dummy theTKit set type [_get_type $theTKit] if {$type != "t" && $type != "x"} { return } set aToolkits {} - set anExtLibList [osutils:tk:eatpk [osutils:findSrcSubPath "$theTKit/EXTERNLIB"]] + set anExtLibList [osutils:tk:eatpk [osutils:findSrcSubPath $theSrcDir "$theTKit/EXTERNLIB"]] foreach anExtLib $anExtLibList { - set aFullPath [LocateRecur $anExtLib] + set aFullPath [LocateRecur $anExtLib $theSrcDir] + if { "$aFullPath" == "" && "$theSourceDirOther" != "" } { + set aFullPath [LocateRecur $anExtLib $theSourceDirOther] + } if { "$aFullPath" != "" && [_get_type $anExtLib] == "t" } { lappend aToolkits $anExtLib } @@ -794,8 +809,8 @@ proc LibToLink {theTKit} { } # Search unit recursively -proc LocateRecur {theName} { - set theNamePath [osutils:findSrcSubPath "$theName"] +proc LocateRecur {theName theSrcDir} { + set theNamePath [osutils:findSrcSubPath $theSrcDir "$theName"] if {[file isdirectory $theNamePath]} { return $theNamePath } @@ -822,7 +837,7 @@ proc OS:genGUID { {theFormat "vc"} } { } # collect all include file that required for theModules in theOutDir -proc osutils:collectinc {theModules theIncPath} { +proc osutils:collectinc {theModules theSrcDir theIncPath} { global path set aCasRoot [file normalize $path] set anIncPath [file normalize $theIncPath] @@ -837,14 +852,14 @@ proc osutils:collectinc {theModules theIncPath} { foreach aToolKit [${aModule}:toolkits] { lappend anUsedToolKits $aToolKit - foreach aDependency [LibToLink $aToolKit] { + foreach aDependency [LibToLink $aToolKit $theSrcDir ""] { lappend anUsedToolKits $aDependency } } foreach anExecutable [OS:executable ${aModule}] { lappend anUsedToolKits $anExecutable - foreach aDependency [LibToLink $anExecutable] { + foreach aDependency [LibToLink $anExecutable $theSrcDir ""] { lappend anUsedToolKits $aDependency } } @@ -853,7 +868,7 @@ proc osutils:collectinc {theModules theIncPath} { set anUnits {} foreach anUsedToolKit $anUsedToolKits { - set anUnits [concat $anUnits [osutils:tk:units $anUsedToolKit]] + set anUnits [concat $anUnits [osutils:tk:units $anUsedToolKit $theSrcDir] ] } set anUnits [lsort -unique $anUnits] @@ -878,14 +893,14 @@ proc osutils:collectinc {theModules theIncPath} { } set aHeaderTmpl [wokUtils:FILES:FileToString $::THE_CASROOT/adm/templates/header.in] - # relative anIncPath in connection with aCasRoot/src - set aFromBuildIncToSrcPath [relativePath "$anIncPath" "$aCasRoot/src"] + # relative anIncPath in connection with aCasRoot/$theSrcDir + set aFromBuildIncToSrcPath [relativePath "$anIncPath" "$aCasRoot/$theSrcDir"] # create and copy short-cut header files foreach anUnit $anUnits { - osutils:checksrcfiles ${anUnit} + osutils:checksrcfiles ${anUnit} $theSrcDir - set aHFiles [_get_used_files ${anUnit} true false] + set aHFiles [_get_used_files ${anUnit} $theSrcDir true false] foreach aHeaderFile ${aHFiles} { set aHeaderFileName [lindex ${aHeaderFile} 1] lappend allHeaderFiles "${aHeaderFileName}" @@ -920,15 +935,15 @@ proc osutils:collectinc {theModules theIncPath} { } else { set nbcopied 0 foreach anUnit $anUnits { - osutils:checksrcfiles ${anUnit} + osutils:checksrcfiles ${anUnit} $theSrcDir - set aHFiles [_get_used_files ${anUnit} true false] + set aHFiles [_get_used_files ${anUnit} $theSrcDir true false] foreach aHeaderFile ${aHFiles} { set aHeaderFileName [lindex ${aHeaderFile} 1] lappend allHeaderFiles "${aHeaderFileName}" # copy file only if target does not exist or is older than original - set torig [file mtime $aCasRoot/src/$anUnit/$aHeaderFileName] + set torig [file mtime $aCasRoot/$theSrcDir/$anUnit/$aHeaderFileName] set tcopy 0 if { [file isfile $anIncPath/$aHeaderFileName] } { set tcopy [file mtime $anIncPath/$aHeaderFileName] @@ -939,12 +954,12 @@ proc osutils:collectinc {theModules theIncPath} { if { $tcopy != 0 } { file delete -force "$theIncPath/$aHeaderFileName" } - file link -hard $anIncPath/$aHeaderFileName $aCasRoot/src/$anUnit/$aHeaderFileName + file link -hard $anIncPath/$aHeaderFileName $aCasRoot/$theSrcDir/$anUnit/$aHeaderFileName } else { - file copy -force $aCasRoot/src/$anUnit/$aHeaderFileName $anIncPath/$aHeaderFileName + file copy -force $aCasRoot/$theSrcDir/$anUnit/$aHeaderFileName $anIncPath/$aHeaderFileName } } elseif { $tcopy != $torig } { - puts "Warning: file $anIncPath/$aHeaderFileName is newer than $aCasRoot/src/$anUnit/$aHeaderFileName, not changed!" + puts "Warning: file $anIncPath/$aHeaderFileName is newer than $aCasRoot/$theSrcDir/$anUnit/$aHeaderFileName, not changed!" } } } @@ -1073,44 +1088,16 @@ proc osutils:vcsolution:config:end { vcversion } { # generate Visual Studio solution file # if module is empty, generates one solution for all known modules -proc OS:vcsolution { theVcVer theSolName theModules theOutDir theGuidsMap } { +proc OS:vcsolution { theVcVer theSolName theModules theOutDir theGuidsMap theSrcDir theModulesOther theSourceDirOther } { global path upvar $theGuidsMap aGuidsMap # collect list of projects to be created set aProjects {} set aDependencies {} - foreach aModule $theModules { - # toolkits - foreach aToolKit [osutils:tk:sort [${aModule}:toolkits]] { - lappend aProjects $aToolKit - lappend aProjectsInModule($aModule) $aToolKit - lappend aDependencies [LibToLink $aToolKit] - } - # executables, assume one project per cxx file... - foreach aUnit [OS:executable ${aModule}] { - set aUnitLoc $aUnit - set src_files [_get_used_files $aUnit false] - set aSrcFiles {} - foreach s $src_files { - regexp {source ([^\s]+)} $s dummy name - lappend aSrcFiles $name - } - foreach aSrcFile $aSrcFiles { - set aFileExtension [file extension $aSrcFile] - if { $aFileExtension == ".cxx" } { - set aPrjName [file rootname $aSrcFile] - lappend aProjects $aPrjName - lappend aProjectsInModule($aModule) $aPrjName - if {[file isdirectory $path/src/$aUnitLoc]} { - lappend aDependencies [LibToLinkX $aUnitLoc [file rootname $aSrcFile]] - } else { - lappend aDependencies {} - } - } - } - } - } + + osutils:convertModules $theModules $theSrcDir $theSourceDirOther aProjects aProjectsInModule aDependencies + osutils:convertModules $theModulesOther $theSourceDirOther $theSrcDir aProjects aProjectsInModule aDependencies # generate GUIDs for projects (unless already known) foreach aProject $aProjects { @@ -1137,6 +1124,15 @@ proc OS:vcsolution { theVcVer theSolName theModules theOutDir theGuidsMap } { } } + if { "$theVcVer" != "vc7" && [llength "$theModulesOther"] > 1 } { + set aModule "Tools" + if { ! [info exists aGuidsMap(_$aModule)] } { + set aGuidsMap(_$aModule) [OS:genGUID] + } + set aGuid $aGuidsMap(_$aModule) + append aFileBuff "Project(\"${VC_GROUP_GUID}\") = \"$aModule\", \"$aModule\", \"$aGuid\"\nEndProject\n" + } + # extension of project files set aProjExt [osutils:vcproj:ext $theVcVer] @@ -1181,6 +1177,13 @@ proc OS:vcsolution { theVcVer theSolName theModules theOutDir theGuidsMap } { append aFileBuff " $aGuidsMap($aProject) = $aGuidsMap(_$aModule)\n" } } + set aToolsName "Tools" + foreach aModule $theModulesOther { + if { ! [info exists aProjectsInModule($aModule)] } { continue } + foreach aProject $aProjectsInModule($aModule) { + append aFileBuff " $aGuidsMap($aProject) = $aGuidsMap(_$aToolsName)\n" + } + } append aFileBuff " EndGlobalSection\n" } @@ -1194,19 +1197,65 @@ proc OS:vcsolution { theVcVer theSolName theModules theOutDir theGuidsMap } { close $aFile return [file join $theOutDir ${theSolName}.sln] } + +# Generate auxiliary containers with information about modules. +# @param theModules List of modules +# @param theSrcDir Directory of module toolkits +# @param theSourceDirOther Directory with other additional sources to find out toolkits in dependencies +# @param theProjects list of all found projects/toolkits +# @param theProjectsInModule map of module into toolkits/projects +# @param theDependencies list of the project dependencies. To find the project dependencies, get it by the index in project container +proc osutils:convertModules { theModules theSrcDir theSourceDirOther theProjects theProjectsInModule theDependencies } { + global path + upvar $theProjectsInModule aProjectsInModule + upvar $theProjects aProjects + upvar $theDependencies aDependencies + + foreach aModule $theModules { + # toolkits + foreach aToolKit [osutils:tk:sort [${aModule}:toolkits] $theSrcDir $theSourceDirOther] { + lappend aProjects $aToolKit + lappend aProjectsInModule($aModule) $aToolKit + lappend aDependencies [LibToLink $aToolKit $theSrcDir $theSourceDirOther] + } + # executables, assume one project per cxx file... + foreach aUnit [OS:executable ${aModule}] { + set aUnitLoc $aUnit + set src_files [_get_used_files $aUnit $theSrcDir false] + set aSrcFiles {} + foreach s $src_files { + regexp {source ([^\s]+)} $s dummy name + lappend aSrcFiles $name + } + foreach aSrcFile $aSrcFiles { + set aFileExtension [file extension $aSrcFile] + if { $aFileExtension == ".cxx" } { + set aPrjName [file rootname $aSrcFile] + lappend aProjects $aPrjName + lappend aProjectsInModule($aModule) $aPrjName + if {[file isdirectory $path/$theSrcDir/$aUnitLoc]} { + lappend aDependencies [LibToLinkX $aUnitLoc [file rootname $aSrcFile] $theSrcDir $theSourceDirOther] + } else { + lappend aDependencies {} + } + } + } + } + } +} # Generate Visual Studio projects for specified version -proc OS:vcproj { theVcVer isUWP theModules theOutDir theGuidsMap } { +proc OS:vcproj { theVcVer isUWP theModules theOutDir theGuidsMap theSrcDir theSourceDirOther } { upvar $theGuidsMap aGuidsMap set aProjectFiles {} foreach aModule $theModules { foreach aToolKit [${aModule}:toolkits] { - lappend aProjectFiles [osutils:vcproj $theVcVer $isUWP $theOutDir $aToolKit aGuidsMap] + lappend aProjectFiles [osutils:vcproj $theVcVer $isUWP $theOutDir $aToolKit aGuidsMap $theSrcDir $theSourceDirOther] } foreach anExecutable [OS:executable ${aModule}] { - lappend aProjectFiles [osutils:vcprojx $theVcVer $isUWP $theOutDir $anExecutable aGuidsMap] + lappend aProjectFiles [osutils:vcprojx $theVcVer $isUWP $theOutDir $anExecutable aGuidsMap $theSrcDir $theSourceDirOther] } } return $aProjectFiles @@ -1311,9 +1360,14 @@ proc osutils:fileExtensionsHeaders {thePlatform} { return [list .h .hxx .hpp .lxx .pxx .gxx .mm ] } -proc osutils:commonUsedTK { theToolKit } { +# List extensions of Qt resource file in OCCT +proc osutils:fileExtensionsResources {thePlatform} { + return [list .qrc ] +} + +proc osutils:commonUsedTK { theToolKit theSrcDir theSourceDirOther} { set anUsedToolKits [list] - set aDepToolkits [LibToLink $theToolKit] + set aDepToolkits [LibToLink $theToolKit $theSrcDir $theSourceDirOther] foreach tkx $aDepToolkits { if {[_get_type $tkx] == "t"} { lappend anUsedToolKits "${tkx}" @@ -1338,7 +1392,7 @@ proc osutils:tk:csfInExternlib { EXTERNLIB } { # @param theOS - target OS # @param theCsfLibsMap - libraries map # @param theCsfFrmsMap - frameworks map, OS X specific -proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } { +proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap theRelease} { upvar $theCsfLibsMap aLibsMap upvar $theCsfFrmsMap aFrmsMap @@ -1403,8 +1457,11 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } { # the naming is different on Windows set aLibsMap(CSF_TclLibs) "tcl86" set aLibsMap(CSF_TclTkLibs) "tk86" - - set aLibsMap(CSF_QT) "QtCore4 QtGui4" + if { "$theRelease" == "true" } { + set aLibsMap(CSF_QT) "Qt5Gui Qt5Widgets Qt5Xml Qt5Core" + } else { + set aLibsMap(CSF_QT) "Qt5Guid Qt5Widgetsd Qt5Xmld Qt5Cored" + } # tbb headers define different pragma lib depending on debug/release set aLibsMap(CSF_TBB) "" @@ -1483,16 +1540,16 @@ proc osutils:vtkCsf {{theOS ""}} { # @param theLibsList - dependencies (libraries list) # @param theFrameworks - dependencies (frameworks list, OS X specific) -proc osutils:usedOsLibs { theToolKit theOS theLibsList theFrameworks } { +proc osutils:usedOsLibs { theToolKit theOS theLibsList theFrameworks theSrcDir { theRelease true } } { global path upvar $theLibsList aLibsList upvar $theFrameworks aFrameworks set aLibsList [list] set aFrameworks [list] - osutils:csfList $theOS aLibsMap aFrmsMap + osutils:csfList $theOS aLibsMap aFrmsMap $theRelease - foreach aCsfElem [osutils:tk:csfInExternlib "$path/src/${theToolKit}/EXTERNLIB"] { + foreach aCsfElem [osutils:tk:csfInExternlib "$path/$theSrcDir/${theToolKit}/EXTERNLIB"] { if [info exists aLibsMap($aCsfElem)] { foreach aLib [split "$aLibsMap($aCsfElem)"] { if { [lsearch $aLibsList $aLib] == "-1" } { @@ -1511,12 +1568,12 @@ proc osutils:usedOsLibs { theToolKit theOS theLibsList theFrameworks } { } # Returns liste of UD in a toolkit. tkloc is a full path wok. -proc osutils:tk:units { tkloc } { +proc osutils:tk:units { tkloc theSrcDir } { global path set l {} - set PACKAGES "$path/src/$tkloc/PACKAGES" + set PACKAGES "$path/$theSrcDir/$tkloc/PACKAGES" foreach u [wokUtils:FILES:FileToList $PACKAGES] { - if {[file isdirectory "$path/src/$u"]} { + if {[file isdirectory "$path/$theSrcDir/$u"]} { lappend l $u } } @@ -1617,9 +1674,9 @@ proc wokUtils:FILES:wtail { f n } { } # Generate entry for one source file in Visual Studio 10 project file -proc osutils:vcxproj:cxxfile { theFile theParams } { +proc osutils:vcxproj:cxxfile { theFile theParams theSrcFileLevel } { if { $theParams == "" } { - return " \n" + return " \n" } set aParams [string trim ${theParams}] @@ -1716,7 +1773,15 @@ proc osutils:readtemplate:rc {theOutDir theToolKit} { } # Generate Visual Studio project file for ToolKit -proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } { +proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap theSrcDir theSourceDirOther } { + global path + + set aHasQtDep "false" + foreach aCsfElem [osutils:tk:csfInExternlib "$path/$theSrcDir/${theToolKit}/EXTERNLIB"] { + if { "$aCsfElem" == "CSF_QT" } { + set aHasQtDep "true" + } + } set theProjTmpl [osutils:vcproj:readtemplate $theVcVer $isUWP 0] set l_compilable [osutils:compilable wnt] @@ -1736,33 +1801,26 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } { lappend aUsedLibs "WindowsApp.lib" } - foreach tkx [osutils:commonUsedTK $theToolKit] { + foreach tkx [osutils:commonUsedTK $theToolKit $theSrcDir $theSourceDirOther] { lappend aUsedLibs "${tkx}.lib" } - osutils:usedOsLibs $theToolKit "wnt" aLibs aFrameworks - foreach aLibIter $aLibs { - lappend aUsedLibs "${aLibIter}.lib" - } + set anOsReleaseLibs {} + set anOsDebugLibs {} + osutils:usedOsLibs $theToolKit "wnt" anOsReleaseLibs aFrameworks $theSrcDir true + osutils:usedOsLibs $theToolKit "wnt" anOsDebugLibs aFrameworks $theSrcDir false # correct names of referred third-party libraries that are named with suffix # depending on VC version - set aVCRTVer [string range $theVcVer 0 3] - regsub -all -- {vc[0-9]+} $aUsedLibs $aVCRTVer aUsedLibs - - # and put this list to project file - #puts "$theToolKit requires $aUsedLibs" - if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } { - set aUsedLibs [join $aUsedLibs {;}] - } - regsub -all -- {__TKDEP__} $theProjTmpl $aUsedLibs theProjTmpl + regsub -all -- {__TKDEP__} $theProjTmpl [osutils:depLibraries $aUsedLibs $anOsReleaseLibs $theVcVer] theProjTmpl + regsub -all -- {__TKDEP_DEBUG__} $theProjTmpl [osutils:depLibraries $aUsedLibs $anOsDebugLibs $theVcVer] theProjTmpl set anIncPaths "..\\..\\..\\inc" # set aTKDefines "" set aFilesSection "" set aVcFilesCxx(units) "" set aVcFilesHxx(units) "" - set listloc [osutils:tk:units $theToolKit] + set listloc [osutils:tk:units $theToolKit $theSrcDir] 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" @@ -1773,9 +1831,23 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } { set fxloparam "" foreach fxlo $listloc { set xlo $fxlo - 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] + set aSrcFiles [osutils:tk:cxxfiles $xlo wnt $theSrcDir] + set aHxxFiles [osutils:tk:hxxfiles $xlo wnt $theSrcDir] + + # prepare Qt moc files, appears only in Inspector - directory tools + set aGeneratedFiles {} + if { "$aHasQtDep" == "true" } { + set aMocResFiles [osutils:tk:mocfiles $aHxxFiles $theOutDir] + set aGeneratedFiles [osutils:tk:execfiles $aMocResFiles $theOutDir moc${::SYS_EXE_SUFFIX} moc cpp] + + set aQrcResFiles [osutils:tk:qrcfiles $xlo wnt $theSrcDir] + set aQrcFiles [osutils:tk:execfiles $aQrcResFiles $theOutDir rcc${::SYS_EXE_SUFFIX} rcc cpp] + foreach resFile $aQrcFiles { + lappend aGeneratedFiles $resFile + } + } + + 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] } @@ -1803,7 +1875,7 @@ 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:cxxfile $aSrcFile $needparam] + append aFilesSection [osutils:vcxproj:cxxfile $aSrcFile $needparam 3] } else { puts "Warning : in vcproj more than one occurences for [file tail $aSrcFile]" } @@ -1820,6 +1892,16 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } { if { ! [info exists aVcFilesHxx($xlo)] } { lappend aVcFilesHxx(units) $xlo } lappend aVcFilesHxx($xlo) $aHxxFile } + foreach aGenFile [lsort $aGeneratedFiles] { + if { ![info exists written([file tail $aGenFile])] } { + set written([file tail $aGenFile]) 1 + append aFilesSection [osutils:vcxproj:cxxfile $aGenFile $needparam 5] + } else { + puts "Warning : in vcproj more than one occurences for [file tail $aGenFile]" + } + if { ! [info exists aVcFilesCxx($xlo)] } { lappend aVcFilesCxx(units) $xlo } + lappend aVcFilesCxx($xlo) $aGenFile + } } else { append aFilesSection "\t\t\t [array names map]" set LType $Tfiles(source,${utyp}) foreach typ [array names map] { @@ -1921,15 +2029,52 @@ proc osutils:tk:files { tkloc theExtensions } { } # 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]] } +proc osutils:tk:cxxfiles { tkloc thePlatform theSrcDir } { return [osutils:tk:files $tkloc [osutils:compilable $thePlatform] $theSrcDir] } # 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]] } +proc osutils:tk:hxxfiles { tkloc thePlatform theSrcDir } { return [osutils:tk:files $tkloc [osutils:fileExtensionsHeaders $thePlatform] $theSrcDir] } + +# Returns the list of all resource (qrc) files name in a toolkit. +proc osutils:tk:qrcfiles { tkloc thePlatform theSourceDir } { return [osutils:tk:files $tkloc [osutils:fileExtensionsResources $thePlatform] $theSourceDir] } + +# Returns the list of all header files name in a toolkit. +proc osutils:tk:mocfiles { HxxFiles theOutDir } { + set lret {} + foreach file $HxxFiles { + # processing only files where Q_OBJECT exists + set fd [open "$file" rb] + set FILES [split [read $fd] "\n"] + close $fd + + set isQObject [expr [regexp "Q_OBJECT" $FILES]] + if { ! $isQObject } { + continue; + } + lappend lret $file + } + return $lret +} + +# Returns the list of all header files name in a toolkit. +proc osutils:tk:execfiles { theFiles theOutDir theCommand thePrefix theExtension} { + set lret {} + set anOutDir $theOutDir/$thePrefix + file mkdir $anOutDir + + foreach file $theFiles { + set aResourceName [file tail $file] + set anOutFile $anOutDir/${thePrefix}_[file rootname $aResourceName].$theExtension + + exec $theCommand $file -o $anOutFile + lappend lret $anOutFile + } + return $lret +} # Generate Visual Studio project file for executable -proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } { +proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap theSrcDir theSourceDirOther } { set aVcFiles {} - foreach f [osutils:tk:cxxfiles $theToolKit wnt] { + foreach f [osutils:tk:cxxfiles $theToolKit wnt $theSrcDir] { set aProjTmpl [osutils:vcproj:readtemplate $theVcVer $isUWP 1] set aProjName [file rootname [file tail $f]] @@ -1943,25 +2088,18 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } { regsub -all -- {__PROJECT_GUID__} $aProjTmpl $aGuidsMap($aProjName) aProjTmpl set aUsedLibs [list] - foreach tkx [osutils:commonUsedTK $theToolKit] { + foreach tkx [osutils:commonUsedTK $theToolKit $theSrcDir $theSourceDirOther] { lappend aUsedLibs "${tkx}.lib" } - osutils:usedOsLibs $theToolKit "wnt" aLibs aFrameworks - foreach aLibIter $aLibs { - lappend aUsedLibs "${aLibIter}.lib" - } + set anOsReleaseLibs {} + set anOsDebugLibs {} + osutils:usedOsLibs $theToolKit "wnt" anOsReleaseLibs aFrameworks $theSrcDir true + osutils:usedOsLibs $theToolKit "wnt" anOsDebugLibs aFrameworks $theSrcDir false - # correct names of referred third-party libraries that are named with suffix - # depending on VC version set aVCRTVer [string range $theVcVer 0 3] - regsub -all -- {vc[0-9]+} $aUsedLibs $aVCRTVer aUsedLibs - -# puts "$aProjName requires $aUsedLibs" - if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } { - set aUsedLibs [join $aUsedLibs {;}] - } - regsub -all -- {__TKDEP__} $aProjTmpl $aUsedLibs aProjTmpl + regsub -all -- {__TKDEP__} $aProjTmpl [osutils:depLibraries $aUsedLibs $anOsReleaseLibs $theVcVer] aProjTmpl + regsub -all -- {__TKDEP_DEBUG__} $aProjTmpl [osutils:depLibraries $aUsedLibs $anOsDebugLibs $theVcVer] aProjTmpl set aFilesSection "" set aVcFilesCxx(units) "" @@ -1971,7 +2109,7 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } { set written([file tail $f]) 1 if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } { - append aFilesSection [osutils:vcxproj:cxxfile $f ""] + append aFilesSection [osutils:vcxproj:cxxfile $f "" 3] if { ! [info exists aVcFilesCxx($theToolKit)] } { lappend aVcFilesCxx(units) $theToolKit } lappend aVcFilesCxx($theToolKit) $f } else { @@ -1982,7 +2120,7 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } { append aFilesSection "\t\t\t" } } else { - puts "Warning : in vcproj there are than one occurences for [file tail $f]" + puts "Warning : in vcproj there are more than one occurences for [file tail $f]" } #puts "$aProjTmpl $aFilesSection" set anIncPaths "..\\..\\..\\inc" @@ -2169,14 +2307,14 @@ proc osutils:cbptk { theCmpl theOutDir theToolKit thePlatform} { set aTKSrcFiles [list] # collect list of referred libraries to link with - osutils:usedOsLibs $theToolKit $thePlatform aUsedLibs aFrameworks - set aDepToolkits [wokUtils:LIST:Purge [osutils:tk:close $theToolKit]] + osutils:usedOsLibs $theToolKit $thePlatform aUsedLibs aFrameworks "src" + set aDepToolkits [wokUtils:LIST:Purge [osutils:tk:close $theToolKit "src" ""]] foreach tkx $aDepToolkits { lappend aUsedLibs "${tkx}" } lappend anIncPaths "../../../inc" - set listloc [osutils:tk:units $theToolKit] + set listloc [osutils:tk:units $theToolKit "src"] if { [llength $listloc] == 0 } { set listloc $theToolKit @@ -2190,7 +2328,7 @@ proc osutils:cbptk { theCmpl theOutDir theToolKit thePlatform} { if [array exists written] { unset written } foreach fxlo $resultloc { set xlo $fxlo - set aSrcFiles [osutils:tk:cxxfiles $xlo $thePlatform] + set aSrcFiles [osutils:tk:cxxfiles $xlo $thePlatform "src"] foreach aSrcFile [lsort $aSrcFiles] { if { ![info exists written([file tail $aSrcFile])] } { set written([file tail $aSrcFile]) 1 @@ -2222,8 +2360,8 @@ proc OS:cworkspace { theSolName theModules theOutDir } { # collect list of projects to be created foreach aModule $theModules { # toolkits - foreach aToolKit [osutils:tk:sort [${aModule}:toolkits]] { - set aDependencies [LibToLink $aToolKit] + foreach aToolKit [osutils:tk:sort [${aModule}:toolkits] "src" ""] { + set aDependencies [LibToLink $aToolKit "src" ""] if { [llength $aDependencies] == 0 } { puts $aFile "\t\t" } else { @@ -2238,7 +2376,7 @@ proc OS:cworkspace { theSolName theModules theOutDir } { # executables, assume one project per cxx file... foreach aUnit [OS:executable ${aModule}] { set aUnitLoc $aUnit - set src_files [_get_used_files $aUnit false] + set src_files [_get_used_files $aUnit "src" false] set aSrcFiles {} foreach s $src_files { regexp {source ([^\s]+)} $s dummy name @@ -2250,7 +2388,7 @@ proc OS:cworkspace { theSolName theModules theOutDir } { set aPrjName [file rootname $aSrcFile] set aDependencies [list] if {[file isdirectory $path/src/$aUnitLoc]} { - set aDependencies [LibToLinkX $aUnitLoc [file rootname $aSrcFile]] + set aDependencies [LibToLinkX $aUnitLoc [file rootname $aSrcFile] "src" ""] } set anActiveState "" if { $isActiveSet == 0 } { @@ -2284,7 +2422,7 @@ proc osutils:cbpx { theCmpl theOutDir theToolKit thePlatform } { set aWokArch "$::env(ARCH)" set aCbpFiles {} - foreach aSrcFile [osutils:tk:cxxfiles $theToolKit $thePlatform] { + foreach aSrcFile [osutils:tk:cxxfiles $theToolKit $thePlatform "src"] { # collect list of referred libraries to link with set aUsedLibs [list] set aFrameworks [list] @@ -2293,9 +2431,9 @@ proc osutils:cbpx { theCmpl theOutDir theToolKit thePlatform } { set aTKSrcFiles [list] set aProjName [file rootname [file tail $aSrcFile]] - osutils:usedOsLibs $theToolKit $thePlatform aUsedLibs aFrameworks + osutils:usedOsLibs $theToolKit $thePlatform aUsedLibs aFrameworks "src" - set aDepToolkits [LibToLinkX $theToolKit $aProjName] + set aDepToolkits [LibToLinkX $theToolKit $aProjName "src" ""] foreach tkx $aDepToolkits { if {[_get_type $tkx] == "t"} { lappend aUsedLibs "${tkx}" @@ -2593,8 +2731,8 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs } # Define libraries to link using only EXTERNLIB file -proc LibToLinkX {thePackage theDummyName} { - set aToolKits [LibToLink $thePackage] +proc LibToLinkX {thePackage theDummyName theSrcDir theSourceDirOther} { + set aToolKits [LibToLink $thePackage $theSrcDir $theSourceDirOther] return $aToolKits } @@ -2620,7 +2758,7 @@ proc OS:xcworkspace:toolkits { theModule } { set aBuff "" # Adding toolkits for module in workspace. - foreach aToolKit [osutils:tk:sort [${theModule}:toolkits]] { + foreach aToolKit [osutils:tk:sort [${theModule}:toolkits] "src" ""] { append aBuff " \n" append aBuff " \n" @@ -2629,7 +2767,7 @@ proc OS:xcworkspace:toolkits { theModule } { # Adding executables for module, assume one project per cxx file... foreach aUnit [OS:executable ${theModule}] { set aUnitLoc $aUnit - set src_files [_get_used_files $aUnit false] + set src_files [_get_used_files $aUnit "src" false] set aSrcFiles {} foreach s $src_files { regexp {source ([^\s]+)} $s dummy name @@ -2723,13 +2861,13 @@ proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection upvar $theDepsRefGuids aDepsRefGuids set aBuildFileSection "" - set aUsedLibs [wokUtils:LIST:Purge [osutils:tk:close $theToolKit]] - set aDepToolkits [lappend [wokUtils:LIST:Purge [osutils:tk:close $theToolKit]] $theToolKit] + set aUsedLibs [wokUtils:LIST:Purge [osutils:tk:close $theToolKit "src" ""]] + set aDepToolkits [lappend [wokUtils:LIST:Purge [osutils:tk:close $theToolKit "src" ""]] $theToolKit] if { "$theTargetType" == "executable" } { - set aFile [osutils:tk:cxxfiles $theToolKit mac] + set aFile [osutils:tk:cxxfiles $theToolKit mac "src"] set aProjName [file rootname [file tail $aFile]] - set aDepToolkits [LibToLinkX $theToolKit $aProjName] + set aDepToolkits [LibToLinkX $theToolKit $aProjName "src" ""] } set aLibExt "dylib" @@ -2740,7 +2878,7 @@ proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection } } - osutils:usedOsLibs $theToolKit $thePlatform aLibs aFrameworks + osutils:usedOsLibs $theToolKit $thePlatform aLibs aFrameworks "src" set aUsedLibs [concat $aUsedLibs $aLibs] set aUsedLibs [concat $aUsedLibs $aFrameworks] foreach tkx $aUsedLibs { @@ -2776,7 +2914,7 @@ proc osutils:xcdtk:sources {theToolKit theTargetType theSrcFileRefSection theGro upvar $theGuidsMap aGuidsMap upvar $theIncPaths anIncPaths - set listloc [osutils:tk:units $theToolKit] + set listloc [osutils:tk:units $theToolKit "src"] set resultloc [osutils:justunix $listloc] set aBuildFileSection "" set aPackages [lsort -nocase $resultloc] @@ -2793,7 +2931,7 @@ proc osutils:xcdtk:sources {theToolKit theTargetType theSrcFileRefSection theGro set aGuidsMap($aPackage) [OS:genGUID "xcd"] } - set aSrcFiles [osutils:tk:cxxfiles $xlo mac] + set aSrcFiles [osutils:tk:cxxfiles $xlo mac "src"] foreach aSrcFile [lsort $aSrcFiles] { set aFileExt "sourcecode.cpp.cpp" @@ -3432,7 +3570,7 @@ proc osutils:uwp:proj { isUWP theProjTmpl } { } # Report all files found in package directory but not listed in FILES -proc osutils:checksrcfiles { theUnit } { +proc osutils:checksrcfiles { theUnit theSrcDir} { global path set aCasRoot [file normalize ${path}] @@ -3441,7 +3579,7 @@ proc osutils:checksrcfiles { theUnit } { return } - set anUnitAbsPath [file normalize "${aCasRoot}/src/${theUnit}"] + set anUnitAbsPath [file normalize "${aCasRoot}/$theSrcDir/${theUnit}"] if {[file exists "${anUnitAbsPath}/FILES"]} { set aFilesFile [open "${anUnitAbsPath}/FILES" rb] @@ -3456,6 +3594,9 @@ proc osutils:checksrcfiles { theUnit } { if { "${aFile}" == "FILES" } { continue } + if { "${aFile}" == "icons" } { + continue + } if { [lsearch -exact ${aFilesFileList} ${aFile}] == -1 } { puts "Warning: file ${anUnitAbsPath}/${aFile} is not listed in ${anUnitAbsPath}/FILES!" } diff --git a/adm/templates/template.vc10 b/adm/templates/template.vc10 index d391c38006..a7a20639b1 100644 --- a/adm/templates/template.vc10 +++ b/adm/templates/template.vc10 @@ -159,7 +159,7 @@ _DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions) - __TKDEP__ + __TKDEP_DEBUG__ .\..\..\..\win32\__VCVER__\bind\__TKNAM__.dll true ..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) @@ -255,7 +255,7 @@ _DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions) - __TKDEP__ + __TKDEP_DEBUG__ .\..\..\..\win64\__VCVER__\bind\__TKNAM__.dll true ..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) diff --git a/adm/templates/template.vc10x b/adm/templates/template.vc10x index 3b2d845aa5..08dc4bb7a4 100644 --- a/adm/templates/template.vc10x +++ b/adm/templates/template.vc10x @@ -149,7 +149,7 @@ _DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions) - __TKDEP__ + __TKDEP_DEBUG__ true ..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories) true @@ -238,7 +238,7 @@ _DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions) - __TKDEP__ + __TKDEP_DEBUG__ true ..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories) true diff --git a/src/OS/ApplicationFramework.tcl b/src/OS/ApplicationFramework.tcl index 2d871417b0..a810dee908 100644 --- a/src/OS/ApplicationFramework.tcl +++ b/src/OS/ApplicationFramework.tcl @@ -58,10 +58,6 @@ proc ApplicationFramework:depends { } { ;# ;# Returns a list of exported features. -;# source : Source files -;# runtime: Shareables -;# wokadm : WOK admin files -;# api : Public include files ;# proc ApplicationFramework:Export { } { return [list source runtime wokadm api] diff --git a/src/OS/DataExchange.tcl b/src/OS/DataExchange.tcl index e72af9b7bd..25c823990c 100644 --- a/src/OS/DataExchange.tcl +++ b/src/OS/DataExchange.tcl @@ -56,10 +56,6 @@ proc DataExchange:depends { } { ;# ;# Returns a list of exported features. -;# source : Source files -;# runtime: Shareables -;# wokadm : WOK admin files -;# api : Public include files ;# proc DataExchange:Export { } { return [list source runtime wokadm api] diff --git a/src/OS/Draw.tcl b/src/OS/Draw.tcl index a8ac73222d..90dfd7d2d6 100644 --- a/src/OS/Draw.tcl +++ b/src/OS/Draw.tcl @@ -58,10 +58,6 @@ proc Draw:acdepends { } { ;# ;# Returns a list of exported features. -;# source : Source files -;# runtime: Shareables -;# wokadm : WOK admin files -;# api : Public include files ;# proc Draw:Export { } { return [list source runtime wokadm api] diff --git a/src/OS/FoundationClasses.tcl b/src/OS/FoundationClasses.tcl index b3083377fb..bf8b056888 100644 --- a/src/OS/FoundationClasses.tcl +++ b/src/OS/FoundationClasses.tcl @@ -52,10 +52,6 @@ proc FoundationClasses:depends { } { ;# ;# Returns a list of exported features. -;# source : Source files -;# runtime: Shareables -;# wokadm : WOK admin files -;# api : Public include files ;# proc FoundationClasses:Export { } { return [list source runtime wokadm api] diff --git a/src/OS/ModelingAlgorithms.tcl b/src/OS/ModelingAlgorithms.tcl index d406a24e94..a6d573ce27 100644 --- a/src/OS/ModelingAlgorithms.tcl +++ b/src/OS/ModelingAlgorithms.tcl @@ -50,10 +50,6 @@ proc ModelingAlgorithms:depends { } { ;# ;# Returns a list of exported features. -;# source : Source files -;# runtime: Shareables -;# wokadm : WOK admin files -;# api : Public include files ;# proc ModelingAlgorithms:Export { } { return [list source runtime wokadm api] diff --git a/src/OS/ModelingData.tcl b/src/OS/ModelingData.tcl index 69afbe8dc8..30b809dd40 100644 --- a/src/OS/ModelingData.tcl +++ b/src/OS/ModelingData.tcl @@ -42,10 +42,6 @@ proc ModelingData:depends { } { ;# ;# Returns a list of exported features. -;# source : Source files -;# runtime: Shareables -;# wokadm : WOK admin files -;# api : Public include files ;# proc ModelingData:Export { } { return [list source runtime wokadm api] diff --git a/src/OS/TApplicationFramework.tcl b/src/OS/TApplicationFramework.tcl new file mode 100644 index 0000000000..9e493c28a5 --- /dev/null +++ b/src/OS/TApplicationFramework.tcl @@ -0,0 +1,41 @@ +# Copyright (c) 2020 OPEN CASCADE SAS +# +# This file is part of Open CASCADE Technology software library. +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License version 2.1 as published +# by the Free Software Foundation, with special exception defined in the file +# OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +# distribution for complete text of the license and disclaimer of any warranty. +# +# Alternatively, this file may be used under the terms of Open CASCADE +# commercial license or contractual agreement. + +# List of toolkits +proc TApplicationFramework:toolkits { } { + return [list TKTreeModel TKTInspectorAPI TKDFBrowser] +} + +# List of non-toolkits (resource units, executables etc., with associated info) +proc TApplicationFramework:ressources { } { +} + +# Module name +proc TApplicationFramework:name { } { + return TApplicationFramework +} + +# And short alias +proc TApplicationFramework:alias { } { + return TApplicationFramework +} + +# Dependency on other products +proc TApplicationFramework:depends { } { + return [list ApplicationFramework FoundationClasses DataExchange TModelingData Visualization] +} + +# Returns a list of exported features. +proc TApplicationFramework:Export { } { + return [list source runtime wokadm api] +} diff --git a/src/OS/TModelingData.tcl b/src/OS/TModelingData.tcl new file mode 100644 index 0000000000..945d5a4e2f --- /dev/null +++ b/src/OS/TModelingData.tcl @@ -0,0 +1,41 @@ +# Copyright (c) 2020 OPEN CASCADE SAS +# +# This file is part of Open CASCADE Technology software library. +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License version 2.1 as published +# by the Free Software Foundation, with special exception defined in the file +# OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +# distribution for complete text of the license and disclaimer of any warranty. +# +# Alternatively, this file may be used under the terms of Open CASCADE +# commercial license or contractual agreement. + +# List of toolkits +proc TModelingData:toolkits { } { + return [list TKShapeView] +} + +# List of non-toolkits (resource units, executables etc., with associated info) +proc TModelingData:ressources { } { +} + +# Module name +proc TModelingData:name { } { + return TModelingData +} + +# And short alias +proc TModelingData:alias { } { + return TModelingData +} + +# Dependency on other products +proc TModelingData:depends { } { + return [list FoundationClasses ModelingData TVisualization] +} + +# Returns a list of exported features. +proc TModelingData:Export { } { + return [list source runtime wokadm api] +} diff --git a/src/OS/TTool.tcl b/src/OS/TTool.tcl new file mode 100644 index 0000000000..86bdae6d87 --- /dev/null +++ b/src/OS/TTool.tcl @@ -0,0 +1,44 @@ +# Copyright (c) 2020 OPEN CASCADE SAS +# +# This file is part of Open CASCADE Technology software library. +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License version 2.1 as published +# by the Free Software Foundation, with special exception defined in the file +# OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +# distribution for complete text of the license and disclaimer of any warranty. +# +# Alternatively, this file may be used under the terms of Open CASCADE +# commercial license or contractual agreement. + +# List of toolkits +proc TTool:toolkits { } { + return [list TKTInspector TKToolsDraw] +} + +# List of non-toolkits (resource units, executables etc., with associated info) +proc TTool:ressources { } { + return [list \ + [list both x TInspectorEXE {}] \ + ] +} + +# Module name +proc TTool:name { } { + return TTool +} + +# And short alias +proc TTool:alias { } { + return TTool +} + +# Dependency on other products +proc TTool:depends { } { + return [list FoundationClasses Draw TApplicationFramework] +} + +# Returns a list of exported features. +proc TTool:Export { } { + return [list source runtime wokadm api] +} diff --git a/src/OS/TVisualization.tcl b/src/OS/TVisualization.tcl new file mode 100644 index 0000000000..18d786f955 --- /dev/null +++ b/src/OS/TVisualization.tcl @@ -0,0 +1,41 @@ +# Copyright (c) 2020 OPEN CASCADE SAS +# +# This file is part of Open CASCADE Technology software library. +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License version 2.1 as published +# by the Free Software Foundation, with special exception defined in the file +# OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +# distribution for complete text of the license and disclaimer of any warranty. +# +# Alternatively, this file may be used under the terms of Open CASCADE +# commercial license or contractual agreement. + +# List of toolkits +proc TVisualization:toolkits { } { + return [list TKView TKVInspector] +} + +# List of non-toolkits (resource units, executables etc., with associated info) +proc TVisualization:ressources { } { +} + +# Module name +proc TVisualization:name { } { + return TVisualization +} + +# And short alias +proc TVisualization:alias { } { + return TVisualization +} + +# Dependency on other products +proc TVisualization:depends { } { + return [list FoundationClasses] +} + +# Returns a list of exported features. +proc TVisualization:Export { } { + return [list source runtime wokadm api] +} diff --git a/src/OS/Tools.tcl b/src/OS/Tools.tcl new file mode 100644 index 0000000000..45f4ba0538 --- /dev/null +++ b/src/OS/Tools.tcl @@ -0,0 +1,24 @@ +# Copyright (c) 2020 OPEN CASCADE SAS +# +# This file is part of Open CASCADE Technology software library. +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License version 2.1 as published +# by the Free Software Foundation, with special exception defined in the file +# OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +# distribution for complete text of the license and disclaimer of any warranty. +# +# Alternatively, this file may be used under the terms of Open CASCADE +# commercial license or contractual agreement. + +;# +;# Returns an ordered list of module names +;# +proc OS:Modules { {plat ""} } { + set ret [list TModelingData \ + TVisualization \ + TApplicationFramework \ + TTool \ + ] + return $ret +} diff --git a/src/OS/Visualization.tcl b/src/OS/Visualization.tcl index 71885b3ccf..3e563b30c5 100644 --- a/src/OS/Visualization.tcl +++ b/src/OS/Visualization.tcl @@ -70,10 +70,6 @@ proc Visualization:acdepends { } { ;# ;# Returns a list of exported features. -;# source : Source files -;# runtime: Shareables -;# wokadm : WOK admin files -;# api : Public include files ;# proc Visualization:Export { } { return [list source runtime wokadm api] diff --git a/tools/DFBrowser/DFBrowser.qrc b/tools/DFBrowser/DFBrowser.qrc index 9670e6ac89..e1f167f061 100644 --- a/tools/DFBrowser/DFBrowser.qrc +++ b/tools/DFBrowser/DFBrowser.qrc @@ -1,8 +1,14 @@ + icons/attribute.png + icons/attribute_40x40.png + icons/export_shape.png + icons/folder_export.png icons/item_type_folder.png icons/item_type_folder_40x40.png icons/level_change.png + icons/named_shape.png + icons/named_shape_40x40.png icons/search.png icons/search_cancel.png icons/treeline_backward.png diff --git a/tools/DFBrowserPane/icons/attribute.png b/tools/DFBrowser/icons/attribute.png similarity index 100% rename from tools/DFBrowserPane/icons/attribute.png rename to tools/DFBrowser/icons/attribute.png diff --git a/tools/DFBrowserPane/icons/attribute_40x40.png b/tools/DFBrowser/icons/attribute_40x40.png similarity index 100% rename from tools/DFBrowserPane/icons/attribute_40x40.png rename to tools/DFBrowser/icons/attribute_40x40.png diff --git a/tools/DFBrowserPane/icons/export_shape.png b/tools/DFBrowser/icons/export_shape.png similarity index 100% rename from tools/DFBrowserPane/icons/export_shape.png rename to tools/DFBrowser/icons/export_shape.png diff --git a/tools/DFBrowserPane/icons/folder_export.png b/tools/DFBrowser/icons/folder_export.png similarity index 100% rename from tools/DFBrowserPane/icons/folder_export.png rename to tools/DFBrowser/icons/folder_export.png diff --git a/tools/DFBrowserPane/icons/named_shape.png b/tools/DFBrowser/icons/named_shape.png similarity index 100% rename from tools/DFBrowserPane/icons/named_shape.png rename to tools/DFBrowser/icons/named_shape.png diff --git a/tools/DFBrowserPane/icons/named_shape_40x40.png b/tools/DFBrowser/icons/named_shape_40x40.png similarity index 100% rename from tools/DFBrowserPane/icons/named_shape_40x40.png rename to tools/DFBrowser/icons/named_shape_40x40.png diff --git a/tools/DFBrowserPane/DFBrowserPane.qrc b/tools/DFBrowserPane/DFBrowserPane.qrc deleted file mode 100644 index 16c14c514c..0000000000 --- a/tools/DFBrowserPane/DFBrowserPane.qrc +++ /dev/null @@ -1,13 +0,0 @@ - - - icons/attribute.png - icons/attribute_40x40.png - icons/export_shape.png - icons/folder_export.png - icons/label.png - icons/label_folder_16x16.png - icons/label_folder_40x40.png - icons/named_shape.png - icons/named_shape_40x40.png - - diff --git a/tools/DFBrowserPane/FILES b/tools/DFBrowserPane/FILES index de80d10eb0..1eac7a6433 100644 --- a/tools/DFBrowserPane/FILES +++ b/tools/DFBrowserPane/FILES @@ -1,4 +1,3 @@ -DFBrowserPane.qrc DFBrowserPane_AttributePane.cxx DFBrowserPane_AttributePane.hxx DFBrowserPane_AttributePaneAPI.hxx diff --git a/tools/DFBrowserPane/icons/imageres_4.ico b/tools/DFBrowserPane/icons/imageres_4.ico deleted file mode 100644 index 1c823b1e9e30916a6a087bf553b5fbbd11d841db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168098 zcmeI535-?M8OOi(W<@&-6$H^RuPy~siep_MrZOXuDyhZMwpLP%qsyZidq|IM5^_ndd` zS$_9B|8wq6l%V01P80j}H1-0bOAv8eyq*mV){eB2h--4u8-xPIoeed{9 zQmZd-&-FWN3FpT(PK#PIOVMs+X;(evKgWyTl%+dE!(JGmGv7K)o&U+urJKK|IXnBb zAK`%j2$Um%OeRx~%|e?%00aUONW`>wtxinE%bAXAH4=&17?uRecO|bT0RI@wuNL;_ z(fkPZ2m6bj0Qw*LpEm-~pXhsEEyh30KfQH7jQ=?Pi9vuc{(J0x=zr*c=zozDfc`*# zyb-|hN93K4GerOMW_^510>-}>46yL_$G4?;T4LG%ReV*+V+CR;zb2_%)bdt==*t(4 z_g;ah%hww3xdIWFpKZL?3Pf7IzVRL_5M}wfjrUf8D9cw$H2iZD0hAw|{2S0KLGX7b z0Q-aeMMVJp&rHC%_eDGZH<#`{4@Uow%KF7ouX(}#cP0S)gZ)KCz})+wf6l!R;}7&F zs@{k35Bg&!0R3?$0R4gfL`A^d`!N4;?tPg5K!2j@eWg18u~Lob;@taRbY)rP6DCQ)2Z6FA!0J?%?LwmpL%{01l)pIVdWU|5M2>eh#UOthFj_SDfRE!<1oSUQ zJhk8hKF$Q3e}(;kk23-1UtvGs<4nN$SJ)5uI1_OGwZ!eG#^qu2kjF=^PqT;0-^0`D zVe-#DlkD&~eDM7B4_w<95IFyA<(0D)wgm*v-*6Jd?kE!ZtDwNgAfvD!0}w+Hd<;Mg zLGUpEF$BTK0K^ak9|I6W5PS?k3_FM-JJP~4-HEbcAFI#D@s5ch}6eJbt+&#rgr*4uRJExL8S89kdG>uN740}gBk zQ7qy<Zzi~PLs1V3pxuou{inE?6+`iI#n>|Q7&tNpL7oByOS79%(7qeB^$G~1-FZR}9{ss0@YWAX^fcacE zG!?<3AuxEYReN2Y65(;ZS8YZYUq;Dbor-}&n{HpU=+>Kb>vg*IDy%C;Tu=_#PUx}U z>C%h)9NO8X*=6r@Xy$-i#0emI5(w{OlT_e?K*bPXxu}@7x;50##MLSHU z+Z*now-16}j^(HU*pI!z7=D5MzpJ` zZ9h0l8+RbKH>jLt5d0(o*iSA2^dHL(V~CX2WB&dh_!&@H24mzmn6;<1TRD6EmQ1SU;!*cWO_Nx{z&J(w?>tvTbPdtPJauG*M@`y?I zJe>G`$H}iAR=(YVXW=9)_#jYz1XwDHv{9}@y`kQTdgnz7o!kuRb9sSJE)Qb}e2heL z!~Xcx)fjJzckGX~;=cFXTgn~NtKyNffrs=tO+b3x{?)`-YNznQ2Yhnu!F9kkpIOmw zU$}Mka7o^WGwAmVE9dD^G5e&|kGj-)Qd{x*cAUj=s(g2gJWg$|)!Bp4WvR{DajG~z zo$`J^zA>r8gjEnIR|2ser#g&UIV=-(c8gRdH968rPT(R*+A~Y^R!(lpQr7L z-%>=rozPTYAhD1JzN9) zo_{|27w1^;Px3y^o{_isUD@T*c<{Sv|3%Bkx`XL@klYjgePzDD|M*qiZ2?>hZ_^aS z$#TU!WhA>+c5dT`gz1WnS#YxK{Z*KIP&QwFK#}k zb9N#xq5sY7Qtae7plCmbmBla)h;Q16bFboiHaMP&3ljGp<{4HG4zmpFjP2qQN!8XXxNlD4>zB< zt~qtq{3Xk49-wd4bTl+{e`CZs=Zzda^qVs`99rA+h!&L&8T|#n9LGte(KPu_udv!D{9{D-TGqN3AFg|OS3zdZdo>z zZr(P#^C_|Nmj~-s*PeOyz%hyRvX8c$vFfY6Z`4!&*3pmOe%X?)AJC>J=HAk<^XmT7 zlJssLZ~QZ{P4}OUol&*=ST3XYuG`ks4s<@C#6I@%-C~Pr2fr_JJ3WzZ#h(WPtFnD) z{?C86|G=@&9yx**>mPemd)&3_C!{aA=nn@G52`U)=C5tZ)zg&_LFmlU)0?G=Je`2udE+;)25N19=&Kt^TqVeztbD$5B=5R*ZzFR z;&FSv_%gHguS=i5>VJRhc}RSsaQQFZKdbZkhi|y&o;{~;xZ=acnY#`Qz5MU*E@}->T2LKU`T= zz30`@a^s<1uxCuRQvMO zBpt;2S5|FYJ^jl=^<7UN_w?>7+P-f)( z9>)7PfCU6V00ck)1V8`;K)@e?9zFtxi{|Dzf8^EF%%0B`SF}^?F9^FRwgG>&|3|?x zNFLx1{sq=Q=uctCAMgkNN}dD3{$c;H{~(jc2)4oe6Z22ZKXLvc0x1cU1@s5{1O0*i z1QL%3HiG^@f1p3mp9rKRP!`Z1=nwP<`V&YzBG?G}1O0*iKz|~Tl0aENf1p3mALvgY z@rYm}=nwP<`UCxmKuQ8-0sVpgK!2b=fy5(%ji5i!ALtMCCju!6lm+w$`UCx`SpAv4 z`D@kwdos%c=||X&Dp-H`U5%2x^z*+DDv-ah`Qd8^By*#m-+fSF{4H$W$X|r>w+||W zzl+TmZXZ+te~&g_n0-(I{FUb$xt)Rhu=5+Y?ZMx9zqs)W`#bo9f6T|ffpkaeRapCW z+aC50`-lCP_4yy@PZ7M|LF&0*-%Y>6{to?z{zLzv|8}|*R$tt|F*+0#$SxT7=L5a-eP#KBJ>~n5BNMa5C8!X009sH0T2KIK_C;=vPa`t#TjCqsGK+?bo*3TjNHG}rCV>) zt+(jbo3O5QjWXlFW)Q_Pmf3W$Th1;)DgIB?J4^BK4+KB}1V8`;@<*Ut&VyRDBOesG z+WljrzW+r}On4jl+N6I0sA2vt} z0w4eaAOHeB2@HN~ME}hqkL$f^VO<$ck9GcPPhmK;>B?=vZc?SXT_UXgFj$ zp~rrwOE13j)6Ooa#_KR?M21VL_Wvu7Ax%y$n0PQcz`Jd~4m$rfZAC3U*ANF5_ z=l{_EJ&b)q1H&%p|LFhd|3zm5&_C#(CmVqNha-UTujsTdd#+#1Z`@qCy_F(B*${d1pV$g#E<{jmEV+k*fIlr4emD+BCSl$JMX z14+5~by|C>G(RB+%JTE=_Nx{z-V-4{u-wT`z9%Am5(lt=Kt2c*!<;EhI}1ENR*r*E z|AHN#f`4J34+Vel5A*ym><9J(`w20D!2BoF+ynXp{ek|Jxc>BH#3__uOM&!r*7m;4 z$*&%k*EV*u4h3sN0qSq_+)uDJ6rlcf&+%zSF4w~C_H9H3sJ}(M2ixMe0jR(4`2+at zj12Yz`_XHu&NMu&!hT>supi$x5c-%!&s@LmsnhBbq5t~ccbGrGe$am{kH7riFR9nA zVp!LiHda9(Dgx^5Lh?H_gML33klhy9cOW$mT(<{H>LPLf8S@6 z;^AN11oEltLE4h1Ij}NsME!ivx8+<5{K9=l0sO$vQhuO+iYB3dpnsr$*xNuc_m5ET zFO6CMro7*uFzA>^Wr|1r% zu8@A0R(_l2w-k{tIZ0n!V@k1WXD6>SrJFf`#hE}H`XKW3x^P;jd03F&6wO2V-Uxs{ z>@VOP#;$Lo|3Uw}i4UiWSbuzi*Fk(bL9|W`Id8iw+f*A$n+olEsi%~f6fHZ z|0=%!S?UJcMI`ag)>m=AD(4IM-yWj20Ir3%X$sRfk4^6SYoTbiIxd(qwh`bHG_<>;GLhCb_u{0tCFfM3o&HJ2fS`!P8I2lzF)}dSX-MOzULsuE}O>K^yzx|{U*i^xR|ll zRwMuJj5XZKSaY+Hzk#s{4=^@voDm+(*gGp3Yl3pf|DHO=u6~}e(WCY7vjZ7B_%+5x zj?}|-5dQ2f#)b{k!`~mkSZ|JLm%^IZA_&iZj~V(lvF<9yc5LDLHnDqt%h>jRaebTE z`*Rq({R+j7d8sbE^z}o7lDW zjD7F2Dns8U_6X?v(KS_uzEHk~vAb>nexPv%wFWG)-rCiwd)j}9$29GFL}j&)s%+R} zD%%CoU?uR>#g5(hbgh06>psH%Q zs!nzK>2VL4Fp4e z(LgZe7YPJWelbAEmtS}gZ1M{Xf`j~mg5WH_a3HwJFBAwK@(Tijr~Cqd;3uDhfHOpt z%WZb|myaMsk*t@EB!4K$kBR`{?~H(y{geGgH9x-NX=?<+AI4YTD>D3qzs>UW2(mw4 zI51l`nxnvhw{ANLaov0!hn91-yD;;_`jgfh0dF0xr|P8BOg^_V12B zRO@qJe{%yQ`*TM>$@OQY;6I30)WuKQ{uCbt5|{6zK=Sgv6)1pwPX!7g-%Ejl$oEj7 zF!J3MD3JV+`#{m>KhD8r_(^>IOY(ID2!Ce;sQ)Fq{-XXz{SOgv?tSo+sD$@l$o|Ow z$o{DR(fH$xK=H@lAs!15K6*#@ookQtk5cQdL3FvCgPVLdz)J&OI=b&FpLuBzT`uR~ zA>Ts-UOKw(Dc@Ct=yEv+ANejC@Y2zJU-^z2M3>7sNXU24fR~Q$OUbus5M3_kASvIX z0WTfhmzJNWL3FvCLjd`L2E251KahM=gXnTOhk)`84S4D3eqi~!2GIo@974#CRfACS zW7L4lhj#!J_exvDrz~N`5@zlB5zJD6Ra??61sH40%fKuJ02oVpegR0Y6*C}^)^J*g zz;v+yhQ&Hz*u0>eNh3kwio+u#8UVC^))LNH!kw0ImnGb73HMsUc>tr`mUDW$MgO!V z+-M2o*df*zJE|DQu|y1G#}&iWLCYVHjM$*izBxQ?BWtHX4%psNdJAfiY5k3MK4kY2@0E!Uh_Dc7-`mf?5AU6Ik0^;NEEFebyjsoK3 z?<62r{_?vJg5?Dv?Y)@v7x5!}L^SL);bX@{j3InPH0(6tW5+~{A$&wM?6dp zVD_R?F?Rm&3z<3x2~ynbnH>1zIb*v7dr_$vNB&L{q`28Lx$w73uosnzapiB7AjQp| z$%B8s1bb1b7*GD91SxLzOg{YkB-o2e#rX2)5~R4K4xWcMFH;;fQlP=LEF*g8-n-9|PbqXr2k_ zMxy}I`jt|NMkL&E=sPwF5F4mzaA$Y`;Q6P=yl&6Ec z1DttIc~1!Ni_R%?B*-TODiQ%0Ix4c>C12^dPt3-B%s1|1y|{rL=P_PmLp-))yXFRa zOiG&kpx$vPDe{X0$$Wm%m9+7TsH6iwT}jznLdyu?%rC$R0OAMu+b`MXus$=R_Rz5; z{9F*A{$}rN5aWWDJ-XcRb2%huub4}WrM_;5;#^AGqb>a04#C+Ay2M!dxg2_PDQ%Co z@pIPDUeG1R&JQ%So1jZ+d$a>Tr&DtFf-W({4|aK|JzT8A9v!#6)HpDV(jJNf!$|xb z7)Ik~XBd&6jbT)N5{pW^VR*$@+L-i{UvFrz5`NYZ+RNJPX@p;8;b%V;W48&f7>m6) zoKf*AZBMiEx%F(N|J zagJW4?P*^8bdL5iUNPSMkYljRk6%!Z8b5q~s$b%33FYV=yeK?I>1yWzpv@B%K$|Bj zfHqH5Al+ybK$>Sln!g=Uqm4`&ZJhYfXifKOlxv_;DKtNGg7xJO!I6eP6BGVGT#L^N z@d?rj>R|9kWlXwVpwj}~*w5&kjx)o0aic_f|j>FC8P2_2=t9!I%VmDKBev7tqWS-`pSf$ z<*mQ>4_w~DAb9zF1|iCOje)-SV+OGeNq*iOMEFS{P*V1j|5QXm`+WPiJOv3}p6{*e zW)!Bp$RS+$J`Q2aa}MFl>l~t#M-Eb#Xnz)3iUXE0HrrjjPmGjK?ljN? zeqY&Xe59z;_+6#(lQ{kpxT5*SPAdOxCf|PLJ0L;*c4OxxZTO9bpDMVY(ON#G<_ur2 zXv(M{JaN%7fUji$U&{c#wx68Bed1B zU&^Qvb&BHu0YhaJTtf#cwc@Ew2liUNQKNPnR4pv*-17m`29WP?8D$K9D1DSeE^{`g zd=_*#ej_yKeDO;ueHksB^dN7;RJEDWGapNtP2!!8m3O|r-D&T7D9Ui&B)ml&ae+w6 z=Zp-;Wza|+LFZg1eymm*sFn14{Nwky$M5kD?p=C4X)*RT z9iFV{H8b}3oOXXd#+IXR;Kj5_ z#IlIMG^fcW)_8q-&zl^OzcH=b;@RLTJojLa*ENk4uS2QTIFFA$5j(_d6Ig8V_=%!? zx%vbNlb>U}!<2@|X_w_OBJL-!4sch1%b zksul8Gd_>q$me&|$YCC9SlP>PE)$=LO?t zL%?+&t7))T25y@NS!0#qg9j+$!*x?#XEzbqSwQY>+r z%Hy}~&2i0Rs(C6spz*A6xL zYXh9P1V@45avj#=48~ms<1V}#3m#ZmT^8c9z{cuw5Z49nm(x!;X6T?XsOZos$4)v) zA5>w)#p&^kAKx<@y!!dao^}BY_^Z$<&zyhHxuC-2DU*);_C>dSv_3uW+oz6xdgJ+H z|LfRem%e|;l+9l_cj&>Z2Hp0%bBCU$y!dZ-Zy)iUBahm1|KlcIb>+D~Jn71t+YaxY z`1v~*ym)EH;zI_!cj(rwd+k|2Ve)Q|&b@uc>nG0GKJ)FHnjc(!-rR;AJ!|g1xGr^0 z*Qb-%?q_#>dMukgyX(`bZ1&k**XQopUcGkq@_U!9fB3Q`f0_8xbGjehbkk3N{_)X^ zE_`zCB~>>+J9Cfr3%eg&dgi6G9^G{6@#(?;+K<&9a>=(2U?-m2_1DYU;lJ6q?0~Ay z)~nZysm~rUq~oyNGVs5qYW@`)7foUy&;_aL6+%So?9lq%L zmB+ERLl^xTz5N#5fZoVO3(>1thG}$J2lU8kk( zah;Y{JMHON`?Ht6yKLL3_3Y5sf80HzioF~MIQQSJyfJsnwCB@}uN*cwyLem2Om*ju z>rOfG^6yNmn*Vm!_!G}ue$k*wrytH1Jfp5&etdesyI&c@HeK_?LA%5M-h)QK|CZHz z!~e@xYw@eK_|+Ky)u|Z&qp2AGz*LOiHdTxN!dQ%-wyi$*;mYyXH$HvH=9Kbl@IIPV zJtjTmsg?D0rQhy$Ys|i~wB_N;lrt8r-KiWnp|SU`e@?%%_T>#*zndPgv_5;=(w4O^ z@0zvc{m+*_w4?LXE$gzU*0c?rb;hoq#vSAT^1)53&%1s6_Jbdp!tVa~{vWDO{N=?Z zAN+Imd5@p|!Fl&DWMiLwXwJD+ogmk#n zw~U8OKRN$nEPcc3J2$i~zjyuib!%op@Wv@=<-8=%*4FtyQ?uIM`o3B3* z#K1_LcV#E_Di`fJ`(I!C){KWRVantaCM`Xx?HBeT8CKFTvTH-~s+O~!hk(vHq-}=RuPTPFXjW>>}KXTNh z2S+OVOrG+ywR>-Up?kyUOaAo6ufBEhhJXK$Tc&;R+9NN2_mu@x=KS=;S04V`Nf&>x zebHSFCkH& zPL?PTy5`)@`q~v@ZR0%QaV@-*MQ72j6w;mbad%|ML!Z^^$w9UVqBwf3Dj# ze&(?|e|yTSYo2)uG|K(*?cSLerY7~?c*@R`HvQ+zhmK;)Fa7!J)wze)&G-tNw_vZ` zhi2Y>=Z}-Cat|-x@_l9g+qgktF6KZwvms9jH%;ASFn9;LqEF z`b2T@=j}j!B7t_0uzwMMPE((VsVzd{&)b3eM8tN80e{{W)F(o;MU43KcA!2HpdAvz zpSK0|37@t|7=PXl4t;{(YnP|*1FLj$0rBT;VeB=PC+>ikroS}6J{bxBaCYDWt8_Bq zPx$jbT~5BVf%{}6`zQM^C%fmm`k1wJGTA@bKewrJ@}&*jCnMQE*?&3NJ=fL8tfiC5 z{>lEiO_h@`ZQwo`$^Oay%gOG!u0CcholN#m_RnpqoP22m_sK~1PxfCC2$ zvVXFFZd2vtOB=XPMzVjh|8lZ>uB(q(OD6+A_|%wo_Me|mNZP0K4?^p#P&?pNXa#Kp z!e782$pW_l;cvmez->VIJK$fyHX!_6@Gnps5dI$c3vH0pI*9Q1!C!BK#MY#QKj9zQ z1|%SilqJD^iO6;5_n^h}BY`VXnDF=B7m|Q5QWnCW@Gs{0;wL+jaZ3~?`zQPNv%zAf zOPFw^EM)&=|HZU#f7u<8?Axy}*}u2_>+O?V8xa07_+y@A+JNwv#Xp%gApC>iAAcJV z{z37Nw+#sYF!;kqjbge8f5IPZpzQXlV={lNH$8t0(f)*gar+G6Pxu?}l6D)v%5F># zG7pjcll_zZNACr+{t4HQq9d+AK_2<)A}cRFQEB1TtAAA zyv~8}C;a1@6AQ_Q>_42{#??lIf4{+h;;TK{_wd~IF~i2w{-;DI!S8UcP&eRj z-QLHjyHTL41)7O;U#4zWYbJEFzDz);c>>U8CZH7|-pmB?EM+7htzRjXXhgythh76I z4Ly<0@BpBi73iEmcNT*NQ!wR%ftfUzg-L@Q_0jDDohDjqv$W7Lpr7$}#O{>k0iaC~ zfi`;*&}IRoc>$z(0i<~WqIAOr{jLLeCg zR;XKHy}uA#Q!)bjIafHF(Xg_YpDS1iIJWik8pm5bzz@$VoV;O|df*E^97nQAS(FX@ z_<4^xn|G=$YrDxNL*mDAB%723&|-fgew-$o^uSUAKaL~Wqyvrt@#9#MO&VB+#E;`x z@irL)ejLk+w8Mp>lESdx%6-}y-j!-~K!K@2Mfzl1QXDEtHrz2<}WLh~>6V10RmA+73d z!8FLrssB^|kHrRP{G;)&=r-Us&b!6a_#fN*af{yexNZn~ z#rS^PvaCPi6%z(!TmP6aDC_zQ7|7o5So4*A{dEjNuZ5`oWw`#qHW#l5>j7$iYX73! zfN0BMXtMwE9{*u27pB?GGUeX>cn=T-gZ@$f@EG);`iH}yf7L(C{cyRDfBDbP&4Epl zp!TQs5BWTx=xaZ)U7HS)W^ZOA`zQM+`wwLUw!Y`o9}694c5F$4`hTdl$GuQ$e~0;} z(DrVXCu#O(HnM-UU%d~;Y*r-vNh;tiJ_^lEZ-OXZZZ>9B%$LBcZchCpwKcZ*&@O-RLx4%hAaiwG5q1PkeM_4pyRRuT<_6TC*QFq9QPSUaznt)g)hO7mrz86z z`|-08uXM5>vL7$|@Jo}lpVQvm<%%<(Z>_%PxaX&rY`UEO9kq|Cfq&;#GWug3L;Oao zr1Tf+V6_vsaLMVf*Fm};kp4bvAME2nFDT_?yHI;6WnY3h&n zIC6C;UH#?8BGTXcepa{VaCu}p0pTAGTbXtt{PWfp1zA6c?Lzny{-Qkur6ui0_FQ9$ z+Q0PoA4^hy-bNDVD@$5`iF%ZU{vP!xEBzhnQI`5!>QT@-aM|GNr@!p}CM|)n9QPZM zfUx$hC-AkB=%@8~v|7hNfUaZ^(9bA!K!3yIaiw>`T4>a&UViVh0rZ>?Zdl1E3i{#x zBR(fN@P!@~pEnp|*L~ol85j35^b_|;C%@UPj(s{0(}kdGQ&ALk(2wid_TDb-H%Uc3 zgXW*6kI>-%mL0A6h%KlM{Z|se$n*Pbu{|{>1VEkwOc=g$M=$$OQ?N4P%IXHE7Ud6 zF8=qA#nX?^(HRf)a2za7{{^|GU3)1=`t{)?VkXjrpFc(-URIj$t7!cEo)Mbkl+|wH z3VYk1?=!%n>c@5Wc*a)}`g!PCQu;aQS(5r$^h{JoLl!=L!i6>WpE1H&?x%r(^ejG~ zLSHd_pc^q9v!65gbs9cCk3uW35AD;{rT;4hmvR2(_OyrK6aw=Q7>bkTC_QlPF%jOgKIw^ z`5|pyv_Uuf-N@ zUcTENRe|d7x(8Jd`P?oX_LvGP-$9R}$hYVbn+^tF*fr5E++TSTTs933-YS@7Eam5N zkO%fdL{|&pYCi`@Vyj^Qt_C61xKA+}Tr)VnPtjHnfnr>JXGL2R5f5XZ<*a80+OsJ( zS;pLj>*(e+d1p0Of}FOQ%Uf4=?=W%tD2yImacak~eL z34hmntXTMCeO&ILV&kvNu&t3QlE2$J-k~3d!bcxR?Dq=s^0(g$5dZvf!(p7Tu2Cbj zuM_^ZHE68-d3}U6W+MD8aze`hKCm=n3&C9uF4GPUeoW-%vXGWDT{X~(tLuWaUU0Y$ z8wn15z7D%_AOs3=#r^CB`mgXTc*C)a#E)ZXX_wIYl_Ec90%}uV_^Gp#t-d! zCEA@Z9?JIOd0_&eZc|P|_;b)g`&b6V+b1;mxyA%&7gD5TpcLlf%9FVfQEW~9M JXV(ew{|~C0W1#>5 diff --git a/tools/DFBrowserPane/icons/label.png b/tools/DFBrowserPane/icons/label.png deleted file mode 100644 index 863d663206484e134e6d18906cd786dd327bc6d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP}Mt6 z7sn6_|JF&}g3Sgz&XTQy5n9R{dZvHk=sCc#QaAdiz>cEj$LwwAY>QsI^`zYY4Fa5x zGoP)r^khD}s%!FB^PiX5DuULkH+^0?=jN;0`_6$rU1~??y$TFV>HNkexbysV6CNKzHfADMZp&R%4_?cCBKdk$9cJ`6FW2_BM zd}p5R6a4+W(uup_7gJ^K{qh-x=Ckg7VX2JyF#m*IbG;JBhOqUw`KRUd{F*-Vc_7f| N44$rjF6*2UngHwElmGw# diff --git a/tools/DFBrowserPane/icons/label_folder_16x16.png b/tools/DFBrowserPane/icons/label_folder_16x16.png deleted file mode 100644 index 02f9f2daa62c40ecda1811f2ddfcf7752e6c0485..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK`&1i#}EtuaMNS%G}c0*}aI1_r*vAk26?e?^&nzrJx ziq`_hOWi9QFVdQ&MBb@07{CW-v9sr diff --git a/tools/DFBrowserPane/icons/label_folder_expand_16x16.png b/tools/DFBrowserPane/icons/label_folder_expand_16x16.png deleted file mode 100644 index da0860c5efcc1e39d9d9490cce7d33b338d8da7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!D*f@jv*HQ$qwxQ%Z*eRKGrJy^XG8h>c9}d zu&9vVI_&5TgAi?&29|$uX8-@cPPKvy)a^aVoLthn10vlvhw<~mC`ASpk1oc5Tmc4= z8T?&#UOYek{|;11WjkQPzlL%Dd-nhTtKEcGvz72%H5AV6akq^nKa(Rm*`cWbkzLb6Mw<&;$TQt5g^O diff --git a/tools/DFBrowserPane/icons/label_folder_expand_20x20.png b/tools/DFBrowserPane/icons/label_folder_expand_20x20.png deleted file mode 100644 index 1377b9d9b6152d331adc198404afad1ca37a0a64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}c0*}aI1_r*vAk26?e?mvsec>?$29FQ#CC~of|DOH-|F3HNtJP{GvUr#pSRC078th_o zf^ghRKbLh*2~7avR%dMh diff --git a/tools/DFBrowserPane/icons/label_folder_expand_40x40.png b/tools/DFBrowserPane/icons/label_folder_expand_40x40.png deleted file mode 100644 index e1f2bff8953d9e83cc572eb6b1d5d24820f26fc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 601 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4evZ%977`9-_Ef0at;(}iBDHID-+vRR<`cI zxkK0V=FZ*0QvN__6HB(EhhhY$SXh%n1V>ZC{Qb{oTKMxF-&q;xFT~2ePpkNOor-H* zP_6pc%BzNQJymfZR;@qEx34>P&54UX6;E?EGRr3|zCCx>{~8T<CZpzdt>V4@4Uf*usH0jfkk31EBzeH^8e(nHt$79KWg)-W{PuTj| zgH8z_H(t=zCz>{m8K`g7ivPvSJl@*!d(P=S{F|;HgKuPsc1zX5P zN5{@7Bq +#include #include #include + #include #include @@ -37,16 +39,59 @@ TInspector_Communicator::TInspector_Communicator() static int argc = 1; static char* argv[] = { (char*)"", 0 }; #if QT_VERSION > 0x050000 - OSD_Environment anEnvironment ("QTDIR"); - TCollection_AsciiString aPlugindsDirName = anEnvironment.Value(); - aPlugindsDirName += "/plugins"; - QApplication::addLibraryPath (aPlugindsDirName.ToCString()); + TCollection_AsciiString aPlugindsDirName; + if (TInspector_Communicator::PluginsDir (aPlugindsDirName)) + QApplication::addLibraryPath (aPlugindsDirName.ToCString()); #endif new QApplication (argc, argv); } myWindow = new TInspector_Window(); } +// ======================================================================= +// function : PluginsDir +// purpose : +// ======================================================================= +Standard_Boolean TInspector_Communicator::PluginsDir (TCollection_AsciiString& thePlugindsDirName) +{ + OSD_Environment anEnvironment ("QTDIR"); + TCollection_AsciiString aQtDirValue = anEnvironment.Value(); + if (!aQtDirValue.IsEmpty()) + { + thePlugindsDirName = aQtDirValue + "/plugins"; + return Standard_True; + } + anEnvironment = OSD_Environment ("PATH"); + TCollection_AsciiString aPathValue = anEnvironment.Value(); + TCollection_AsciiString aPathSep = +#ifdef _WIN32 + ';'; +#else + ':'; +#endif + for (int i = 1; !aPathValue.IsEmpty(); i++) + { + Standard_Integer aSepIndex = aPathValue.FirstLocationInSet (aPathSep, 1, aPathValue.Length()); + if (aSepIndex <= 1) + break; + + TCollection_AsciiString aCurPath = aPathValue.SubString (1, aSepIndex - 1); + aPathValue = aSepIndex < aPathValue.Length() ? aPathValue.SubString (aSepIndex + 1, aPathValue.Length()) : ""; + if (aCurPath.IsEmpty()) + continue; + + aCurPath += "/../plugins"; + OSD_Path aPath (aCurPath); + OSD_Directory aCurDir (aPath); + if (aCurDir.Exists()) + { + thePlugindsDirName = aCurPath; + return Standard_True; + } + } + return Standard_False; +} + // ======================================================================= // function : SetVisible // purpose : diff --git a/tools/TInspector/TInspector_Communicator.hxx b/tools/TInspector/TInspector_Communicator.hxx index f2d8633878..01d368b2dc 100644 --- a/tools/TInspector/TInspector_Communicator.hxx +++ b/tools/TInspector/TInspector_Communicator.hxx @@ -40,6 +40,9 @@ public: //! Destructor virtual ~TInspector_Communicator() {} + //! Returns directory of Qt plugins. Firstly it founds it in QTDIR, else if not defined in PATH + Standard_EXPORT static Standard_Boolean PluginsDir (TCollection_AsciiString& thePlugindsDirName); + //! Registers plugin into TInspector window //! \param thePluginName a name of the plugin void RegisterPlugin (const TCollection_AsciiString& thePluginName) { myWindow->RegisterPlugin (thePluginName); } diff --git a/tools/TInspectorEXE/TInspectorEXE.cxx b/tools/TInspectorEXE/TInspectorEXE.cxx index 73ab696359..b22e57eb81 100644 --- a/tools/TInspectorEXE/TInspectorEXE.cxx +++ b/tools/TInspectorEXE/TInspectorEXE.cxx @@ -87,9 +87,9 @@ void setPluginSampleDirectory (const TCollection_AsciiString& theName, TInspecto int main (int argc, char** argv) { #if QT_VERSION > 0x050000 - TCollection_AsciiString aPlugindsDirName = OSD_Environment ("QTDIR").Value(); - if (!aPlugindsDirName.IsEmpty()) - QApplication::addLibraryPath (QString (aPlugindsDirName.ToCString()) + "/plugins"); + TCollection_AsciiString aPlugindsDirName; + if (TInspector_Communicator::PluginsDir (aPlugindsDirName)) + QApplication::addLibraryPath (aPlugindsDirName.ToCString()); #endif QApplication anApp (argc, argv); diff --git a/tools/TKVInspector/EXTERNLIB b/tools/TKVInspector/EXTERNLIB index a54f90d251..8b42f7d545 100644 --- a/tools/TKVInspector/EXTERNLIB +++ b/tools/TKVInspector/EXTERNLIB @@ -6,6 +6,7 @@ TKMath TKV3d TKView TKService +TKTopAlgo TKTreeModel TKBO CSF_QT \ No newline at end of file diff --git a/tools/TKView/EXTERNLIB b/tools/TKView/EXTERNLIB index 72cf33304f..8cd89c728d 100644 --- a/tools/TKView/EXTERNLIB +++ b/tools/TKView/EXTERNLIB @@ -1,3 +1,4 @@ +TKBRep TKG3d TKernel TKMath