Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 560e4db4b21ec5e4ec1ba158d071e4a7 > files > 3

opencascade-6.3-6mdv2010.1.src.rpm

diff -p -up OpenCASCADE6.3.0/ros/env_DRAW.sh.orig OpenCASCADE6.3.0/ros/env_DRAW.sh
--- OpenCASCADE6.3.0/ros/env_DRAW.sh.orig	2010-02-12 17:28:03.739443848 -0200
+++ OpenCASCADE6.3.0/ros/env_DRAW.sh	2010-02-12 17:39:56.537016897 -0200
@@ -1,17 +1,9 @@
-#!/bin/ksh -f
+#!/bin/sh
 
-OS_NAME=`uname`
-if [ -z "PATH" ];
-then PATH=$TCLHOME/bin:$CASROOT/$OS_NAME/bin;
-else PATH=$TCLHOME/bin:$CASROOT/$OS_NAME/bin:$PATH;
+if [ -z "$CASROOT" ]; then
+    export CASROOT=/usr/share/opencascade
 fi
-export PATH
-if [ -z "LD_LIBRARY_PATH" ];
-then LD_LIBRARY_PATH=$TCLHOME/lib:$CASROOT/$OS_NAME/lib;
-else LD_LIBRARY_PATH=$TCLHOME/lib:$CASROOT/$OS_NAME/lib:$LD_LIBRARY_PATH;
-fi
-echo 1
-export LD_LIBRARY_PATH
+export PATH=$CASROOT/bin:$PATH
 export CSF_MDTVFontDirectory=$CASROOT/src/FontMFT
 export CSF_LANGUAGE=us
 export MMGT_CLEAR=1
@@ -23,20 +15,9 @@ export CSF_StandardDefaults=$CASROOT/src
 export CSF_PluginDefaults=$CASROOT/src/StdResource
 export CSF_XCAFDefaults=$CASROOT/src/StdResource
 export CSF_StandardLiteDefaults=$CASROOT/src/StdResource
-export CSF_GraphicShr=$CASROOT/$OS_NAME/lib/libTKOpenGl.so
+export CSF_GraphicShr=$CASROOT/lib/libTKOpenGl.so
 export CSF_UnitsLexicon=$CASROOT/src/UnitsAPI/Lexi_Expr.dat
 export CSF_UnitsDefinition=$CASROOT/src/UnitsAPI/Units.dat
 export CSF_IGESDefaults=$CASROOT/src/XSTEPResource
 export CSF_STEPDefaults=$CASROOT/src/XSTEPResource
 export CSF_XmlOcafResource=$CASROOT/src/XmlOcafResource
-
-export TCLLIBPATH=$TCLHOME/lib
-
-      export ITK_LIBRARY=$TCLLIBPATH
-      export ITCL_LIBRARY=$TCLLIBPATH
-      if [ -n "TIX_LIBRARY" ];
-      then TIX_LIBRARY="";
-      fi
-      export TIX_LIBRARY
-      export TK_LIBRARY=$TCLLIBPATH
-      export TCL_LIBRARY=$TCLLIBPATH
diff -p -up OpenCASCADE6.3.0/ros/src/WOKsite/CreateFactory.tcl.orig OpenCASCADE6.3.0/ros/src/WOKsite/CreateFactory.tcl
--- OpenCASCADE6.3.0/ros/src/WOKsite/CreateFactory.tcl.orig	2006-06-23 14:26:42.000000000 -0300
+++ OpenCASCADE6.3.0/ros/src/WOKsite/CreateFactory.tcl	2010-02-12 18:00:03.455504607 -0200
@@ -12,7 +12,7 @@
 ;# and WBNAM is created as empty workbench. To populate it with development units
 ;# please refer to the Wok documentation.
 ;#
