mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 436554 - standalone debugger cannot find pushd/popd on Ubuntu

Browse source 
- Fix cdtdebug.sh to not use pushd/popd
- Fix install.sh script to do proper sed now that pushd is not used

Change-Id: I466af0b0b6e09a53eb11505ce480138b5b538378
Reviewed-on: https://git.eclipse.org/r/28070
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Hudson CI
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
Tested-by: Jeff Johnston <jjohnstn@redhat.com>
This commit is contained in:
Jeff Johnston 2014-06-04 12:08:10 -04:00
parent 25e5cffbdc
commit a02bedd48e
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh
View file

@ -14,7 +14,8 @@ mkdir -p $HOME/cdtdebugger
cp config.ini $HOME/cdtdebugger
cp dev.properties $HOME/cdtdebugger
fi
pushd ../.. >/dev/null
olddir=`pwd`
cd ../..
OSGI_JAR=`ls org.eclipse.osgi_*.jar`
SWT_JAR=`ls org.eclipse.swt.*.jar`
SWT_PLUGIN=`echo $SWT_JAR | sed -e "s/_[0-9]*\..*.jar//"`
@ -23,7 +24,7 @@ FS_PLUGIN=`echo $FS_JAR | sed -e "s/_[0-9]*\..*.jar//"`
LINUX_JAR=`ls org.eclipse.cdt.core.linux.*.jar`
LINUX_PLUGIN=`echo $LINUX_JAR | sed -e "s/_[0-9]*\..*.jar//"`
cd ..; ECLIPSE_HOME=`pwd`
popd >/dev/null
cd $olddir
$ECLIPSE_HOME/eclipse -clean -product org.eclipse.cdt.debug.application.product \
-data $HOME/workspace-gdbstandlone -configuration file\:$HOME/cdtdebugger \
-dev file\:$HOME/cdtdebugger/dev.properties $@ \

9
debug/org.eclipse.cdt.debug.application/scripts/install.sh
View file

@ -16,8 +16,9 @@ cp config.ini $HOME/cdtdebugger
cp dev.properties $HOME/cdtdebugger
cp cdtdebug.sh $HOME/cdtdebugger
chmod +x $HOME/cdtdebugger/cdtdebug.sh
pushd ../.. >/dev/null
olddir=`pwd`
cd ../..
PLUGINS_DIR=`pwd`
popd >/dev/null
sed -i -e "s,pushd ../..,pushd $PLUGINS_DIR," $HOME/cdtdebugger/cdtdebug.sh
echo "Installation complete"
cd $olddir
sed -i -e "s,cd ../..,cd $PLUGINS_DIR," $HOME/cdtdebugger/cdtdebug.sh
echo "Installation complete"