Sophie

Sophie

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

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

diff -p -up OpenCASCADE6.3.0/samples/standard/java/build.csh.orig OpenCASCADE6.3.0/samples/standard/java/build.csh
--- OpenCASCADE6.3.0/samples/standard/java/build.csh.orig	2010-02-12 19:12:01.585018893 -0200
+++ OpenCASCADE6.3.0/samples/standard/java/build.csh	2010-02-12 19:22:29.353017539 -0200
@@ -1,12 +1,11 @@
 #!/bin/csh -f
 
-setenv STATION `uname -s`                                                                                                                                   
-if (${STATION} == "IRIX64") setenv STATION IRIX
+if (! ($?CASROOT)) then
+    setenv CASROOT /usr/share/opencascade
+endif
 
 setenv SAMPLE_ROOT `pwd`
 
-cd $STATION
-
 if ( ! -d obj ) then
     mkdir obj
 endif
@@ -15,12 +14,9 @@
     mkdir classes
 endif
 if ( !($?JAVAHOME) ) then
-    echo -n "JAVAHOME not setted . Please define it : "
-    set res = $<
-    setenv JAVAHOME  ${res}
-else
-    setenv JDK ${JAVAHOME}
+    setenv JAVAHOME /usr/lib/jvm/java
 endif
+setenv JDK ${JAVAHOME}
 
 ${JAVAHOME}/bin/javac -d classes ${CASROOT}/src/jcas/*.java ${SAMPLE_ROOT}/java/CASCADESamplesJni/*.java ${SAMPLE_ROOT}/java/SampleGeometryJni/*.java ${SAMPLE_ROOT}/java/SamplesTopologyJni/*.java ${SAMPLE_ROOT}/java/SampleViewer3DJni/*.java ${SAMPLE_ROOT}/java/SampleAISBasicJni/*.java ${SAMPLE_ROOT}/java/SampleAISDisplayModeJni/*.java ${SAMPLE_ROOT}/java/SampleAISSelectJni/*.java ${SAMPLE_ROOT}/java/SampleDisplayAnimationJni/*.java ${SAMPLE_ROOT}/java/SampleImportExportJni/*.java ${SAMPLE_ROOT}/java/SampleHLRJni/*.java ${SAMPLE_ROOT}/java/util/*.java ${SAMPLE_ROOT}/java/util/x11/*.java ${SAMPLE_ROOT}/java/*.java
 
diff -p -up OpenCASCADE6.3.0/samples/standard/java/java/util/ExtensionFileFilter.java.orig OpenCASCADE6.3.0/samples/standard/java/java/util/ExtensionFileFilter.java
--- OpenCASCADE6.3.0/samples/standard/java/java/util/ExtensionFileFilter.java.orig	2010-02-12 19:16:50.343019872 -0200
+++ OpenCASCADE6.3.0/samples/standard/java/java/util/ExtensionFileFilter.java	2010-02-12 19:17:04.484017436 -0200
@@ -111,13 +111,13 @@ public class ExtensionFileFilter extends
     String[] ext = new String[filters.size()];
 
 
-    Enumeration enum = filters.keys();
+    Enumeration en = filters.keys();
 
     int i = 0;
 
-    while (enum.hasMoreElements())
+    while (en.hasMoreElements())
 
-      ext[i] = new String((String) enum.nextElement());
+      ext[i] = new String((String) en.nextElement());
 
 
     return ext;
diff -p -up OpenCASCADE6.3.0/samples/standard/java/run.csh.orig OpenCASCADE6.3.0/samples/standard/java/run.csh
--- OpenCASCADE6.3.0/samples/standard/java/run.csh.orig	2010-02-12 19:21:29.202019609 -0200
+++ OpenCASCADE6.3.0/samples/standard/java/run.csh	2010-02-12 19:23:22.588042751 -0200
@@ -1,39 +1,15 @@
 #!/bin/csh -f
 
-setenv STATION `uname`
-
-if (${STATION} == "IRIX64") setenv STATION IRIX
-
-## CASCADE part
-
 if (! ($?CASROOT)) then
-    echo -n "Please define CASROOT to the folder containing OpenCascade '"'src'"', '"'drv'"' and '"'inc'"' folders. : "
-    set res = $<
-    setenv CASROOT ${res}
-endif
-
-if (! -d ${STATION}/obj) then 
-    setenv JAVAHOME "${CASROOT}/../3rdparty/${STATION}/java"
+    setenv CASROOT /usr/share/opencascade
 endif
 
 if ( !($?JAVAHOME) ) then
-    echo -n "JAVAHOME not setted . Please define it : "
-    set res = $<
-    setenv JAVAHOME  ${res}
-else
-    setenv JDK ${JAVAHOME}
+    setenv JAVAHOME /usr/lib/jvm/java
 endif
+setenv JDK ${JAVAHOME}
 
-## Common part
-if (!($?LD_LIBRARY_PATH)) then
-    setenv LD_LIBRARY_PATH ""
-endif
 cd java
-setenv LD_LIBRARY_PATH "${cwd}:${cwd}/../${STATION}:${cwd}/../${STATION}/lib:${CASROOT}/${STATION}/lib:${LD_LIBRARY_PATH}"
 
 ## Start up
-echo 'LD_LIBRARY_PATH = ' $LD_LIBRARY_PATH 
-${JAVAHOME}/bin/java   -classpath .:${cwd}/../${STATION}/CASCADESamples.jar SamplesStarter
-
-
-
+${JAVAHOME}/bin/java   -classpath .:${cwd}/../CASCADESamples.jar SamplesStarter
diff -p -up OpenCASCADE6.3.0/samples/standard/qt/IESample.pro.orig OpenCASCADE6.3.0/samples/standard/qt/IESample.pro
--- OpenCASCADE6.3.0/samples/standard/qt/IESample.pro.orig	2010-02-12 18:52:30.619019331 -0200
+++ OpenCASCADE6.3.0/samples/standard/qt/IESample.pro	2010-02-12 19:30:11.937424067 -0200
@@ -1,17 +1,15 @@
 TEMPLATE = app
 CONFIG += debug_and_release qt 
 
-TARGET = IESample
-CONFIG(debug, debug|release) {
-    DESTDIR = ./Linux/bind
-    OBJECTS_DIR = ./Linux/objd
-    MOC_DIR = ./Linux/srcd
-} else {
-    DESTDIR = ./Linux/bin
-    OBJECTS_DIR = ./Linux/obj
-    MOC_DIR = ./Linux/src
+isEmpty(CASROOT) {
+    error("CASROOT not set (export CASROOT=/usr/share/opencascade).")
 }
 
+TARGET = IESample
+DESTDIR = $(CASROOT)/bin
+OBJECTS_DIR = ./obj
+MOC_DIR = ./src
+
 HEADERS = src/*.h
 SOURCES = src/*.cxx
 
diff -p -up OpenCASCADE6.3.0/samples/standard/qt/run.sh.orig OpenCASCADE6.3.0/samples/standard/qt/run.sh
--- OpenCASCADE6.3.0/samples/standard/qt/run.sh.orig	2010-02-12 18:43:56.841018209 -0200
+++ OpenCASCADE6.3.0/samples/standard/qt/run.sh	2010-02-12 18:46:07.298018611 -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"
@@ -47,14 +32,11 @@ CSF_MDTVTexturesDirectory="${CASROOT}/sr
 CSF_ResourcesDefaults="${RES_DIR}"
 CSF_IEResourcesDefaults="${RES_DIR}"
 
-echo $LD_LIBRARY_PATH
-
 PATH="${BIN_DIR}:${PATH}"
 
 export CSF_GraphicShr CSF_UnitsLexicon CSF_UnitsDefinition
 export CSF_MDTVFontDirectory CSF_MDTVTexturesDirectory
 export CSF_IEResourcesDefaults CSF_ResourcesDefaults
-export PATH LD_LIBRARY_PATH
 
 if test ! -r "${BIN_DIR}/IESample"; then
    echo "Executable \"${BIN_DIR}/IESample\" not found."
diff -p -up OpenCASCADE6.3.0/samples/tutorial/Tutorial.pro.orig OpenCASCADE6.3.0/samples/tutorial/Tutorial.pro
--- OpenCASCADE6.3.0/samples/tutorial/Tutorial.pro.orig	2010-02-12 18:49:37.417019524 -0200
+++ OpenCASCADE6.3.0/samples/tutorial/Tutorial.pro	2010-02-12 19:29:49.401016398 -0200
@@ -1,17 +1,15 @@
 TEMPLATE = app
 CONFIG += debug_and_release qt 
 
-TARGET = Tutorial
-CONFIG(debug, debug|release) {
-    DESTDIR = ./Linux/bind
-    OBJECTS_DIR = ./Linux/objd
-    MOC_DIR = ./Linux/srcd
-} else {
-    DESTDIR = ./Linux/bin
-    OBJECTS_DIR = ./Linux/obj
-    MOC_DIR = ./Linux/src
+isEmpty(CASROOT) {
+    error("CASROOT not set (export CASROOT=/usr/share/opencascade).")
 }
 
+TARGET = Tutorial
+DESTDIR = $(CASROOT)/bin
+OBJECTS_DIR = ./obj
+MOC_DIR = ./src
+
 HEADERS = src/*.h
 SOURCES = src/*.cxx