From: bugmaster Date: Fri, 13 Apr 2012 06:57:15 +0000 (+0400) Subject: 0023107: Update of OCCT service files for generation of Makefile files by WOK X-Git-Tag: V6_5_3~11 X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=046fed1ea7b2ebdcabf9eaf1b92c97e02a732d5c 0023107: Update of OCCT service files for generation of Makefile files by WOK --- diff --git a/src/OS/Draw.tcl b/src/OS/Draw.tcl index d703d476c4..2c55450b18 100755 --- a/src/OS/Draw.tcl +++ b/src/OS/Draw.tcl @@ -19,7 +19,7 @@ ;# Liste des toolkits WOK sous forme de full path ;# proc Draw:toolkits { } { - return [list TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW] + return [list TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw] } ;# ;# Autres UDs a prendre. Listes de triplets @@ -43,12 +43,15 @@ proc Draw:name { } { return Draw } proc Draw:alias { } { - return DWT + return DRAW } proc Draw:depends { } { return [list DataExchange] } +proc Draw:acdepends { } { + return [list TCLTK] +} ;# ;# Pre-requis pour la compilation ( -I ... ) diff --git a/src/OS/FoundationClasses.tcl b/src/OS/FoundationClasses.tcl index 009a9eca19..7d30910fe8 100755 --- a/src/OS/FoundationClasses.tcl +++ b/src/OS/FoundationClasses.tcl @@ -25,7 +25,7 @@ proc FoundationClasses:toolkits { } { ;# Autres UDs a prendre. ;# proc FoundationClasses:ressources { } { - return [list [list both r OS {} ]] \ + return [list [list both r UnitsAPI {} ] [list both r OS {} ]] \ } ; ;# diff --git a/src/OS/ModelingAlgorithms.tcl b/src/OS/ModelingAlgorithms.tcl index adf42ef260..906d6499fb 100755 --- a/src/OS/ModelingAlgorithms.tcl +++ b/src/OS/ModelingAlgorithms.tcl @@ -46,7 +46,7 @@ proc ModelingAlgorithms:name { } { return ModelingAlgorithms } proc ModelingAlgorithms:alias { } { - return MLG + return ALGO } proc ModelingAlgorithms:depends { } { return [list ModelingData] diff --git a/src/OS/ModelingData.tcl b/src/OS/ModelingData.tcl index 3451daeadc..aefd23d763 100755 --- a/src/OS/ModelingData.tcl +++ b/src/OS/ModelingData.tcl @@ -38,7 +38,7 @@ proc ModelingData:name { } { return ModelingData } proc ModelingData:alias { } { - return MDT + return DATA } proc ModelingData:depends { } { return [list FoundationClasses] diff --git a/src/OS/Visualization.tcl b/src/OS/Visualization.tcl index d7301332b1..db96db5335 100755 --- a/src/OS/Visualization.tcl +++ b/src/OS/Visualization.tcl @@ -50,6 +50,11 @@ proc Visualization:alias { } { proc Visualization:depends { } { return [list ModelingAlgorithms] } + +proc Visualization:acdepends { } { + return [list X11 GL FREETYPE FTGL] +} + ;# ;# Pre-requis pour la compilation ( -I ... ) ;# Returns a list of directory that should be used in -I directives diff --git a/src/OS/Wrappers.tcl b/src/OS/Wrappers.tcl deleted file mode 100755 index 0966dbc2ce..0000000000 --- a/src/OS/Wrappers.tcl +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright (c) 1999-2012 OPEN CASCADE SAS -# -# The content of this file is subject to the Open CASCADE Technology Public -# License Version 6.5 (the "License"). You may not use the content of this file -# except in compliance with the License. Please obtain a copy of the License -# at http://www.opencascade.org and read it completely before using this file. -# -# The Initial Developer of the Original Code is Open CASCADE S.A.S., having its -# main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France. -# -# The Original Code and all software distributed under the License is -# distributed on an "AS IS" basis, without warranty of any kind, and the -# Initial Developer hereby disclaims all such warranties, including without -# limitation, any warranties of merchantability, fitness for a particular -# purpose or non-infringement. Please see the License for the specific terms -# and conditions governing the rights and limitations under the License. - -;# -;# Liste des toolkits WOK sous forme de full path -;# -proc Wrappers:toolkits { } { - return [list TKjcas] -} -;# -;# Autres UDs a prendre. -;# -proc Wrappers:ressources { } { - return {} \ -} -; -;# -;# retourne une liste de triplets {type /name} -;# permet de faire : cp $CASROOT//name -;# On peut ainsi embarquer des fichiers d'un peu partout et les dispatcher sous -;# la racine d'arrivee et ce avec un autre nom. -;# rien n'empeche de CALCULER automatiquement des paths dans cette proc. -;# type = source/runtime/both pour dire si le fichier va dans l'archive en question. -;# une deux (ou les deux) type d'archive fabriquees. -;# -proc Wrappers:freefiles { } {} -;# -;# Nom du module -;# -proc Wrappers:name { } { - return Wrappers -} -proc Wrappers:alias { } { - return FOC -} -proc Wrappers:depends { } { - return {} -} -;# -;# Liste des includes utilises qui ne sont pas ceux des Wb. -;# -proc Wrappers:CompileWith { } { - - set l {} - switch -- [OS:os] { - HP-UX { - } - Linux { - lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include" - lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/inclide/linux" - lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include" - lappend l "[lindex [lindex [wokparam -v %STLPortInclude] 0] 0]" - } - SunOS { - lappend l "/usr/openwin/include" - lappend l "/usr/dt/include" - lappend l "[lindex [wokparam -v %CSF_CXX_INCLUDE] 0]" - lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/include" - lappend l "-I[lindex [wokparam -v %CSF_JavaHome] 0]/inclide/solaris" - lappend l "[lindex [wokparam -v %CSF_TCL_HOME] 0]/include" - } - IRIX { - lappend l "/usr/include/CC" - } - - } - return $l -} -;# -;# Pre-requis pour la compilation ( -L ... ) -;# Returns a list of directory that should be used in -L directives -;# while creating shareable. -;# -proc Wrappers:LinksoWith { } { - - set l {} - switch -- [OS:os] { - HP-UX { - } - Linux { - } - SunOS { - } - IRIX { - lappend l /usr/lib32 - } - - } - return $l -} -;# -;# Returns a list of exported features. -;# source : Source files -;# runtime: Shareables -;# wokadm : WOK admin files -;# api : Public include files -;# -proc Wrappers:Export { } { - return [list source runtime wokadm api] -} diff --git a/src/QADraw/EXTERNLIB b/src/QADraw/EXTERNLIB new file mode 100644 index 0000000000..d5607c1225 --- /dev/null +++ b/src/QADraw/EXTERNLIB @@ -0,0 +1,6 @@ +CSF_TclLibs +CSF_TclTkLibs +CSF_gdi32 +CSF_advapi32 +CSF_user32 + diff --git a/src/QADraw/FILES b/src/QADraw/FILES index 57010c0bb6..9d4446f559 100755 --- a/src/QADraw/FILES +++ b/src/QADraw/FILES @@ -1,3 +1,4 @@ +EXTERNLIB QADraw.cdl QADraw.cxx QADraw_Additional.cxx diff --git a/src/TKQADraw/EXTERNLIB b/src/TKQADraw/EXTERNLIB index c70af83675..f477086e3f 100755 --- a/src/TKQADraw/EXTERNLIB +++ b/src/TKQADraw/EXTERNLIB @@ -34,3 +34,8 @@ TKXDESTEP TKXSDRAW TKSTL TKAdvTools +CSF_TclLibs +CSF_TclTkLibs +CSF_gdi32 +CSF_advapi32 +CSF_user32