diff --git a/debug/org.eclipse.cdt.debug.application/scripts/README b/debug/org.eclipse.cdt.debug.application/scripts/README index 29615408067..8a34b12fb2b 100644 --- a/debug/org.eclipse.cdt.debug.application/scripts/README +++ b/debug/org.eclipse.cdt.debug.application/scripts/README @@ -13,13 +13,13 @@ The script uses relative directories so you cannot run the script from any other The install script will create a cdtdebugger directory in your $HOME directory. This directory will contain a config.ini file, a dev.properties file, and a cdtdebug.sh script. -The cdtdebug.sh script will start the debugger from the command-line. It does not -have relative directories so you can move it around as you like. +The cdtdebug.sh script will start the debugger from the command-line. The cdtdebug.sh script +does not have to be located in the cdtdebugger directory and can be moved if you prefer. The script takes a few options which are mentioned below: -data : workspace to use for your Eclipse session if you do not want the default - $HOME/workspace-gdbstandalone + $HOME/workspace-cdtdebug -consoleLog : if you want error messages reported directly to the command console @@ -38,15 +38,16 @@ The script takes a few options which are mentioned below: not precede any other arguments as they will be treated as arguments to main. -If no -a or -e option is specified, the last executable debugged will be offered for +If no -a or -e option is specified, the last executable debugged via -e will be offered for debugging. Otherwise, if this is the first time, a dialog will be presented to enter an executable, build log, and program arguments. e.g. sh ~/cdtdebugger/cdtdebug.sh -b ~/build.log ~/myproject/bin/a.out arg1 arg2 The cdtdebug.sh script that is found in the plug-in can also be run directly, but only -in this scripts directory as it uses relative directories to find the Eclipse instance and -the plugins directory. +from the scripts directory as it uses relative directories to find the Eclipse instance and +the plugins directory. The one installed in the cdtdebugger directory replaces these +relative directory references with absolute ones. e.g. sh ./cdtdebug.sh -b ~/build.log ~/myproject/bin/a.out arg1 arg2 diff --git a/debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh b/debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh index 45385049ec8..404da848552 100755 --- a/debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh +++ b/debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh @@ -26,7 +26,7 @@ LINUX_PLUGIN=`echo $LINUX_JAR | sed -e "s/_[0-9]*\..*.jar//"` cd ..; ECLIPSE_HOME=`pwd` cd $olddir $ECLIPSE_HOME/eclipse -clean -product org.eclipse.cdt.debug.application.product \ --data $HOME/workspace-gdbstandlone -configuration file\:$HOME/cdtdebugger \ +-data $HOME/workspace-cdtdebug -configuration file\:$HOME/cdtdebugger \ -dev file\:$HOME/cdtdebugger/dev.properties $@ \ -vmargs -Dosgi.jar=$OSGI_JAR -Dswt.plugin=$SWT_PLUGIN -Dfs.plugin=$FS_PLUGIN \ -Dlinux.plugin=$LINUX_PLUGIN -Declipse.home=$ECLIPSE_HOME