Join modifications from branch BR_JYP

[tools/hxx2salome.git] / scripts / hxx2salome

diff --git a/scripts/hxx2salome b/scripts/hxx2salome
index c7a25a3d33e4783732faae51bb6549f29f0487cd..bc2e588df5bc92d64c75e76f801b047363f737f5 100755 (executable)
--- a/scripts/hxx2salome
+++ b/scripts/hxx2salome
@@ -32,6 +32,7 @@ usage()
     echo -e "                            (this file is also used for sourcing environment before compilation if it has sh or bash syntax,"
     echo -e "                             if the syntax is csh, it is not sourced and for compiling (-c option) environment must be set up before)"
     echo -e "    -s script_extension   : to use if your environment file name doesn't have extension"
+    echo -e "    -g                    : to create a gui part in your component building tree"
     echo -e "    -c                    : to compile after generation"
     echo -e "                            (use this option only if you don't have dependencies in your header or libraries"
     echo -e "                             if it is the case, you'll have to adapt your Makefile.in" 
@@ -174,7 +175,7 @@ generate_module_source()
 # outputs
     echo -e "\n  IDL file:"
     cat parse_result > hxx2salome_journal
-    echo -e "\n----------------- IDL file ------------------\n">>hxx2salome_journal
+    echo -e "\n----------------- IDL file ------------------\n" >> hxx2salome_journal
     cat code_idl >> hxx2salome_journal
     cat code_idl
     echo -e "\n----------------- hxx file ------------------\n" >> hxx2salome_journal
@@ -188,8 +189,16 @@ generate_module_source()
 #
     echo -e "\n-> Duplicate template module" | tee hxx2salome_journal
     tar xvfz ${gene_dir}/template_src.tgz >> hxx2salome_journal
-    mv TEMPLATE_SRC ${CLASS_NAME}_SRC
-    ${gene_dir}/renameSalomeModule -i TEMPLATE ${CLASS_NAME} ${CLASS_NAME}_SRC >> hxx2salome_journal
+    mv HXX2SALOME_GENERIC_CLASS_NAME_SRC ${CLASS_NAME}_SRC
+    ${gene_dir}/renameSalomeModule -i HXX2SALOME_GENERIC_CLASS_NAME ${CLASS_NAME} ${CLASS_NAME}_SRC >> hxx2salome_journal
+#
+    if [ $make_gui -eq 0 ]
+    then
+       echo -e "\n-> Delete GUI part from the tree" >> hxx2salome_journal
+       'rm' -rf ${CLASS_NAME}_SRC/src/${CLASS_NAME}GUI
+       sed "s/${CLASS_NAME}GUI//" < ${CLASS_NAME}_SRC/src/Makefile.in > /tmp/h2smkf.$$
+       mv /tmp/h2smkf.$$ ${CLASS_NAME}_SRC/src/Makefile.in
+    fi
 #
     echo -e "\n-> Substitute generated code in idl file"
     echo "// this idl file was generated by hxx2salome" > tmpfile
@@ -320,6 +329,8 @@ update_environment()
 copy_component_source()
 {
     mv ${tmp_dir}/${CLASS_NAME}_SRC/* ${NEW_COMPONENT_SRC_DIR}
+    mkdir -p ${NEW_COMPONENT_BUILD_DIR}
+    mkdir -p ${NEW_COMPONENT_ROOT_DIR}
 }
 
 good_bye()
@@ -340,11 +351,12 @@ good_bye()
     echo -e "\trun Salome"
     echo -e "\tadd ${CLASS_NAME} to the Salome modules list"
     echo -e "\t\t(with the --modules option of the runSalome command or"
-    echo -e "\t\tby editing the ~/.salome_2.2.4/salome.launch file)"
+    echo -e "\t\tby editing your own per-user configuration file ~/.SalomeApprc.3.x.x)"
     echo -e "\nIf the header of your component includes other headers that are not in the same directories,"
-    echo -e "or if yout library has dependencies you want to specify,"
-    echo -e "you'll have to modify the following Makefile:in : "
+    echo -e "or if your library has dependencies you want to specify,"
+    echo -e "you'll have to modify the following files Makefile.in: "
     echo -e "\t\${${CLASS_NAME}_SRC_DIR}/src/${CLASS_NAME}/Makefile.in"
+    echo -e "\t\${${CLASS_NAME}_SRC_DIR}/src/${CLASS_NAME}GUI/Makefile.in"
 }
 
 launch_salome()
@@ -395,12 +407,14 @@ CPP_ROOT_DIR=
 NEW_COMPONENT_ROOT_DIR=
 NEW_COMPONENT_SRC_DIR=
 NEW_COMPONENT_BUILD_DIR=
+SHELL_EXT=sh
 do_compile=0
 do_launch=0
-#
+make_gui=0
+ #
 welcome # print some welcome info
 #
-while getopts "cs:e:h:l" Option
+while getopts "cs:e:h:lg" Option
 do
    case $Option in
      h) usage
@@ -411,6 +425,7 @@ do
            csh)  SHELL_EXT=csh;;      
            *)    SHELL_EXT=sh;;
        esac;;
+     g) make_gui=1;;
      c) do_compile=1;;
      l) do_launch=1;;
      *) echo "Unimplemented option chosen : $Option."
@@ -482,7 +497,7 @@ fi
 #
 # get class name
 #
-CLASS_NAME=`awk '$1 == "class" && $0 !~ /;/ {print $2}' ${hxx_file}`
+CLASS_NAME=`awk '$1 == "class" && $0 !~ /;/ {print $2}' ${hxx_file}|awk -F: '{print $1}'`
 echo "    Name of class :" $CLASS_NAME
 if [ ! $CLASS_NAME ]
 then