[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-197-gbe1abdd
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-197-gbe1abdd
|
From: jscheer <js...@us...> - 2012-03-26 15:34:42
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via be1abdd92646fc03af296b221b7b32d7214bfc7b (commit)
via 7cfc9e3b8c3fdec2aa7fed7dda3a569e467eb480 (commit)
from 99b1da5d037a7834128262d864cc20a647ff230f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit be1abdd92646fc03af296b221b7b32d7214bfc7b
Merge: 7cfc9e3 99b1da5
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Mar 26 17:34:07 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 7cfc9e3b8c3fdec2aa7fed7dda3a569e467eb480
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Mar 26 17:33:24 2012 +0200
[BUILDROOT] Add a menu in QtCreator to open a remote console in patch 181.
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/181-qtcreator-add_package.patch | 379 +++++++++++++++++++-
1 files changed, 368 insertions(+), 11 deletions(-)
diff --git a/patches/buildroot/2012.02/181-qtcreator-add_package.patch b/patches/buildroot/2012.02/181-qtcreator-add_package.patch
index 0cec8c2..f4f3bab 100644
--- a/patches/buildroot/2012.02/181-qtcreator-add_package.patch
+++ b/patches/buildroot/2012.02/181-qtcreator-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/Config.in.host
===================================================================
---- buildroot.orig/package/Config.in.host 2012-03-23 17:26:40.000000000 +0100
-+++ buildroot/package/Config.in.host 2012-03-23 17:28:35.000000000 +0100
+--- buildroot.orig/package/Config.in.host 2012-02-29 23:19:47.000000000 +0100
++++ buildroot/package/Config.in.host 2012-03-26 16:21:47.000000000 +0200
@@ -3,5 +3,6 @@
source "package/openocd/Config.in.host"
source "package/sam-ba/Config.in.host"
@@ -16,7 +16,7 @@ Index: buildroot/package/Config.in.host
Index: buildroot/package/qtcreator/Config.in.host
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtcreator/Config.in.host 2012-03-23 17:28:53.000000000 +0100
++++ buildroot/package/qtcreator/Config.in.host 2012-03-26 16:21:47.000000000 +0200
@@ -0,0 +1,68 @@
+menuconfig BR2_PACKAGE_HOST_QTCREATOR
+ bool "host qtcreator"
@@ -89,7 +89,7 @@ Index: buildroot/package/qtcreator/Config.in.host
Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_gdb_server_script.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtcreator/qtcreator-2.2.1-create_gdb_server_script.patch 2012-03-26 15:37:29.000000000 +0200
++++ buildroot/package/qtcreator/qtcreator-2.2.1-create_gdb_server_script.patch 2012-03-26 16:21:47.000000000 +0200
@@ -0,0 +1,52 @@
+Create GDB default server script.
+
@@ -146,7 +146,7 @@ Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_gdb_server_script.patc
Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_toolchains_file.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtcreator/qtcreator-2.2.1-create_toolchains_file.patch 2012-03-26 10:44:58.000000000 +0200
++++ buildroot/package/qtcreator/qtcreator-2.2.1-create_toolchains_file.patch 2012-03-26 16:21:47.000000000 +0200
@@ -0,0 +1,30 @@
+Create toolchains file with default configuration for Armadeus boards.
+
@@ -181,8 +181,8 @@ Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_toolchains_file.patch
Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.patch 2012-03-26 10:44:58.000000000 +0200
-@@ -0,0 +1,306 @@
++++ buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.patch 2012-03-26 17:01:06.000000000 +0200
+@@ -0,0 +1,308 @@
+Create user settings file with default configuration for Armadeus boards.
+
+Signed-off-by: Jérémie SCHEER <jer...@ar...>
@@ -191,7 +191,7 @@ Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.pat
+===================================================================
+--- qtcreator-2.2.1.orig/dev/null 2012-03-15 09:21:31.258893004 +0100
++++ qtcreator-2.2.1/QtCreator.ini 2012-03-15 11:26:23.000000000 +0100
-+@@ -0,0 +1,297 @@
++@@ -0,0 +1,299 @@
++[General]
++DefaultQtVersion=4
++ViewGroup_Default=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x5V\0\0\x2\x9c\0\0\0\x4\0\0\0\x4\0\0\0\x1\0\0\0\b\xfc\0\0\0\0)
@@ -366,6 +366,8 @@ Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.pat
++LastServerStartScript=SERVER_SCRIPT
++LastUseServerStartScript=USE_GDB_SCRIPT
++LastSysroot=GDB_SYSROOT
+++LastPrivateKeyPath=DEBUG_CONSOLE_KEY_PATH
+++LastRemoteIp=DEBUG_CONSOLE_REMOTE_IP
++
++[FakeVim]
++UseFakeVim=false
@@ -492,7 +494,7 @@ Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.pat
Index: buildroot/package/qtcreator/qtcreator-2.2.1-set_user_settings_path.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtcreator/qtcreator-2.2.1-set_user_settings_path.patch 2012-03-26 10:44:58.000000000 +0200
++++ buildroot/package/qtcreator/qtcreator-2.2.1-set_user_settings_path.patch 2012-03-26 16:21:47.000000000 +0200
@@ -0,0 +1,17 @@
+Set QtCreator user settings path to host directory.
+
@@ -514,8 +516,8 @@ Index: buildroot/package/qtcreator/qtcreator-2.2.1-set_user_settings_path.patch
Index: buildroot/package/qtcreator/qtcreator.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtcreator/qtcreator.mk 2012-03-26 15:35:00.000000000 +0200
-@@ -0,0 +1,126 @@
++++ buildroot/package/qtcreator/qtcreator.mk 2012-03-26 17:16:31.000000000 +0200
+@@ -0,0 +1,130 @@
+#############################################################
+#
+# QtCreator
@@ -558,6 +560,8 @@ Index: buildroot/package/qtcreator/qtcreator.mk
+ $(SED) "s:GDB_SYSROOT:$(TARGET_DIR):" $(@D)/QtCreator.ini
+ $(SED) "s:SERVER_SCRIPT:$(HOST_DIR)/etc/Nokia/gdb_server_script:" $(@D)/QtCreator.ini
+ $(SED) "s:USE_GDB_SCRIPT:true:" $(@D)/QtCreator.ini
++ $(SED) "s:DEBUG_CONSOLE_KEY_PATH:$(HOST_DIR)/etc/ssh/id_dsa:" $(@D)/QtCreator.ini
++ $(SED) "s:DEBUG_CONSOLE_REMOTE_IP:$(BR2_PACKAGE_HOST_QTCREATOR_GDB_SERVER_IP):" $(@D)/QtCreator.ini
+endef
+
+define HOST_QTCREATOR_FILL_GDB_SERVER_SCRIPT
@@ -578,6 +582,8 @@ Index: buildroot/package/qtcreator/qtcreator.mk
+ $(SED) "s:GDB_SYSROOT::" $(@D)/QtCreator.ini
+ $(SED) "s:SERVER_SCRIPT::" $(@D)/QtCreator.ini
+ $(SED) "s:USE_GDB_SCRIPT:false:" $(@D)/QtCreator.ini
++ $(SED) "s:DEBUG_CONSOLE_KEY_PATH::" $(@D)/QtCreator.ini
++ $(SED) "s:DEBUG_CONSOLE_REMOTE_IP::" $(@D)/QtCreator.ini
+endef
+
+define HOST_QTCREATOR_FILL_GDB_SERVER_SCRIPT
@@ -642,3 +648,354 @@ Index: buildroot/package/qtcreator/qtcreator.mk
+
+
+$(eval $(call GENTARGETS,host))
+Index: buildroot/package/qtcreator/qtcreator-2.2.1-create_remote_console_open_menu.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtcreator/qtcreator-2.2.1-create_remote_console_open_menu.patch 2012-03-26 17:25:46.000000000 +0200
+@@ -0,0 +1,346 @@
++Create a new menu in QtCreator to open a remote console.
++
++Signed-off-by: Jérémie SCHEER <jer...@ar...>
++
++Index: qtcreator-2.2.1/src/plugins/debugger/debugger.pro
++===================================================================
++--- qtcreator-2.2.1.orig/src/plugins/debugger/debugger.pro 2012-03-23 18:01:18.000000000 +0100
+++++ qtcreator-2.2.1/src/plugins/debugger/debugger.pro 2012-03-23 14:00:19.000000000 +0100
++@@ -116,7 +116,8 @@
++ commonoptionspage.ui \
++ startexternaldialog.ui \
++ startremotedialog.ui \
++- startremoteenginedialog.ui
+++ startremoteenginedialog.ui \
+++ remoteconsoledialog.ui
++
++ RESOURCES += debugger.qrc
++
++
++Index: qtcreator-2.2.1/src/plugins/debugger/debuggerdialogs.cpp
++===================================================================
++--- qtcreator-2.2.1.orig/src/plugins/debugger/debuggerdialogs.cpp 2012-03-23 18:01:33.000000000 +0100
+++++ qtcreator-2.2.1/src/plugins/debugger/debuggerdialogs.cpp 2012-03-23 14:38:03.000000000 +0100
++@@ -40,6 +40,7 @@
++ #include "ui_startexternaldialog.h"
++ #include "ui_startremotedialog.h"
++ #include "ui_startremoteenginedialog.h"
+++#include "ui_remoteconsoledialog.h"
++
++ #ifdef Q_OS_WIN
++ # include "shared/dbgwinutils.h"
++@@ -758,6 +759,53 @@
++ m_ui->serverStartScript->setEnabled(enabled);
++ }
++
+++
+++///////////////////////////////////////////////////////////////////////
+++//
+++// RemoteConsoleDialog
+++//
+++///////////////////////////////////////////////////////////////////////
+++
+++RemoteConsoleDialog::RemoteConsoleDialog(QWidget *parent)
+++ : QDialog(parent),
+++ m_ui(new Ui::RemoteConsoleDialog)
+++{
+++ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+++ m_ui->setupUi(this);
+++ m_ui->mButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+++ m_ui->mPrivateKeyPathChooser->setExpectedKind(PathChooser::File);
+++ m_ui->mPrivateKeyPathChooser->setPromptDialogTitle(tr("Select Private Key"));
+++
+++ connect(m_ui->mButtonBox, SIGNAL(accepted()), this, SLOT(accept()));
+++ connect(m_ui->mButtonBox, SIGNAL(rejected()), this, SLOT(reject()));
+++}
+++
+++RemoteConsoleDialog::~RemoteConsoleDialog()
+++{
+++ delete m_ui;
+++}
+++
+++void RemoteConsoleDialog::setPrivateKeyPath(const QString &aKeyPath)
+++{
+++ m_ui->mPrivateKeyPathChooser->setPath(aKeyPath);
+++}
+++
+++const QString& RemoteConsoleDialog::privateKeyPath() const
+++{
+++ return m_ui->mPrivateKeyPathChooser->path();
+++}
+++
+++void RemoteConsoleDialog::setRemoteIp(const QString &aRemoteIp)
+++{
+++ m_ui->mRemoteIpLineEdit->setText(aRemoteIp);
+++}
+++
+++const QString& RemoteConsoleDialog::remoteIp() const
+++{
+++ return m_ui->mRemoteIpLineEdit->text();
+++}
+++
+++
++ // --------- StartRemoteCdbDialog
++ static inline QString cdbRemoteHelp()
++ {
++
++Index: qtcreator-2.2.1/src/plugins/debugger/debuggerdialogs.h
++===================================================================
++--- qtcreator-2.2.1.orig/src/plugins/debugger/debuggerdialogs.h 2012-03-23 18:01:44.000000000 +0100
+++++ qtcreator-2.2.1/src/plugins/debugger/debuggerdialogs.h 2012-03-23 14:34:36.000000000 +0100
++@@ -48,6 +48,7 @@
++ class StartExternalDialog;
++ class StartRemoteDialog;
++ class StartRemoteEngineDialog;
+++class RemoteConsoleDialog;
++ } // namespace Ui
++
++ QT_END_NAMESPACE
++@@ -204,6 +205,24 @@
++ Ui::StartRemoteDialog *m_ui;
++ };
++
+++class RemoteConsoleDialog : public QDialog
+++{
+++ Q_OBJECT
+++
+++public:
+++ explicit RemoteConsoleDialog(QWidget *parent);
+++ ~RemoteConsoleDialog();
+++
+++ const QString& privateKeyPath() const;
+++ void setPrivateKeyPath(const QString &aKeyPath);
+++
+++ const QString& remoteIp() const;
+++ void setRemoteIp(const QString &aRemoteIp);
+++
+++private:
+++ Ui::RemoteConsoleDialog *m_ui;
+++};
+++
++ class StartRemoteCdbDialog : public QDialog
++ {
++ Q_OBJECT
++
++Index: qtcreator-2.2.1/src/plugins/debugger/debuggerdialogs.h
++===================================================================
++--- qtcreator-2.2.1.orig/src/plugins/debugger/debuggerplugin.cpp 2012-03-23 18:02:06.000000000 +0100
+++++ qtcreator-2.2.1/src/plugins/debugger/debuggerplugin.cpp 2012-03-23 15:45:36.000000000 +0100
++@@ -111,6 +111,7 @@
++
++ #include <QtCore/QTimer>
++ #include <QtCore/QtPlugin>
+++#include <QtCore/QProcess>
++ #include <QtGui/QComboBox>
++ #include <QtGui/QDockWidget>
++ #include <QtGui/QFileDialog>
++@@ -388,6 +389,7 @@
++ const char * const ADD_TO_WATCH2 = "Debugger.AddToWatch2";
++ const char * const FRAME_UP = "Debugger.FrameUp";
++ const char * const FRAME_DOWN = "Debugger.FrameDown";
+++const char * const REMOTE_CONSOLE = "Debugger.RemoteConsole";
++
++ #ifdef Q_WS_MAC
++ const char * const STOP_KEY = "Shift+Ctrl+Y";
++@@ -404,6 +406,7 @@
++ const char * const BREAK_AT_MAIN_KEY = "Ctrl+D,Ctrl+M";
++ const char * const ADD_TO_WATCH_KEY = "Ctrl+D,Ctrl+W";
++ const char * const SNAPSHOT_KEY = "Ctrl+D,Ctrl+S";
+++const char * const REMOTE_CONSOLE_KEY = "Ctrl+Shift+C";
++ #else
++ const char * const STOP_KEY = "Shift+F5";
++ const char * const RESET_KEY = "Ctrl+Shift+F5";
++@@ -419,6 +422,7 @@
++ const char * const BREAK_AT_MAIN_KEY = "";
++ const char * const ADD_TO_WATCH_KEY = "Ctrl+Alt+Q";
++ const char * const SNAPSHOT_KEY = "Ctrl+D,Ctrl+S";
+++const char * const REMOTE_CONSOLE_KEY = "Ctrl+Shift+C";
++ #endif
++
++ } // namespace Constants
++@@ -931,6 +935,26 @@
++ currentEngine()->frameUp();
++ }
++
+++ void handleRemoteConsole()
+++ {
+++ RemoteConsoleDialog dlg(mainWindow());
+++
+++ dlg.setPrivateKeyPath(configValue(_("LastPrivateKeyPath")).toString());
+++ dlg.setRemoteIp(configValue(_("LastRemoteIp")).toString());
+++
+++ if (dlg.exec() != QDialog::Accepted)
+++ return;
+++
+++ setConfigValue(_("LastPrivateKeyPath"), dlg.privateKeyPath());
+++ setConfigValue(_("LastRemoteIp"), dlg.remoteIp());
+++
+++ QString privateKey = dlg.privateKeyPath();
+++ QString remoteIp = dlg.remoteIp();
+++
+++ QProcess* process = new QProcess;
+++ process->start("xterm", QStringList() << "-e" << "ssh" << "-i" << privateKey << "root@" + remoteIp);
+++ }
+++
++ void handleOperateByInstructionTriggered(bool operateByInstructionTriggered)
++ {
++ // Go to source only if we have the file.
++@@ -1004,6 +1028,7 @@
++ QAction *m_reverseDirectionAction;
++ QAction *m_frameUpAction;
++ QAction *m_frameDownAction;
+++ QAction *m_RemoteConsoleAction;
++
++ QToolButton *m_reverseToolButton;
++
++@@ -1924,6 +1949,8 @@
++ action(ExpandStack)->setEnabled(false);
++
++ m_scriptConsoleWindow->setEnabled(false);
+++
+++ m_RemoteConsoleAction->setEnabled(true);
++ }
++
++ void DebuggerPluginPrivate::updateWatchersWindow()
++@@ -2630,6 +2657,9 @@
++ act = m_frameUpAction = new QAction(tr("Move to Calling Frame"), this);
++ connect(act, SIGNAL(triggered()), SLOT(handleFrameUp()));
++
+++ act = m_RemoteConsoleAction = new QAction(tr("Open Remote Console"), this);
+++ connect(act, SIGNAL(triggered()), SLOT(handleRemoteConsole()));
+++
++ connect(action(OperateByInstruction), SIGNAL(triggered(bool)),
++ SLOT(handleOperateByInstructionTriggered(bool)));
++
++@@ -2904,6 +2934,16 @@
++ //cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+D,Ctrl+W")));
++ debugMenu->addAction(cmd);
++
+++ sep = new QAction(this);
+++ sep->setSeparator(true);
+++ cmd = am->registerAction(sep, _("Debugger.Sep.Console"), globalcontext);
+++ debugMenu->addAction(cmd);
+++
+++ cmd = am->registerAction(m_RemoteConsoleAction,
+++ Constants::REMOTE_CONSOLE, globalcontext);
+++ cmd->setDefaultKeySequence(QKeySequence(Constants::REMOTE_CONSOLE_KEY));
+++ debugMenu->addAction(cmd);
+++
++ // If the CppEditor plugin is there, we want to add something to
++ // the editor context menu.
++ if (ActionContainer *editorContextMenu =
++
++Index: qtcreator-2.2.1/src/plugins/debugger/debuggerdialogs.h
++===================================================================
++--- qtcreator-2.2.1.orig/src/plugins/debugger/dev/null 1970-01-01 01:00:00.000000000 +0100
+++++ qtcreator-2.2.1/src/plugins/debugger/remoteconsoledialog.ui 2012-03-23 14:10:40.000000000 +0100
++@@ -0,0 +1,109 @@
+++<?xml version="1.0" encoding="UTF-8"?>
+++<ui version="4.0">
+++ <class>RemoteConsoleDialog</class>
+++ <widget class="QDialog" name="RemoteConsoleDialog">
+++ <property name="geometry">
+++ <rect>
+++ <x>0</x>
+++ <y>0</y>
+++ <width>451</width>
+++ <height>103</height>
+++ </rect>
+++ </property>
+++ <property name="windowTitle">
+++ <string>Dialog</string>
+++ </property>
+++ <layout class="QVBoxLayout" name="verticalLayout">
+++ <item>
+++ <layout class="QFormLayout" name="formLayout">
+++ <property name="fieldGrowthPolicy">
+++ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+++ </property>
+++ <item row="0" column="0">
+++ <widget class="QLabel" name="mPrivateKeyLabel">
+++ <property name="text">
+++ <string>Host private key:</string>
+++ </property>
+++ <property name="buddy">
+++ <cstring>mPrivateKeyPathChooser</cstring>
+++ </property>
+++ </widget>
+++ </item>
+++ <item row="0" column="1">
+++ <widget class="Utils::PathChooser" name="mPrivateKeyPathChooser" native="true"/>
+++ </item>
+++ <item row="1" column="0">
+++ <widget class="QLabel" name="mRemoteIp">
+++ <property name="text">
+++ <string>Remote system IP:</string>
+++ </property>
+++ <property name="buddy">
+++ <cstring>mRemoteIpLineEdit</cstring>
+++ </property>
+++ </widget>
+++ </item>
+++ <item row="1" column="1">
+++ <widget class="QLineEdit" name="mRemoteIpLineEdit">
+++ <property name="text">
+++ <string notr="true"/>
+++ </property>
+++ </widget>
+++ </item>
+++ </layout>
+++ </item>
+++ <item>
+++ <widget class="QDialogButtonBox" name="mButtonBox">
+++ <property name="orientation">
+++ <enum>Qt::Horizontal</enum>
+++ </property>
+++ <property name="standardButtons">
+++ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+++ </property>
+++ </widget>
+++ </item>
+++ </layout>
+++ </widget>
+++ <customwidgets>
+++ <customwidget>
+++ <class>Utils::PathChooser</class>
+++ <extends>QWidget</extends>
+++ <header location="global">utils/pathchooser.h</header>
+++ <container>1</container>
+++ </customwidget>
+++ </customwidgets>
+++ <resources/>
+++ <connections>
+++ <connection>
+++ <sender>mButtonBox</sender>
+++ <signal>accepted()</signal>
+++ <receiver>RemoteConsoleDialog</receiver>
+++ <slot>accept()</slot>
+++ <hints>
+++ <hint type="sourcelabel">
+++ <x>248</x>
+++ <y>254</y>
+++ </hint>
+++ <hint type="destinationlabel">
+++ <x>157</x>
+++ <y>274</y>
+++ </hint>
+++ </hints>
+++ </connection>
+++ <connection>
+++ <sender>mButtonBox</sender>
+++ <signal>rejected()</signal>
+++ <receiver>RemoteConsoleDialog</receiver>
+++ <slot>reject()</slot>
+++ <hints>
+++ <hint type="sourcelabel">
+++ <x>316</x>
+++ <y>260</y>
+++ </hint>
+++ <hint type="destinationlabel">
+++ <x>286</x>
+++ <y>274</y>
+++ </hint>
+++ </hints>
+++ </connection>
+++ </connections>
+++</ui>
hooks/post-receive
--
armadeus
|
