From: jyp Date: Thu, 15 Dec 2005 10:54:02 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: for_V3_2b1~7 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0d3c169710ed2b3112be9349b226c379bf74fbb0;p=tools%2Fhxx2salome.git *** empty log message *** --- diff --git a/scripts/hxx2salome b/scripts/hxx2salome index c7a25a3..c7c01c9 100755 --- 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 @@ -340,11 +349,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 +405,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 +423,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 +495,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 diff --git a/scripts/template_src.tgz b/scripts/template_src.tgz index d435bd6..bf91f2a 100644 Binary files a/scripts/template_src.tgz and b/scripts/template_src.tgz differ diff --git a/src/hxx2salome.ui b/src/hxx2salome.ui index 2e2ceb8..b9f4a54 100644 --- a/src/hxx2salome.ui +++ b/src/hxx2salome.ui @@ -9,7 +9,7 @@ 0 0 520 - 383 + 429 @@ -225,34 +225,34 @@ - CloseButton + GenButton - 390 - 340 + 30 + 380 86 28 - Close + Generate - GenButton + CloseButton - 30 - 340 + 390 + 380 86 28 - Generate + Close @@ -264,56 +264,72 @@ 10 200 500 - 130 + 160 Output - + - OutputTreeButton + OutputTreeLabel - 380 + 30 30 - 80 + 140 30 - Browse ... + Salome component tree - + - OutputTreeLabel + OutputTreeText - 30 + 180 30 - 140 + 190 + 30 + + + + + + textLabel1 + + + + 230 + 120 + 259 30 - Salome component tree + (if checked, generation can take a long time) - + - OutputTreeText + OutputTreeButton - 180 + 380 30 - 190 + 80 30 + + Browse ... + @@ -356,34 +372,34 @@ - Compile + makeGUI 200 70 - 210 - 30 + 241 + 31 - Compile Salome Component + Generate file structure for GUI - + - textLabel1 + Compile - 230 - 90 - 259 + 200 + 100 + 210 30 - (if checked, generation can take a long time) + Compile Salome Component @@ -474,9 +490,6 @@ ShellChoice_activated(int) - - hxx2salome.ui.h - QString CppLibDir; QString SalomeDir; diff --git a/src/hxx2salome.ui.h b/src/hxx2salome.ui.h index 2c64bdb..d72a913 100644 --- a/src/hxx2salome.ui.h +++ b/src/hxx2salome.ui.h @@ -206,6 +206,8 @@ void HXX2Salome::GenerateButton_pressed() command = "export HXX2SALOME_ROOT_DIR="; command += BINDIR; command += "; $HXX2SALOME_ROOT_DIR/hxx2salome "; + if (makeGUI->isChecked()) + command += " \"-g\" "; if (Compile->isChecked()) command += " \"-c\" "; if (shell == 1)