Commit 82223362 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote-tracking branch 'origin/2.5'

Conflicts:
	qtcreator.pri
	src/libs/utils/utils.qbs
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qmljsinspector/qmljsinspector.qbs

Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
parents c863662b ca516cf3
......@@ -78,6 +78,9 @@ doc/api/html/*
doc/pluginhowto/html/*
.rcc
.pch
dist/gdb/qtcreator-*
dist/gdb/source
dist/gdb/staging
# Binaries
# --------
......
broot=${PWD}
source=${broot}/source
targets=x86_64-unknown-linux-gnu i686-unknown-linux-gnu arm-none-linux-gnueabi arm-none-symbianelf
staging=${broot}/staging
pyversion=2.7
expatversion=2.0.1
arch=`uname -sm | sed 's/ /-/g' | tr A-Z a-z`
version=7.4
targetdir=${broot}/qtcreator-gdb-${version}
gdbtargets=$(addprefix ${targetdir}/gdb-, ${targets})
packagename=qtcreator-gdb-${version}-${arch}.tar.gz
all:package
gdb-7.4: override version=7.4
gdb-7.4: ${staging}/lib/libpython${pyversion}.a ${staging}/lib/libexpat.a
${MAKE} version=${version}
clean:
rm -rf ${broot}/qtcreator-gdb-* ${staging}/gdb-* qtcreator-gdb-*.tar.gz
makesourcedir:
test -e ${source} || mkdir ${source}
maketargetdir:
test -e ${targetdir} || mkdir ${targetdir}
makestagingdir:
test -e ${staging} || mkdir ${staging}
${source}/expat-${expatversion}.tar.gz: | makesourcedir
cd ${source}; wget http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz && \
touch ${source}/expat-${expatversion}.tar.gz
${source}/Python-${pyversion}.tgz: | makesourcedir
cd ${source}; wget http://www.python.org/ftp/python/${pyversion}/Python-${pyversion}.tgz && \
touch ${source}/Python-${pyversion}.tgz
${source}/gdb-${version}.tar.bz2: | makesourcedir
cd ${source} &&\
wget http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
wget -O gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
touch gdb-*.tar.bz2
${staging}/lib/libexpat.a: ${source}/expat-${expatversion}.tar.gz | makestagingdir
cd ${staging} && tar xvf ${source}/expat-${expatversion}.tar.gz && cd expat-${expatversion} && \
./configure --disable-shared -prefix=${staging} && ${MAKE} && ${MAKE} install
${staging}/lib/libpython${pyversion}.a: ${source}/Python-${pyversion}.tgz | makestagingdir
unset PYTHONHOME && cd ${staging} && tar xvf ${source}/Python-${pyversion}.tgz && cd Python-${pyversion} && \
export LDFLAGS="-pthread -lm" && \
./configure --prefix=${staging} && ${MAKE} && ${MAKE} install
${targetdir}/python/include/python${pyversion}/pyconfig.h: ${staging}/lib/libpython${pyversion}.a | maketargetdir
mkdir -p ${targetdir}/python/lib && cp -a ${staging}/lib/python${pyversion} ${targetdir}/python/lib/
mkdir -p ${targetdir}/python/include/python${pyversion} && cp ${staging}/include/python${pyversion}/pyconfig.h ${targetdir}/python/include/python${pyversion}/
${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestagingdir
cd ${staging} && \
tar xvf ${source}/gdb-${version}.tar.bz2 && \
cd gdb-${version} && \
touch configure && \
patch -p2 < ${broot}/patches/pythonhome-7.4.patch && \
patch -p1 < ${broot}/patches/gdb-buildid-locate.patch && \
patch -p1 < ${broot}/patches/gdb-ipv6.patch && \
patch -p1 < ${broot}/patches/gdb-work-around-trk-single-step.patch
${gdbtargets}: ${targetdir}/gdb-%: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${pyversion}.a ${staging}/lib/libexpat.a | maketargetdir
test -e ${staging}/gdb-${version}-$* || mkdir ${staging}/gdb-${version}-$*
export PYTHONHOME=${staging} && \
export PATH="${staging}/bin/:$$PATH" && \
export LDFLAGS="-pthread -lm" && \
cd ${staging}/gdb-${version}-$* && \
${staging}/gdb-${version}/configure --disable-nls --target=$* --with-python=${staging} --with-libexpat-prefix=${staging} && \
sleep 3 && \
${MAKE} MAKEFLAGS+=-j1 && \
strip gdb/gdb && \
cp -T gdb/gdb ${targetdir}/gdb-$*
${targetdir}/gdb: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${pyversion}.a ${staging}/lib/libexpat.a | maketargetdir
test -e ${staging}/gdb-${version}-${arch} || mkdir ${staging}/gdb-${version}-${arch}
export PYTHONHOME=${staging} && \
export PATH="${staging}/bin/:$$PATH" && \
export LDFLAGS="-pthread -lm" && \
cd ${staging}/gdb-${version}-${arch} && \
${staging}/gdb-${version}/configure --disable-nls --with-python=${staging} --with-libexpat-prefix=${staging} && \
${MAKE} MAKEFLAGS+=-j1 && \
strip gdb/gdb && \
cp -T gdb/gdb ${targetdir}/gdb
package: ${gdbtargets} ${targetdir}/gdb ${targetdir}/python/include/python${pyversion}/pyconfig.h
mv ${targetdir} ${targetdir}-${arch}
tar cvzf ${packagename} qtcreator-gdb-${version}-${arch}
mv ${targetdir}-${arch} ${targetdir}
broot=${PWD}
source=${broot}/source
targets=arm-none-symbianelf arm-none-linux-gnueabi i686-pc-mingw32
staging=${broot}/staging
pyversion=2.7
pydir=${broot}/python
expatversion=2.0.1
iconvversion=1.14
version=7.4
targetdir=${broot}/qtcreator-gdb-${version}
gdbtargets=$(addprefix ${targetdir}/gdb-, ${targets})
packageparts=${targetdir}/lib ${targetdir}/lib ${targetdir}/libiconv-2.dll ${targetdir}/python27.dll ${targetdir}/libexpat-1.dll
arch=`uname -sm | sed 's/ /-/g' | tr A-Z a-z`
packagename=qtcreator-gdb-${version}-${arch}.tar.gz
all: package
gdb-7.4: override version=7.4
gdb-7.4:
${MAKE} version=${version}
clean:
rm -rf ${broot}/qtcreator-gdb-* ${staging}/gdb-*
distclean:
rm -rf ${staging} ${source} ${broot}/qtcreator-gdb-*
makesourcedir:
test -e ${source} || mkdir ${source}
maketargetdir:
test -e ${targetdir} || mkdir ${targetdir}
makestagingdir:
test -e ${staging} || mkdir ${staging}
checkwget:
wget -V &> /dev/null || mingw-get install msys-wget-bin
${source}/gdb-${version}.tar.bz2: | makesourcedir checkwget
cd ${source} && \
wget http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
wget -O gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
touch gdb-${version}.tar.bz2
${source}/libiconv-${iconvversion}.tar.gz: | makesourcedir checkwget
cd ${source} && \
wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${iconvversion}.tar.gz && \
touch ${source}/libiconv-${iconvversion}.tar.gz
${source}/expat-${expatversion}.tar.gz: | makesourcedir checkwget
cd ${source} &&\
wget http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz/download && \
touch ${source}/expat-${expatversion}.tar.gz
${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestagingdir
cd ${staging} && \
tar xvf ${source}/gdb-${version}.tar.bz2 && \
cd gdb-${version} && \
touch configure && \
patch -p1 < ${broot}/patches/gdb-ipv6.patch && \
patch -p1 < ${broot}/patches/gdb-target-debugging.patch
${staging}/lib/libiconv.a: ${source}/libiconv-${iconvversion}.tar.gz | makestagingdir
cd ${staging} && \
tar xvf ${source}/libiconv-${iconvversion}.tar.gz && \
cd libiconv-${iconvversion} && \
./configure -prefix=${staging} --enable-static && \
${MAKE} && ${MAKE} install
${staging}/lib/libexpat.a: ${source}/expat-${expatversion}.tar.gz | makestagingdir
cd ${staging} && \
tar xvf ${source}/expat-${expatversion}.tar.gz && \
cd expat-${expatversion} && \
./configure -prefix=${staging} --enable-static && \
${MAKE} && ${MAKE} install
${gdbtargets}: ${targetdir}/gdb-%: ${staging}/lib/libexpat.a ${staging}/lib/libiconv.a ${staging}/gdb-${version}/configure | maketargetdir
test -e ${staging}/gdb-${version}-$* || mkdir ${staging}/gdb-${version}-$*
export PYTHONHOME=${pydir} && \
LDFLAGS="L${pydir} -lpthread -ldl -lutil -lpython27" && \
CFLAGS="-I${pydir}/include" && \
cd ${staging}/gdb-${version}-$* && \
${staging}/gdb-${version}/configure --target=$* --disable-nls \
--with-libiconv-prefix=${staging} \
--with-expat --with-libexpat-prefix=${staging} \
--with-python=${pydir} &&\
${MAKE} MAKEFLAGS+= -j1 &&\
strip gdb/gdb.exe && \
cp -T gdb/gdb.exe ${targetdir}/gdb-$*.exe
package: ${gdbtargets}
cp ${staging}/bin/libiconv* ${targetdir} && \
cp ${staging}/bin/libexpat* ${targetdir} && \
cp ${pydir}/python*.dll ${targetdir} && \
cp -r ${pydir}/lib ${targetdir} && \
cp -r ${pydir}/include ${targetdir} && \
mv ${targetdir} ${targetdir}-${arch} && \
tar cvzf ${packagename} qtcreator-gdb-${version}-${arch} && \
mv ${targetdir}-${arch} ${targetdir}
broot=${PWD}
source=${broot}/source
targets=x86_64-unknown-linux-gnu i686-unknown-linux-gnu arm-none-linux-gnueabi arm-none-symbianelf
staging=${broot}/staging
pyversion=2.7
expatversion=2.0.1
arch=`uname -sm | sed 's/ /-/g' | tr A-Z a-z`
version=7.4
targetdir=${broot}/qtcreator-gdb-${version}
gdbtargets=$(addprefix ${targetdir}/gdb-, ${targets})
packagename=qtcreator-gdb-${version}-${arch}.tar.gz
all:package
gdb-7.4: override version=7.4
gdb-7.4: ${staging}/lib/libpython${pyversion}.a ${staging}/lib/libexpat.a
${MAKE} version=${version}
clean:
rm -rf ${broot}/qtcreator-gdb-* ${staging}/gdb-* qtcreator-gdb-*.tar.gz
makesourcedir:
test -e ${source} || mkdir ${source}
maketargetdir:
test -e ${targetdir} || mkdir ${targetdir}
makestagingdir:
test -e ${staging} || mkdir ${staging}
${source}/expat-${expatversion}.tar.gz: | makesourcedir
cd ${source}; curl -LOf http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz && \
touch ${source}/expat-${expatversion}.tar.gz
${source}/Python-${pyversion}.tgz: | makesourcedir
cd ${source}; curl -Of http://www.python.org/ftp/python/${pyversion}/Python-${pyversion}.tgz && \
touch ${source}/Python-${pyversion}.tgz
${source}/gdb-${version}.tar.bz2: | makesourcedir
cd ${source} && \
curl -Of http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
curl -of gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
touch gdb-*.tar.bz2
${staging}/lib/libexpat.a: ${source}/expat-${expatversion}.tar.gz | makestagingdir
cd ${staging} && tar xvf ${source}/expat-${expatversion}.tar.gz && cd expat-${expatversion} && \
./configure --disable-shared -prefix=/ && ${MAKE} && ${MAKE} install
${staging}/lib/libpython${pyversion}.a: ${source}/Python-${pyversion}.tgz | makestagingdir
unset PYTHONHOME && cd ${staging} && tar xvf ${source}/Python-${pyversion}.tgz && cd Python-${pyversion} && \
./configure --prefix=${staging} && ${MAKE} && ${MAKE} install
${targetdir}/python/include/python${pyversion}/pyconfig.h: ${staging}/lib/libpython${pyversion}.a | maketargetdir
mkdir -p ${targetdir}/python/lib && cp -a ${staging}/lib/python${pyversion} ${targetdir}/python/lib/
mkdir -p ${targetdir}/python/include/python${pyversion} && cp ${staging}/include/python${pyversion}/pyconfig.h ${targetdir}/python/include/python${pyversion}/
${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestagingdir
cd ${staging} && \
tar xvf ${source}/gdb-${version}.tar.bz2 && \
cd gdb-${version} && \
touch configure && \
patch -p2 < ${broot}/patches/pythonhome-${version}.patch && \
patch -p1 < ${broot}/patches/gdb-ipv6.patch
${gdbtargets}: ${targetdir}/gdb-%: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${pyversion}.a ${staging}/lib/libexpat.a | maketargetdir
test -e ${staging}/gdb-${version}-$* || mkdir ${staging}/gdb-${version}-$*
export PYTHONHOME=${staging} && \
export PATH="${staging}/bin/:$$PATH" && \
cd ${staging}/gdb-${version}-$* && \
${staging}/gdb-${version}/configure --disable-nls --target=$* --with-python=${staging} --with-libexpat-prefix=${staging} && \
${MAKE} MAKEFLAGS+=-j1 && \
strip gdb/gdb && \
mv gdb/gdb ${targetdir}/gdb-$*
${targetdir}/gdb: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${pyversion}.a ${staging}/lib/libexpat.a | maketargetdir
test -e ${staging}/gdb-${version}-${arch} || mkdir ${staging}/gdb-${version}-${arch}
export PYTHONHOME=${staging} && \
export PATH="${staging}/bin/:$$PATH" && \
cd ${staging}/gdb-${version}-${arch} && \
${staging}/gdb-${version}/configure --disable-nls --with-python=${staging} --with-libexpat-prefix=${staging} --disable-werror && \
${MAKE} MAKEFLAGS+=-j1 && \
strip gdb/gdb && \
mv gdb/gdb ${targetdir}/gdb
package: ${gdbtargets} ${targetdir}/gdb ${targetdir}/python/include/python${pyversion}/pyconfig.h
mv ${targetdir} ${targetdir}-${arch}
tar cvzf ${packagename} qtcreator-gdb-${version}-${arch}
mv ${targetdir}-${arch} ${targetdir}
This diff is collapsed.
This diff is collapsed.
--- src/gdb/infcmd.c 2012/02/15 19:13:13
+++ src/gdb/infcmd.c 2012/02/23 08:15:04
@@ -1636,6 +1636,7 @@
static void
finish_forward (struct symbol *function, struct frame_info *frame)
{
+ struct frame_id frame_id = get_frame_id (frame);
struct gdbarch *gdbarch = get_frame_arch (frame);
struct symtab_and_line sal;
struct thread_info *tp = inferior_thread ();
@@ -1653,7 +1654,7 @@
old_chain = make_cleanup_delete_breakpoint (breakpoint);
- set_longjmp_breakpoint (tp, get_frame_id (frame));
+ set_longjmp_breakpoint (tp, frame_id);
make_cleanup (delete_longjmp_breakpoint_cleanup, &thread);
/* We want stop_registers, please... */
*** source/gdb-7.4/gdb/python/python.c 2012-02-01 10:39:59.812953656 +0100
--- staging/gdb-7.4/gdb/python/python.c 2012-02-01 10:33:45.842953480 +0100
***************
*** 32,38 ****
#include "serial.h"
#include "readline/tilde.h"
#include "python.h"
!
#include <ctype.h>
/* Declared constants and enum for python stack printing. */
--- 32,38 ----
#include "serial.h"
#include "readline/tilde.h"
#include "python.h"
! #include <libgen.h>
#include <ctype.h>
/* Declared constants and enum for python stack printing. */
***************
*** 1273,1278 ****
--- 1273,1288 ----
SLASH_STRING, "python", NULL));
#endif
+
+ char readlinkbuffer[BUFSIZ];
+ int readlinks = readlink("/proc/self/exe", readlinkbuffer, BUFSIZ - 1);
+ readlinkbuffer[readlinks] = 0;
+ char *executeablepath = dirname(readlinkbuffer);
+ char *pythonhome = malloc(strlen(executeablepath) + strlen("/python/") + 2);
+ strcpy(pythonhome, executeablepath);
+ strcat(pythonhome, "/python/");
+ setenv("PYTHONHOME", pythonhome, 1);
+
Py_Initialize ();
PyEval_InitThreads ();
doc/images/qml-inspector-app-on-top.png

