OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0027176: Configuration, CMake - INSTALL_DIR is a common prefix for all other install variables

Browse Source 
Possibility to customize layout of installation of OCCT is introduced by:
- variable INSTALL_DIR_LAYOUT - select one of the two predefined layouts: either Windows (classic OCCT layout) or Unix (Linux standard)
- variables INSTALL_DIR_* (BIN, LIB, INCLUDE, RESOURCE, DOC, TESTS, SCRIPT, SAMPLES, DATA) - specify locations of relevant components
- variable INSTALL_DIR_WITH_VERSION (bool) - specifies whether full version of OCCT should be used in paths in Unix layout

Files LICENSE_LGPL_21.txt and OCCT_LGPL_EXCEPTION.txt are always installed.

Environment is extended to support non-default layouts.
For that, environment variables "CSF_OCCT*Path" are defined, corresponding to CMake variables INSTALL_DIR_* described above.
Visual Studio environment, DRAW, tests, samples are amended to use these variables instead of (or as alternative to) CASROOT.

Settings of Products-specific vars are removed from environment scripts.

File genconf.bat was corrected to avoid error message for the case when path to TCL contains spaces.

Product name in rc files changed to "Open CASCADE Technology".
This commit is contained in:
ski
2016-03-18 08:25:53 +03:00
committed by abv
parent cb492860f1
commit 4b3541c68b
154 changed files with 1372 additions and 1310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/DrawResources/DrawDefault
View File

