[rkward-cvs] SF.net SVN: rkward: [2023] trunk/rkward

tfry at users.sourceforge.net tfry at users.sourceforge.net
Fri Oct 5 12:47:06 UTC 2007


Revision: 2023
          http://rkward.svn.sourceforge.net/rkward/?rev=2023&view=rev
Author:   tfry
Date:     2007-10-05 05:47:06 -0700 (Fri, 05 Oct 2007)

Log Message:
-----------
Add command line option --debugger

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/TODO
    trunk/rkward/debian/changelog
    trunk/rkward/debian/rkward.1
    trunk/rkward/rkward/main.cpp
    trunk/rkward/rkward/plugin/rkcomponentproperties.cpp
    trunk/rkward/rkward/plugin/rkvarslot.cpp
    trunk/rkward/rkward/rkward.sh.template

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2007-10-05 10:23:50 UTC (rev 2022)
+++ trunk/rkward/ChangeLog	2007-10-05 12:47:06 UTC (rev 2023)
@@ -1,3 +1,4 @@
+- Add command line option "--debugger" for debugging purposes
 - Fixed: Pressing the add button in a varslot with no object selected could crash RKWard
 
 --- Version 0.4.8 - Oct-03-2007

Modified: trunk/rkward/TODO
===================================================================
--- trunk/rkward/TODO	2007-10-05 10:23:50 UTC (rev 2022)
+++ trunk/rkward/TODO	2007-10-05 12:47:06 UTC (rev 2023)
@@ -6,7 +6,7 @@
 	- Around March 1st, write to R-devel to achieve having IS_UTF8 and IS_LATIN1 in public API (if not already available, then).
 		- Is Rf_translateChar() what we are looking for?
 
-Should be fixed for 0.4.8:
+Should be fixed for 0.4.9:
 
 Advertizing:
 	- start being a bit bolder about RKWard (descriptions, startup notification, etc.)

Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2007-10-05 10:23:50 UTC (rev 2022)
+++ trunk/rkward/debian/changelog	2007-10-05 12:47:06 UTC (rev 2023)
@@ -1,3 +1,11 @@
+rkward (0.4.9-1) unstable; urgency=low
+
+  * new upstream release
+  * document --disable-stack-check and --debugger options in the manual page
+	TODO!
+
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Xxx, XX Xxx 2007 13:30:00 +0200
+
 rkward (0.4.8-1) unstable; urgency=low
 
   * new upstream release

Modified: trunk/rkward/debian/rkward.1
===================================================================
--- trunk/rkward/debian/rkward.1	2007-10-05 10:23:50 UTC (rev 2022)
+++ trunk/rkward/debian/rkward.1	2007-10-05 12:47:06 UTC (rev 2023)
@@ -40,6 +40,12 @@
 .TP
 .B \-\-debug-flags <flags>
 Allows to configure, which sections of code to debug. Flags are given as a binary number. Refer to the source files for documentation, as this really is an internal option
+.TP
+.B \-\-debugger <command>
+Run RKWard through the specified debugger command. To add command line options to the debugger command, enclose them in single quotes ('') together with the command.
+.TP
+.B \-\-disable-stack-check
+Disable the R C stack checking mechanism. If you see the error message "C stack usage too close to the limit", this option may serve as a workaround.
 .SH SEE ALSO
 .BR R (1),
 .br

Modified: trunk/rkward/rkward/main.cpp
===================================================================
--- trunk/rkward/rkward/main.cpp	2007-10-05 10:23:50 UTC (rev 2022)
+++ trunk/rkward/rkward/main.cpp	2007-10-05 12:47:06 UTC (rev 2023)
@@ -74,6 +74,7 @@
   { "+[File]", I18N_NOOP ("file to open"), 0 },
   { "debug-level <level>", I18N_NOOP ("Verbosity of debug messages (0-5)"), "2"}, 
   { "debug-flags <flags>", I18N_NOOP ("Mask for components to debug (see debug.h)"), "8191" }, 
+  { "debugger <command>", I18N_NOOP ("Debugger (enclose any debugger arguments in single quotes ('') together with the command)"), ""}, 
   { "disable-stack-check", I18N_NOOP ("Disable R C stack checking"), 0 }, 
   { 0, 0, 0 }
   // INSERT YOUR COMMANDLINE OPTIONS HERE
@@ -108,6 +109,9 @@
 	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 	RK_Debug_Level = 5 - QString (args->getOption ("debug-level")).toInt ();
 	RK_Debug_Flags = QString (args->getOption ("debug-flags")).toInt ();
+	if (!args->getOption ("debugger").isEmpty ()) {
+		RK_DO (qDebug ("--debugger option should have been handled by wrapper script. Ignoring."), ALL, DL_ERROR);
+	}
 
 	RKWardStartupOptions *stoptions = new RKWardStartupOptions;
 	KURL *open_url = 0;

Modified: trunk/rkward/rkward/plugin/rkcomponentproperties.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkcomponentproperties.cpp	2007-10-05 10:23:50 UTC (rev 2022)
+++ trunk/rkward/rkward/plugin/rkcomponentproperties.cpp	2007-10-05 12:47:06 UTC (rev 2023)
@@ -2,7 +2,7 @@
                           rkcomponentproperties  -  description
                              -------------------
     begin                : Fri Nov 25 2005
-    copyright            : (C) 2005, 2006 by Thomas Friedrichsmeier
+    copyright            : (C) 2005, 2006, 2007 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 

Modified: trunk/rkward/rkward/plugin/rkvarslot.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkvarslot.cpp	2007-10-05 10:23:50 UTC (rev 2022)
+++ trunk/rkward/rkward/plugin/rkvarslot.cpp	2007-10-05 12:47:06 UTC (rev 2023)
@@ -2,7 +2,7 @@
                           rkvarslot.cpp  -  description
                              -------------------
     begin                : Thu Nov 7 2002
-    copyright            : (C) 2002 by Thomas Friedrichsmeier
+    copyright            : (C) 2002, 2007 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 

Modified: trunk/rkward/rkward/rkward.sh.template
===================================================================
--- trunk/rkward/rkward/rkward.sh.template	2007-10-05 10:23:50 UTC (rev 2022)
+++ trunk/rkward/rkward/rkward.sh.template	2007-10-05 12:47:06 UTC (rev 2023)
@@ -41,8 +41,32 @@
   echo "Warning: unsetting LC_ALL"
 fi
 
+# handle --debugger argument (if any)
+# the loop partially copied from the R wrapper script
+error () {
+  echo "ERROR: $*" >&2
+  exit 1
+}
+
+debugger=
+args=
+while test -n "${1}"; do
+  case ${1} in
+    --debugger)
+      if test -n "`echo ${2} | sed 's/^-.*//'`"; then
+        debugger="${2}"; shift
+      else
+        error "option '${1}' requires an argument"
+      fi
+      ;;
+    *)
+      args="${args} ${1}" ;;
+  esac
+  shift
+done
+
 ## set LC_NUMERIC to "C"
 export LC_NUMERIC="C"
 
 ## Start rkward. Running through R CMD to set all the relevant R enviroment variables
-exec $R_binary CMD $0.bin "$@"
+exec $R_binary CMD $debugger $0.bin ${args}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the rkward-tracker mailing list