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 d703d476c4f89299a2b6f04e17f1629981fa15db..2c55450b184b26fb37013bcf28772b6c4659d8ef 100755 (executable)
--- 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 009a9eca195e6e1e6342325e290231406fcd7fe4..7d30910fe81bb442a7f13d53388087f9fa5d1579 100755 (executable)
--- 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 adf42ef2609a477c4c39a951233403376f27badb..906d6499fb309d1c70c5562c8e07f89c7345b8e9 100755 (executable)
--- 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 3451daeadc1012e42ca88fb81afeb5b56dd7b972..aefd23d7639ce63246ad367cbce1d336ac0531a5 100755 (executable)
--- 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 d7301332b1c813ce89c76e26162a477482691717..db96db53359d9e9442d6ab06fb472d4ba0abc1b0 100755 (executable)
--- 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 (executable)
index 0966dbc..0000000
--- 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 <full path1> <target directory>/name}
-;# permet de faire : cp <full path> $CASROOT/<target directory>/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 (file)
index 0000000..d5607c1
--- /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 57010c0bb6524e1ff6aaa00b3c94a77d6b61ec43..9d4446f559342b6ec9c4b833a8ad0afa166cf9b5 100755 (executable)
--- 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 c70af836751db20783aee53b2976bee0614a10b5..f477086e3f44360b1541232087bcf2ac9004f377 100755 (executable)
--- 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