@@ -59,33 +59,30 @@ if { [file isdirectory $dir] } {
}
# set default testing environment
if {[array names ::env OCCT_SHARE_PATH] != "" && "$::env(OCCT_SHARE_PATH)" != ""} {
if {[file isdirectory $env(OCCT_SHARE_PATH)/tests]} {
if { ! [info exists env(CSF_TestScriptsPath)] } {
set env(CSF_TestScriptsPath) $env(OCCT_SHARE_PATH)/tests
} else {
set env(CSF_TestScriptsPath) $env(CSF_TestScriptsPath)[_path_separator]$env(OCCT_SHARE_PATH)/tests
}
}
if {[file isdirectory $env(OCCT_SHARE_PATH)/data]} {
if { ! [info exists env(CSF_TestDataPath)] } {
set env(CSF_TestDataPath) $env(OCCT_SHARE_PATH)/data
} else {
set env(CSF_TestDataPath) $env(CSF_TestDataPath)[_path_separator]$env(OCCT_SHARE_PATH)/data
}
}
}
if { [info exists env(CASROOT)] && [file isdirectory $env(CASROOT)/tests] } {
if {[info exists ::env(CSF_OCCTTestsPath)] && [file isdirectory $env(CSF_OCCTTestsPath)]} {
if { ! [info exists env(CSF_TestScriptsPath)] } {
set env(CSF_TestScriptsPath) $env(CASROOT)/tests
set env(CSF_TestScriptsPath) $env(CSF_OCCTTestsPath)
} else {
set env(CSF_TestScriptsPath) $env(CSF_TestScriptsPath)[_path_separator]$env(CASROOT)/tests
set env(CSF_TestScriptsPath) $env(CSF_TestScriptsPath)[_path_separator]$env(CSF_OCCTTestsPath)
}
} elseif { [info exists env(CASROOT)] && [file isdirectory $env(CASROOT)/tests] } {
if { ! [info exists env(CSF_TestScriptsPath)] } {
set env(CSF_TestScriptsPath) $env(CASROOT)/tests
} else {
set env(CSF_TestScriptsPath) $env(CSF_TestScriptsPath)[_path_separator]$env(CASROOT)/tests
}
}
if {[info exists ::env(CSF_OCCTDataPath)] && [file isdirectory $env(CSF_OCCTDataPath)]} {
if { ! [info exists env(CSF_TestDataPath)] } {
set env(CSF_TestDataPath) $env(CASROOT)/data
set env(CSF_TestDataPath) $env(CSF_OCCTDataPath)
} else {
set env(CSF_TestDataPath) $env(CSF_TestDataPath)[_path_separator]$env(CASROOT)/data
set env(CSF_TestDataPath) $env(CSF_TestDataPath)[_path_separator]$env(CSF_OCCTDataPath)
}
} elseif { [info exists env(CASROOT)] && [file isdirectory $env(CASROOT)/tests] } {
if { ! [info exists env(CSF_TestDataPath)] } {
set env(CSF_TestDataPath) $env(CASROOT)/data
} else {
set env(CSF_TestDataPath) $env(CSF_TestDataPath)[_path_separator]$env(CASROOT)/data
}
}

36
src/DrawResources/DrawTK.tcl
View File

@@ -29,9 +29,11 @@ if { [info exists tk_library] } {
#fills menu "Load" with submenus
proc fillloadmenu {} {
set drawplugpath "$::env(CASROOT)/src/DrawResources/DrawPlugin"
if {[array names ::env OCCT_RESOURCE_PATH] != "" && "$::env(OCCT_RESOURCE_PATH)" != "" && [file exists $::env(OCCT_RESOURCE_PATH)/DrawResources/DrawPlugin]} {
set drawplugpath "$::env(OCCT_RESOURCE_PATH)/DrawResources/DrawPlugin"
set drawplugpath ""
if {[array names ::env CSF_OCCTResourcePath] != "" && "$::env(CSF_OCCTResourcePath)" != "" && [file exists $::env(CSF_OCCTResourcePath)/DrawResources/DrawPlugin]} {
set drawplugpath "$::env(CSF_OCCTResourcePath)/DrawResources/DrawPlugin"
} elseif {[array names ::env CASROOT] != "" && "$::env(CASROOT)" != "" && [file exists $::env(CASROOT)/src/DrawResources/DrawPlugin]} {
set drawplugpath "$::env(CASROOT)/src/DrawResources/DrawPlugin"
}
set chan [open [file nativename $drawplugpath]]
@@ -236,9 +238,11 @@ proc vsamples {} {
#create list {{category} {title} {filename}}
set alistofthree ""
set samplespath "$::env(CASROOT)/samples/tcl/"
if { [array names ::env OCCT_SHARE_PATH] != "" && "$::env(OCCT_SHARE_PATH)" != "" && [file exists $::env(OCCT_SHARE_PATH)/samples/tcl/]} {
set samplespath "$::env(OCCT_SHARE_PATH)/samples/tcl/"
set samplespath ""
if { [array names ::env CSF_OCCTSamplesPath] != "" && "$::env(CSF_OCCTSamplesPath)" != "" && [file exists $::env(CSF_OCCTSamplesPath)/tcl/]} {
set samplespath "$::env(CSF_OCCTSamplesPath)/tcl/"
} elseif { [array names ::env CASROOT] != "" && "$::env(CASROOT)" != "" && [file exists $::env(CASROOT)/samples/tcl/]} {
set samplespath "$::env(CASROOT)/samples/tcl/"
}
foreach fname [glob -path "${samplespath}" *.tcl] {
@@ -406,9 +410,11 @@ proc about {} {
set screenwidth [expr {int([winfo screenwidth .]*0.5-200)}]
wm geometry .about 400x200+$screenwidth+$screenheight
set logopath "$::env(CASROOT)/src/DrawResources/OCC_logo.png"
if {[array names ::env OCCT_RESOURCE_PATH] != "" && "$::env(OCCT_RESOURCE_PATH)" != "" && [file exists $::env(OCCT_RESOURCE_PATH)/DrawResources/OCC_logo.png]} {
set logopath "$::env(OCCT_RESOURCE_PATH)/DrawResources/OCC_logo.png"
set logopath ""
if {[array names ::env CSF_OCCTResourcePath] != "" && "$::env(CSF_OCCTResourcePath)" != "" && [file exists $::env(CSF_OCCTResourcePath)/DrawResources/OCC_logo.png]} {
set logopath "$::env(CSF_OCCTResourcePath)/DrawResources/OCC_logo.png"
} elseif {[array names ::env CASROOT] != "" && "$::env(CASROOT)" != "" && [file exists $::env(CASROOT)/src/DrawResources/OCC_logo.png]} {
set logopath "$::env(CASROOT)/src/DrawResources/OCC_logo.png"
}
image create photo occlogo -file $logopath -format png
@@ -462,13 +468,13 @@ proc _launchBrowser {url} {
# Else opens a site with this guide
################################################################
proc openuserguide {} {
if { [array names ::env OCCT_SHARE_PATH] != "" && "$::env(OCCT_SHARE_PATH)" != "" && [file exists $::env(OCCT_SHARE_PATH)/doc/pdf/user_guides/occt_test_harness.pdf]} {
_launchBrowser $::env(OCCT_SHARE_PATH)/doc/pdf/user_guides/occt_test_harness.pdf
} elseif { [array names ::env OCCT_SHARE_PATH] != "" && "$::env(OCCT_SHARE_PATH)" != "" && [file exists $::env(OCCT_SHARE_PATH)/doc/overview/html/occt_user_guides__test_harness.html]} {
_launchBrowser $::env(OCCT_SHARE_PATH)/doc/overview/html/occt_user_guides__test_harness.html
} elseif [file exists $::env(CASROOT)/doc/pdf/user_guides/occt_test_harness.pdf] {
if { [array names ::env CSF_OCCTDocPath] != "" && "$::env(CSF_OCCTDocPath)" != "" && [file exists $::env(CSF_OCCTDocPath)/pdf/user_guides/occt_test_harness.pdf]} {
_launchBrowser $::env(CSF_OCCTDocPath)/pdf/user_guides/occt_test_harness.pdf
} elseif { [array names ::env CSF_OCCTDocPath] != "" && "$::env(CSF_OCCTDocPath)" != "" && [file exists $::env(CSF_OCCTDocPath)/overview/html/occt_user_guides__test_harness.html]} {
_launchBrowser $::env(CSF_OCCTDocPath)/overview/html/occt_user_guides__test_harness.html
} elseif { [array names ::env CASROOT] != "" && "$::env(CASROOT)" != "" && [file exists $::env(CASROOT)/doc/pdf/user_guides/occt_test_harness.pdf]} {
_launchBrowser $::env(CASROOT)/doc/pdf/user_guides/occt_test_harness.pdf
} elseif [file exists $::env(CASROOT)/doc/overview/html/occt_user_guides__test_harness.html] {
} elseif { [array names ::env CASROOT] != "" && "$::env(CASROOT)" != "" && [file exists $::env(CASROOT)/doc/overview/html/occt_user_guides__test_harness.html]} {
_launchBrowser $::env(CASROOT)/doc/overview/html/occt_user_guides__test_harness.html
} else {
launchBrowser {http://dev.opencascade.org/doc/overview/html/occt_user_guides__test_harness.html}

8
src/DrawResources/TKTopTest.tcl
View File

@@ -13,14 +13,14 @@
set Draw_GEOMETRY 1
if {[array names ::env OCCT_RESOURCE_PATH] != "" && "$::env(OCCT_RESOURCE_PATH)" != "" && [file exists $::env(OCCT_RESOURCE_PATH)/DrawResources/CURVES.tcl]} {
source $env(OCCT_RESOURCE_PATH)/DrawResources/CURVES.tcl
if {[array names ::env CSF_OCCTResourcePath] != "" && "$::env(CSF_OCCTResourcePath)" != "" && [file exists $::env(CSF_OCCTResourcePath)/DrawResources/CURVES.tcl]} {
source $env(CSF_OCCTResourcePath)/DrawResources/CURVES.tcl
} else {
source $env(CASROOT)/src/DrawResources/CURVES.tcl
}
if {[array names ::env OCCT_RESOURCE_PATH] != "" && "$::env(OCCT_RESOURCE_PATH)" != "" && [file exists $::env(OCCT_RESOURCE_PATH)/DrawResources/SURFACES.tcl]} {
source $env(OCCT_RESOURCE_PATH)/DrawResources/SURFACES.tcl
if {[array names ::env CSF_OCCTResourcePath] != "" && "$::env(CSF_OCCTResourcePath)" != "" && [file exists $::env(CSF_OCCTResourcePath)/DrawResources/SURFACES.tcl]} {
source $env(CSF_OCCTResourcePath)/DrawResources/SURFACES.tcl
} else {
source $env(CASROOT)/src/DrawResources/SURFACES.tcl
}

4
src/DrawResources/TestCommands.tcl
View File

@@ -269,10 +269,6 @@ proc testgrid {args} {
}
set logdir "results/${prefix}[clock format [clock seconds] -format {%Y-%m-%dT%H%M}]"
if { [array names ::env OCCT_SHARE_PATH] != "" && "$::env(OCCT_SHARE_PATH)" != ""} {
set logdir "$::env(OCCT_SHARE_PATH)/${logdir}"
}
set logdir [file normalize $logdir]
}
if { [file isdirectory $logdir] && ! $overwrite && ! [catch {glob -directory $logdir *}] } {