542 Bytes | W: | H:

doc/images/qml-inspector-app-on-top.png

547 Bytes | W: | H:

doc/images/qml-inspector-app-on-top.png
doc/images/qml-inspector-app-on-top.png
doc/images/qml-inspector-app-on-top.png
doc/images/qml-inspector-app-on-top.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qml-inspector-pause.png

724 Bytes | W: | H:

doc/images/qml-inspector-pause.png

728 Bytes | W: | H:

doc/images/qml-inspector-pause.png
doc/images/qml-inspector-pause.png
doc/images/qml-inspector-pause.png
doc/images/qml-inspector-pause.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qml-inspector-play.png

930 Bytes | W: | H:

doc/images/qml-inspector-play.png

726 Bytes | W: | H:

doc/images/qml-inspector-play.png
doc/images/qml-inspector-play.png
doc/images/qml-inspector-play.png
doc/images/qml-inspector-play.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qml-inspector-select-button.png

894 Bytes | W: | H:

doc/images/qml-inspector-select-button.png

672 Bytes | W: | H:

doc/images/qml-inspector-select-button.png
doc/images/qml-inspector-select-button.png
doc/images/qml-inspector-select-button.png
doc/images/qml-inspector-select-button.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qml-observer-bar-copy-color.png

371 Bytes | W: | H:

doc/images/qml-observer-bar-copy-color.png

384 Bytes | W: | H:

doc/images/qml-observer-bar-copy-color.png
doc/images/qml-observer-bar-copy-color.png
doc/images/qml-observer-bar-copy-color.png
doc/images/qml-observer-bar-copy-color.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qml-observer-bar-observe.png

964 Bytes | W: | H:

doc/images/qml-observer-bar-observe.png

726 Bytes | W: | H:

doc/images/qml-observer-bar-observe.png
doc/images/qml-observer-bar-observe.png
doc/images/qml-observer-bar-observe.png
doc/images/qml-observer-bar-observe.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qml-observer-bar-reload.png

826 Bytes | W: | H:

doc/images/qml-observer-bar-reload.png

708 Bytes | W: | H:

doc/images/qml-observer-bar-reload.png
doc/images/qml-observer-bar-reload.png
doc/images/qml-observer-bar-reload.png
doc/images/qml-observer-bar-reload.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qml-observer-buttons.png

1.75 KB | W: | H:

doc/images/qml-observer-buttons.png

1.23 KB | W: | H:

doc/images/qml-observer-buttons.png
doc/images/qml-observer-buttons.png
doc/images/qml-observer-buttons.png
doc/images/qml-observer-buttons.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment