From a91275bc5372a4d9a5f7905065457fd7c0b8ce3f Mon Sep 17 00:00:00 2001 From: ribes Date: Fri, 31 Oct 2008 13:34:44 +0000 Subject: [PATCH] *** empty log message *** --- bin/launchConfigureParser.py | 16 +++++++++++++++- bin/runSalome.py | 13 ++++++++++++- configure.ac | 4 ++-- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/bin/launchConfigureParser.py b/bin/launchConfigureParser.py index 74b3cd0a1..65b10def1 100755 --- a/bin/launchConfigureParser.py +++ b/bin/launchConfigureParser.py @@ -51,6 +51,7 @@ except_nam = "noexcepthandler" terminal_nam = "terminal" pinter_nam = "pinter" batch_nam = "batch" +gdb_session_nam = "gdb_session" # values in XML configuration file giving specific module parameters ( section) # which are stored in opts with key _ (eg SMESH_plugins) @@ -595,6 +596,13 @@ def CreateOptionParser (theAdditionalOptions=[]): dest="ns_port_log_file", help=help_str) + # gdb session + help_str = "Launch session with gdb" + o_gdb = optparse.Option("--gdb-session", + action="store_true", + dest="gdb_session", default=False, + help=help_str) + # All options opt_list = [o_t,o_g, # GUI/Terminal o_d,o_o, # Desktop @@ -614,7 +622,9 @@ def CreateOptionParser (theAdditionalOptions=[]): o_a, # Print free port and exit o_n, # --nosave-config o_pi, # Interactive python console - o_nspl] + o_nspl, + o_gdb, + ] #std_options = ["gui", "desktop", "log_file", "py_scripts", "resources", @@ -895,6 +905,10 @@ def get_env(theAdditionalOptions=[], appname="SalomeApp"): if cmd_opts.pinter is not None: args[pinter_nam] = cmd_opts.pinter + # Interactive python console + if cmd_opts.gdb_session is not None: + args[gdb_session_nam] = cmd_opts.gdb_session + #################################################### # Add values to args for add_opt in theAdditionalOptions: diff --git a/bin/runSalome.py b/bin/runSalome.py index 334f5bafb..780e77a77 100755 --- a/bin/runSalome.py +++ b/bin/runSalome.py @@ -309,7 +309,18 @@ class SessionServer(Server): self.CMD=self.SCMD1 + ['\"' + string.join(cata_path,'\"::\"') + '\"'] + self.SCMD2 else: self.CMD=self.SCMD1 + self.SCMD2 - + if self.args["gdb_session"]: + f = open(".gdbinit4salome", "w") + f.write("set args ") + args = " ".join(self.CMD[1:]) + args = args.replace("(", "\(") + args = args.replace(")", "\)") + f.write(args) + f.write("\n") + f.close() + self.CMD = ["xterm", "-e", "gdb", "--command=.gdbinit4salome", self.CMD[0]] + pass + # --- class LauncherServer(Server): diff --git a/configure.ac b/configure.ac index 75f1894e6..453513cc7 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # ================================================================ # #AC_PREREQ(2.59) -AC_INIT([Salome2 Project], [4.1.3], [paul.rascle@edf.fr], [SalomeKer]) +AC_INIT([Salome2 Project], [4.1.4], [paul.rascle@edf.fr], [SalomeKer]) # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary # scripts such as config.guess, install-sh, ... @@ -14,7 +14,7 @@ AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([tar-pax]) #AC_CONFIG_HEADER([config.h]) -XVERSION=0x040103 +XVERSION=0x040104 AC_SUBST(XVERSION) # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) -- 2.39.2