From: crouzet <crouzet>
Date: Fri, 5 Oct 2007 12:16:00 +0000 (+0000)
Subject: Correction Bug PAL16047
X-Git-Tag: V4_1_0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3a727585c44c2afb97fd55c0138a0de644cc6e76;p=tools%2Fhxx2salome.git

Correction Bug PAL16047

add automailcally $KERNEL_ROOT_DIR/bin/salome to PYTHONPATH (for runIDLparser).
Check that catalog is generated, exit if not.
---

diff --git a/scripts/hxx2salome b/scripts/hxx2salome
index 6c3911b..d533e12 100755
--- a/scripts/hxx2salome
+++ b/scripts/hxx2salome
@@ -246,8 +246,15 @@ generate_module_source()
     fi
     cd ${CLASS_NAME}_SRC/resources
     VER=`cat ${KERNEL_ROOT_DIR}/bin/salome/VERSION | awk ' { print $NF }'` # extract number of version 
+    export PYTHONPATH=${PYTHONPATH}:${KERNEL_ROOT_DIR}/bin/salome  # to be sure IDLparser is in PYTHONPATH
     ${idlparser} -Wbcatalog=tmp.xml,icon=${CLASS_NAME}.png,version=${VER} -I${KERNEL_ROOT_DIR}/idl/salome -I${MED_ROOT_DIR}/idl/salome ../idl/${CLASS_NAME}_Gen.idl >& /dev/null | tee  hxx2salome_journal
-    cat tmp.xml | sed 's/_Gen//g' > ${CLASS_NAME}Catalog.xml
+    if [ -f tmp.xml ]
+    then
+       cat tmp.xml | sed 's/_Gen//g' > ${CLASS_NAME}Catalog.xml
+    else
+       echo Error with runIDLparser - the catalog was not generated
+       exit
+    fi
     rm tmp.xml
 #
 }