-source $env(WOKHOME)/site/tclshrc_Wok
+source $env(CASROOT)/WOKsite/tclshrc_Wok
 proc FileToList { path {sort 0} {trim 0} {purge 0} {emptl 1} } {
     if ![ catch { set id [ open $path r ] } ] {
 	set l  {}
diff -p -up OpenCASCADE6.3.0/ros/src/WOKsite/tclshrc_Wok.orig OpenCASCADE6.3.0/ros/src/WOKsite/tclshrc_Wok
--- OpenCASCADE6.3.0/ros/src/WOKsite/tclshrc_Wok.orig	2010-02-12 18:14:12.704016778 -0200
+++ OpenCASCADE6.3.0/ros/src/WOKsite/tclshrc_Wok	2010-02-12 18:13:18.295275075 -0200
@@ -43,55 +43,9 @@
 ;#
 global env tcl_platform
 
-if { "$tcl_platform(platform)" == "unix" } {
-    if { "$tcl_platform(os)" == "HP-UX" } {
-	set ldpathvar SHLIB_PATH
-    } elseif { "$tcl_platform(os)" == "Darwin" } {
-	set ldpathvar DYLD_LIBRARY_PATH
-    } else {
-	set ldpathvar LD_LIBRARY_PATH
-    }
-    if { ![info exists env($ldpathvar)] } {
-        puts stderr "You must set $ldpathvar to point where you have installed Wok"
-        exit
-    }
-}
-
-if { "$tcl_platform(platform)" == "windows" && ![info exists env(Path)] } {
-    puts stderr "You must set PATH to point where you have installed Wok"
-    exit
-}
 if [info exists wm] {
     wm withdraw .
 }
-if { "$tcl_platform(platform)" == "unix" } {
-    set sprtor ":"
-    set fmtshr "lib%s.so"
-    set wrk [split $env($ldpathvar) $sprtor]
-    if { $tcl_platform(os) == "HP-UX"  } { set fmtshr "lib%s.sl" }
-    if { $tcl_platform(os) == "Darwin" } { set fmtshr "lib%s.dylib" }
-    set msgnotfound "Please check your variable $ldpathvar"
-} 
-if { "$tcl_platform(platform)" == "windows" } {
-    set sprtor ";"
-    set fmtshr "%s.dll"
-    set wrk [split $env(Path) $sprtor]
-    set msgnotfound "Please check your variable PATH"
-}
-;#
-;# Find out in wrk where wok resides. That is : where the file libTKWOK resides. 
-;# 
-set wokso [format $fmtshr TKWOK]
-foreach d $wrk {
-    if { [file exists [file join $d $wokso]] && ![info exists wokfound] } {
-	set wokfound $d
-    }
-}
-if ![info exists wokfound] {
-    puts stderr "Wok (actually $wokso) was not found in the directory(ies) $d"
-    puts stderr "$msgnotfound or check that the above directory are readable."
-    return
-}
 ;#
 ;# Wok's here we can set up our niche.
 ;#
@@ -99,18 +53,13 @@ set wok_library [file dirname $wokfound]
 set wok_ptfm    [file tail    $wokfound]
 ;#
 ;#
-lappend auto_path $wok_library 
+lappend auto_path $env(CASROOT)/WOKTclLib
 package require Wok
 package require Ms
 package require Tclx
 ;#
 ;# Where tcl and edl file of wok reside.
 ;#
-set env(WOK_LIBRARY) $wok_library
-set env(WOK_LIBPATH) "${wok_library}${sprtor}[file join $wok_library $wok_ptfm]"
-set env(WOKSTATION)  $wok_ptfm
-set env(WOKHOME)     [file dirname $wok_library]
-set woksite          [file join $env(WOKHOME) site]
 ;#
 ;# Where the files ATLIST , DEFAULT.edl and SESSION.edl reside
 ;#
diff -p -up OpenCASCADE6.3.0/ros/src/WOKsite/wokinit.csh.orig OpenCASCADE6.3.0/ros/src/WOKsite/wokinit.csh
--- OpenCASCADE6.3.0/ros/src/WOKsite/wokinit.csh.orig	2010-02-12 18:03:11.144017166 -0200
+++ OpenCASCADE6.3.0/ros/src/WOKsite/wokinit.csh	2010-02-12 18:14:28.320016821 -0200
@@ -1,42 +1,11 @@
 #!/bin/csh -f
 #
 
-set OS_NAME=`uname`
-set OS_PLATFORM=""
-if ( $OS_NAME == "SunOS" ) then
-   set OS_PLATFORM="sun"
-else if ( $OS_NAME == "Linux" ) then
-   set OS_PLATFORM="lin"
-else if ( $OS_NAME == "HP-UX" ) then
-   set OS_PLATFORM="hp"
-else if ( $OS_NAME == "Darwin" ) then
-   set OS_PLATFORM="mac"
-else if ( $OS_NAME == "FreeBSD" ) then
-   set OS_PLATFORM="bsd"
-endif
-
-setenv WOKHOME ${CASROOT}/../wok
-setenv HOME ${WOKHOME}/site
-setenv WOK_LIBPATH ${WOKHOME}/lib/${OS_PLATFORM}
-
-setenv WOK_ROOTADMDIR ${WOKHOME}/wok_entities
-setenv WOK_SESSIONID ${HOME}
-
-setenv TCLHOME ${CASROOT}/../3rdparty/${OS_NAME}/tcltk
-setenv TCLLIBPATH "${TCLHOME}/lib:${WOK_LIBPATH}"
-
-set TCLLIB=${TCLHOME}/lib
-set TCLBIN=${TCLHOME}/bin
-
-setenv LD_LIBRARY_PATH "/usr/lib:/usr/X11R6/lib:/lib:${TCLLIB}:${WOKHOME}/lib/:${WOKHOME}/lib/${OS_PLATFORM}"
-setenv path "/usr/bin /bin /usr/bin /sbin /usr/sbin /usr/local/bin /usr/local/sbin /usr/X11R6/bin /etc"
-setenv PATH "/usr/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/X11R6/bin:/etc"
-
-echo ${LD_LIBRARY_PATH}
-env | grep -i wok
-env | grep -i tcl
+mkdir -p ${HOME}/.wok/wok_entities
+setenv WOK_ROOTADMDIR ${HOME}/.wok/wok_entities
+setenv WOK_SESSIONID ${HOME}/.wok
 
 cd ${WOK_ROOTADMDIR}
 
-${TCLBIN}/tclsh < ${WOKHOME}/site/CreateFactory.tcl
+tclsh < ${CASROOT}/WOKsite/CreateFactory.tcl
 
diff -p -up OpenCASCADE6.3.0/samples/tutorial/run.sh.orig OpenCASCADE6.3.0/samples/tutorial/run.sh
--- OpenCASCADE6.3.0/samples/tutorial/run.sh.orig	2010-02-12 18:18:43.474018516 -0200
+++ OpenCASCADE6.3.0/samples/tutorial/run.sh	2010-02-12 18:23:38.916480815 -0200
@@ -1,18 +1,8 @@
 #!/bin/sh
 
-host=`uname -s`
-
 PROG_DIR=`dirname $0`
 ROOT_DIR=`(cd $PROG_DIR; pwd)`
 
-if test ! -d "$host/obj"; then
-    QTDIR="$CASROOT/../3rdparty/$host/qt"
-    QT_LD_PATH="$CASROOT/../3rdparty/$host/qt"
-    CASCADE_LD_PATH="$CASROOT/$host/lib"
-    LD_LIBRARY_PATH="${CASCADE_LD_PATH}:${QT_LD_PATH}:${LD_LIBRARY_PATH}"
-fi
-STATION=$host
-
 if test "${CASROOT+set}" != "set"; then
    echo "Environment variable \"CASROOT\" not defined."
    CASROOT="$CASCADE_ROOT"
@@ -28,17 +18,12 @@ if test ! -d "$CASROOT"; then
    exit 1
 fi
 
-if test "${QTDIR+set}" != "set"; then
-   echo "Environment variable \"QTDIR\" not defined."
-   exit 1
-fi
-
 occ_opengl_lib=libTKOpenGl.so
 
 RES_DIR="${ROOT_DIR}/res"
-BIN_DIR="${ROOT_DIR}/${STATION}/bin"
+BIN_DIR="${CASROOT}/bin"
 
-CSF_GraphicShr="${CASROOT}/${STATION}/lib/${occ_opengl_lib}"
+CSF_GraphicShr="${CASROOT}/lib/${occ_opengl_lib}"
 CSF_UnitsLexicon="${CASROOT}/src/UnitsAPI/Lexi_Expr.dat"
 CSF_UnitsDefinition="${CASROOT}/src/UnitsAPI/Units.dat"
 CSF_MDTVFontDirectory="${CASROOT}/src/FontMFT"