diff -Nru kdevelop-3.9.98/app/CMakeLists.txt kdevelop-4.0.1/app/CMakeLists.txt
--- kdevelop-3.9.98/app/CMakeLists.txt 2010-02-04 00:57:02.000000000 +0000
+++ kdevelop-4.0.1/app/CMakeLists.txt 2010-07-17 20:08:19.000000000 +0100
@@ -1,9 +1,11 @@
########### next target ###############
+find_package(SharedMimeInfo REQUIRED)
+set(kdevelop_SRCS main.cpp)
kde4_add_app_icon(kdevelop_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pics/hi*-app-kdevelop.png")
-kde4_add_executable(kdevelop "main.cpp")
+kde4_add_executable(kdevelop ${kdevelop_SRCS} )
set(kdevelop_bin_SRCS
main_internal.cpp
@@ -51,4 +53,6 @@
install( FILES kdevelop.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES kdeveloprc DESTINATION ${CONFIG_INSTALL_DIR} )
-install( FILES kdevelopui.rc kdevelop.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kdevelop )
+install( FILES kdevelopui.rc katepartui.rc kdevelop.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kdevelop )
+install( FILES kdevelop.xml DESTINATION ${XDG_MIME_INSTALL_DIR} )
+update_xdg_mimetypes( ${XDG_MIME_INSTALL_DIR} )
diff -Nru kdevelop-3.9.98/app/katepartui.rc kdevelop-4.0.1/app/katepartui.rc
--- kdevelop-3.9.98/app/katepartui.rc 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/app/katepartui.rc 2010-07-17 20:08:19.000000000 +0100
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+
+
+
+ &View
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &Code Folding
+
+
+
+
+
+
+
+
+
+
+
+
+ &Tools
+
+
+
+
+
+
+
+
+
+
+ Word Completion
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &Settings
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Main Toolbar
+
+
+
+
+
+
+
+
+
+
diff -Nru kdevelop-3.9.98/app/kdevelop.desktop kdevelop-4.0.1/app/kdevelop.desktop
--- kdevelop-3.9.98/app/kdevelop.desktop 2010-01-10 10:53:38.000000000 +0000
+++ kdevelop-4.0.1/app/kdevelop.desktop 2010-07-17 20:08:19.000000000 +0100
@@ -9,6 +9,7 @@
Name[ca]=KDevelop 4
Name[ca@valencia]=KDevelop 4
Name[cs]=KDevelop 4
+Name[da]=KDevelop 4
Name[de]=KDevelop 4
Name[el]=KDevelop 4
Name[en_GB]=KDevelop 4
@@ -30,10 +31,12 @@
Name[nds]=KDevelop 4
Name[ne]=केडीई विकास ४
Name[nl]=KDevelop 4
+Name[pa]=KDevelop 4
Name[pl]=KDevelop 4
Name[pt]=KDevelop 4
Name[pt_BR]=KDevelop 4
Name[ru]=KDevelop 4
+Name[sl]=KDevelop 4
Name[sv]=KDevelop 4
Name[tr]=KDevelop 4
Name[uk]=KDevelop 4
@@ -44,6 +47,7 @@
GenericName[ca]=Entorn integrat de desenvolupament
GenericName[ca@valencia]=Entorn integrat de desenvolupament
GenericName[cs]=Integrované Vývojové Prostředí
+GenericName[da]=Integreret udviklingsmiljø (IDE)
GenericName[de]=Integrierte Entwicklungsumgebung
GenericName[el]=ολοκληρωμένο περιβάλλον ανάπτυξης
GenericName[en_GB]=Integrated Development Environment
@@ -65,6 +69,7 @@
GenericName[pt]=Ambiente de Desenvolvimento Integrado
GenericName[pt_BR]=Ambiente Integrado de Desenvolvimento
GenericName[ru]=Интегрированная среда разработки
+GenericName[sl]=Integrirano razvojno okolje
GenericName[sv]=Integrerad utvecklingsmiljö
GenericName[tr]=Bütünleşik Geliştirme Ortamı
GenericName[uk]=Комплексне середовище розробки
diff -Nru kdevelop-3.9.98/app/kdevelop.notifyrc kdevelop-4.0.1/app/kdevelop.notifyrc
--- kdevelop-3.9.98/app/kdevelop.notifyrc 2010-01-19 12:39:48.000000000 +0000
+++ kdevelop-4.0.1/app/kdevelop.notifyrc 2010-07-17 20:08:19.000000000 +0100
@@ -29,6 +29,7 @@
Comment[nb]=KDevelop
Comment[nds]=KDevelop
Comment[nl]=KDevelop
+Comment[pa]=KDevelop
Comment[pl]=KDevelop
Comment[pt]=KDevelop
Comment[pt_BR]=KDevelop
@@ -115,7 +116,7 @@
Comment[nl]=Proces met succes beëindigd
Comment[pl]=Proces zakończony pomyślnie
Comment[pt]=O processo terminou com sucesso
-Comment[pt_BR]=Processo terminado com sucesso
+Comment[pt_BR]=Processo concluído com sucesso
Comment[ro]=Proces încheiat cu succes
Comment[ru]=Процесс завершён успешно
Comment[sk]=Proces skončil úspešne
@@ -202,11 +203,11 @@
Comment[nl]=Proces voltooid met fouten
Comment[pl]=Proces zakończony z błędami
Comment[pt]=O processo terminou com erros
-Comment[pt_BR]=Processo terminado com erros
+Comment[pt_BR]=Processo concluído com erros
Comment[ro]=Proces încheiat cu erori
Comment[ru]=Процесс завершён с ошибками
Comment[sk]=Proces skončil s chybami
-Comment[sl]=Proces je končal brez napak
+Comment[sl]=Proces je končal z napakami
Comment[sv]=Processen avslutades med fel
Comment[ta]=பிழையுடன் முடிவடைந்த செயலாக்கம்
Comment[tg]=Ҳангоми иҷро намудани амал хатогие дида мешавад
@@ -222,6 +223,7 @@
Name[ca]=S'està carregant el projecte
Name[ca@valencia]=S'està carregant el projecte
Name[cs]=Načítám projekt
+Name[da]=Indlæser projekt
Name[de]=Projekt wird geladen
Name[en_GB]=Loading Project
Name[es]=Cargando proyecto
@@ -235,9 +237,11 @@
Name[nb]=Laster inn prosjekt
Name[nds]=Projekt warrt laadt
Name[nl]=Project wordt geladen
+Name[pl]=Wczytywanie projektu
Name[pt]=A Carregar o Projecto
Name[pt_BR]=Carregando Projeto
Name[ru]=Загрузка проекта
+Name[sl]=Nalaganje projekta
Name[sv]=Laddar projekt
Name[tr]=Proje Yükleniyor
Name[uk]=Завантаження проекту
@@ -247,6 +251,7 @@
Comment=A project loading process has just started
Comment[ca]=Tot just s'acaba de començar a carregar el projecte
Comment[ca@valencia]=Tot just s'acaba de començar a carregar el projecte
+Comment[da]=Indlæsning af projekt er lige startet
Comment[de]=Es ist ein Projekt-Ladeprozess gestartet
Comment[en_GB]=A project loading process has just started
Comment[es]=Acaba de comenzar un proceso de carga de proyecto
@@ -259,9 +264,11 @@
Comment[nb]=En prosess med prosjektinnlasting er nettopp startet
Comment[nds]=Dat Laden vun en Projekt hett jüst anfungen
Comment[nl]=Een proces voor het laden van een project is zojuist gestart
+Comment[pl]=Rozpoczęło się wczytywanie projektu
Comment[pt]=Acabou de ser iniciado um processo de carregamento do projecto
Comment[pt_BR]=Um processo de carregamento de projeto foi iniciado
Comment[ru]=Начата загрузка проекта
+Comment[sl]=Pričel se je postopek nalaganja projekta
Comment[sv]=En laddningsprocess för projektet har just startats
Comment[tr]=Bir proje yükleme süreci başladı
Comment[uk]=Процес завантаження проекту було запущено
@@ -275,6 +282,7 @@
Name[ca]=El projecte s'ha carregat amb èxit
Name[ca@valencia]=El projecte s'ha carregat amb èxit
Name[cs]=Projekt úspěšně načten
+Name[da]=Projekt indlæst
Name[de]=Projekt erfolgreich geladen
Name[en_GB]=Project Loaded Successfully
Name[es]=Proyecto cargado con éxito
@@ -288,9 +296,11 @@
Name[nb]=Prosjektet vellykket lastet inn
Name[nds]=Projekt mit Spood laadt
Name[nl]=Project is succesvol geladen
+Name[pl]=Projekt wczytany poprawnie
Name[pt]=O Projecto foi Carregado com Sucesso
Name[pt_BR]=Projeto Carregado com Sucesso
Name[ru]=Проект загружен
+Name[sl]=Projekt uspešno naložen
Name[sv]=Projekt laddat med lyckat resultat
Name[tr]=Proje Başarılı Bir Şekilde Yüklendi
Name[uk]=Проект успішно завантажено
@@ -301,6 +311,7 @@
Comment[ca]=S'ha carregat amb èxit un projecte
Comment[ca@valencia]=S'ha carregat amb èxit un projecte
Comment[cs]=Projekt byl úspěšně načten
+Comment[da]=Et projekt er blevet indlæst
Comment[de]=Ein Projekt wurde erfolgreich geladen
Comment[en_GB]=A project has been loaded successfully
Comment[es]=Un proyecto ha sido cargado con éxito
@@ -314,9 +325,11 @@
Comment[nb]=Et prosjekt er vellykket lastet inn
Comment[nds]=En Projekt wöör mit Spood laadt
Comment[nl]=Een project is succesvol geladen
+Comment[pl]=Projekt został wczytany poprawnie
Comment[pt]=Foi carregado um projecto com sucesso
Comment[pt_BR]=Um projeto foi carregado com sucesso
Comment[ru]=Проект загружен
+Comment[sl]=Projekt je bil uspešno naložen
Comment[sv]=Ett projekt har laddats med lyckat resultat
Comment[tr]=Bir proje başarıyla yüklendi
Comment[uk]=Проект було успішно завантажено
@@ -330,6 +343,7 @@
Name[ca]=Depurador
Name[ca@valencia]=Depurador
Name[cs]=Debugger
+Name[da]=Fejlsøger
Name[de]=Debugger
Name[en_GB]=Debugger
Name[es]=Depurador
@@ -338,11 +352,14 @@
Name[fr]=Débogueur
Name[gl]=Depurador
Name[it]=Debugger
+Name[ja]=デバッガ
Name[nb]=Feilsøker
Name[nds]=Fehlersöker
Name[nl]=Debugger
+Name[pl]=Debugger
Name[pt]=Depurador
Name[pt_BR]=Depurador
+Name[sl]=Razhroščevalnik
Name[sv]=Avlusare
Name[tr]=Hata Ayıklayıcı
Name[uk]=Зневадник
@@ -358,6 +375,7 @@
Name[ca]=Punt d'interrupció
Name[ca@valencia]=Punt d'interrupció
Name[cs]=Dosažen Breakpoint
+Name[da]=Stoppunkt nået
Name[de]=Haltepunkt erreicht
Name[en_GB]=Breakpoint Hit
Name[es]=Punto de interrupción alcanzado
@@ -369,8 +387,10 @@
Name[nb]=Bruddpunkt nådd
Name[nds]=Hollpunkt drapen
Name[nl]=Breekpunt bereikt
+Name[pl]=Uruchomiono pułapkę
Name[pt]=Ponto de Paragem Atingido
Name[pt_BR]=Ponto de interrupção atingido
+Name[sl]=Prihod do prekinitvene točke
Name[sv]=Brytpunkt påträffad
Name[uk]=Проходження точки зупину
Name[x-test]=xxBreakpoint Hitxx
@@ -379,6 +399,7 @@
Comment=A Breakpoint has been hit by the debugger
Comment[ca]=El depurador ha assolit un punt d'interrupció
Comment[ca@valencia]=El depurador ha assolit un punt d'interrupció
+Comment[da]=Fejlsøgeren nåede et stoppunkt
Comment[de]=Der Debugger hat einen Beobachtungspunkt erreicht
Comment[en_GB]=A Breakpoint has been hit by the debugger
Comment[es]=El depurador ha alcanzado un punto de interrupción
@@ -390,8 +411,10 @@
Comment[nb]=Feilsøkeren har nått et bruddpunkt
Comment[nds]=De Fehlersöker is bi en Hollpunkt ankamen
Comment[nl]=De debugger heeft een breekpunt bereikt
+Comment[pl]=Pułapka została uruchomiona przez debugger
Comment[pt]=Foi atingido um ponto de paragem pelo depurador
Comment[pt_BR]=Um ponto de interrupção foi atingido pelo depurador
+Comment[sl]=Razhroščevalnik je prispel do prekinitvene točke
Comment[sv]=En brytpunkt har påträffats av avlusaren
Comment[uk]=Інструмент зневаджування пройшов позицію точки зупину
Comment[x-test]=xxA Breakpoint has been hit by the debuggerxx
@@ -404,6 +427,7 @@
Name=Watchpoint Hit
Name[ca]=Punt d'observació
Name[ca@valencia]=Punt d'observació
+Name[da]=Overvågningspunkt nået
Name[de]=Beobachtungspunkt erreicht
Name[en_GB]=Watchpoint Hit
Name[es]=Punto de observación alcanzado
@@ -415,8 +439,10 @@
Name[nb]=Treff på vaktpunkt
Name[nds]=Luerpunkt drapen
Name[nl]=Bewakingspunt bereikt
+Name[pl]=Uruchomiono punkt kontrolny
Name[pt]=Ponto de Vigia Atingido
Name[pt_BR]=Ponto de Visualização atingido
+Name[sl]=Prihod do opazovalne točke
Name[sv]=Bevakningspunkt påträffad
Name[uk]=Проходження точки спостереження
Name[x-test]=xxWatchpoint Hitxx
@@ -425,6 +451,7 @@
Comment=A Watchpoint has been hit by the debugger
Comment[ca]=El depurador ha assolit un punt d'observació
Comment[ca@valencia]=El depurador ha assolit un punt d'observació
+Comment[da]=Fejlsøgeren nåede et overvågningspunkt
Comment[de]=Der Debugger hat einen Beobachtungspunkt erreicht
Comment[en_GB]=A Watchpoint has been hit by the debugger
Comment[es]=El depurador ha alcanzado un punto de observación
@@ -436,8 +463,10 @@
Comment[nb]=Feilsøkeren har truffet et vaktpunkt
Comment[nds]=De Fehlersöker is bi en Luerpunkt ankamen
Comment[nl]=De debugger heeft een bewakingspunt bereikt
+Comment[pl]=Debugger uruchomił punkt kontrolny
Comment[pt]=Foi atingido um ponto de vigia pelo depurador
Comment[pt_BR]=Um ponto de Visualização foi atingido pelo depurador
+Comment[sl]=Razhroščevalnik je prispel do opazovalne točke
Comment[sv]=En bevakningspunkt har påträffats av avlusaren
Comment[uk]=Інструмент зневаджування пройшов позицію точки спостереження
Comment[x-test]=xxA Watchpoint has been hit by the debuggerxx
diff -Nru kdevelop-3.9.98/app/kdevelopui.rc kdevelop-4.0.1/app/kdevelopui.rc
--- kdevelop-3.9.98/app/kdevelopui.rc 2010-01-03 19:18:26.000000000 +0000
+++ kdevelop-4.0.1/app/kdevelopui.rc 2010-07-17 20:08:19.000000000 +0100
@@ -1,12 +1,12 @@
-
+
-
+ Session
-
+ &Project
@@ -24,7 +24,7 @@
-
+ &Run
@@ -46,7 +46,7 @@
-
+ &Navigation
@@ -58,9 +58,7 @@
-
- |
-
+ &File
@@ -84,6 +82,8 @@
+
+
Editor
@@ -94,9 +94,7 @@
-
- |
-
+ &Window
@@ -157,17 +155,14 @@
Main Toolbar
-
-
-
+
-
diff -Nru kdevelop-3.9.98/app/kdevelop.xml kdevelop-4.0.1/app/kdevelop.xml
--- kdevelop-3.9.98/app/kdevelop.xml 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/app/kdevelop.xml 2010-07-17 20:08:19.000000000 +0100
@@ -0,0 +1,42 @@
+
+
+
+ KDevelop 4 Project File
+ Fitxer de projecte de KDevelop 4
+ Fitxer de projecte de KDevelop 4
+ Soubor projektu Kdevelop 4
+ KDevelop 4 projektfil
+ KDevelop-4-Projektdatei
+ Αρχείο έργου KDevelop 4
+ KDevelop 4 Project File
+ Archivo de proyecto de KDevelop 4
+ KDevelop 4 projektifail
+ پروندۀ پروژۀ KDevelop 4
+ KDevelop 4-projektitiedosto
+ Fichier projet KDevelop 4
+ Comhad Tionscadail KDevelop 4
+ Ficheiro de proxecto de KDevelop 4
+ के-डेवलप ४ परियोजना फ़ाइल
+ के-डेवलप ४ परियोजना फाइल
+ File di progetto per KDevelop 4
+ KDevelop 4 プロジェクトファイル
+ KDevelop 4 프로젝트 파일
+ KDevelop 4 projekta fails
+ KDevelop 4 prosjektfil
+ KDevelop4-Projektdatei
+ केडीई विकास ४ परियोजना फाइल
+ KDevelop 4 projectbestand
+ Plik projektu KDevelopa 4
+ Ficheiro de Projecto do KDevelop 4
+ Arquivo de Projeto do KDevelop 4
+ Fișier Proiect Kdevelop 4
+ Файл проекта KDevelop 4
+ Projektna datoteka KDevelop 4
+ KDevelop 4-projektfil
+ KDevelop 4 Proje Dosyası
+ Файл проекту KDevelop 4
+ KDevelop 4 工程文件
+ KDevelop 4 專案檔
+
+
+
diff -Nru kdevelop-3.9.98/app/kdevideextension.cpp kdevelop-4.0.1/app/kdevideextension.cpp
--- kdevelop-3.9.98/app/kdevideextension.cpp 2009-06-28 19:06:12.000000000 +0100
+++ kdevelop-4.0.1/app/kdevideextension.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -18,15 +18,8 @@
***************************************************************************/
#include "kdevideextension.h"
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
+#include
+#include
KDevIDEExtension::KDevIDEExtension()
: ShellExtension()
diff -Nru kdevelop-3.9.98/app/main.cpp kdevelop-4.0.1/app/main.cpp
--- kdevelop-3.9.98/app/main.cpp 2010-02-04 00:57:02.000000000 +0000
+++ kdevelop-4.0.1/app/main.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -8,6 +8,7 @@
* Copyright 2001-2002 Bernd Gehrmann *
* Copyright 2001-2002 Matthias Hoelzer-Kluepfel *
* Copyright 2003 Roberto Raggi *
+ * Copyright 2010 Niko Sams *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU Library General Public License as *
@@ -52,13 +53,19 @@
int main( int argc, char *argv[] )
{
+ QList argvOrig; //We copy the original argv here, as it seems that KCmdLineArgs changes the arguments ("--style" becomes "-style")
+
+ for(int a = 0; a < argc; ++a)
+ argvOrig << argv[a];
+
static const char description[] = I18N_NOOP( "The KDevelop Integrated Development Environment" );
KAboutData aboutData( "kdevelop", 0, ki18n( "KDevelop" ),
i18n("%1", QString(VERSION) ).toUtf8(), ki18n(description), KAboutData::License_GPL,
- ki18n( "Copyright 1999-2009, The KDevelop developers" ), KLocalizedString(), "http://www.kdevelop.org" );
+ ki18n( "Copyright 1999-2010, The KDevelop developers" ), KLocalizedString(), "http://www.kdevelop.org/" );
#include "shared_app_init.cpp"
- options.add("s ", ki18n("Session to load" ));
+ options.add("cs ", ki18n("Create new session with given name."));
+ options.add("s ", ki18n("Session to load. You can pass either hash or the name of the session." ));
options.add("sessions", ki18n( "List available sessions and quit" ));
KCmdLineArgs::addCmdLineOptions( options );
@@ -68,33 +75,125 @@
if(args->isSet("sessions"))
{
QTextStream qout(stdout);
- qout << endl << ki18n("Available sessions (use '-s HASH' to open a specific one):").toString() << endl << endl;
- qout << QString("%1").arg(ki18n("Hash").toString(), -38) << '\t' << ki18n("Session contents").toString() << endl;
+ qout << endl << ki18n("Available sessions (use '-s HASH' or '-s NAME' to open a specific one):").toString() << endl << endl;
+ qout << QString("%1").arg(ki18n("Hash").toString(), -38) << '\t' << ki18n("Name: Opened Projects").toString() << endl;
foreach(const KDevelop::SessionInfo& si, KDevelop::SessionController::availableSessionInfo())
{
- qout << si.uuid.toString() << '\t' << si.description << endl;
+ if ( si.name.isEmpty() && si.projects.isEmpty() ) {
+ continue;
+ }
+ qout << si.uuid.toString() << '\t' << si.description;
+
+ if(!KDevelop::SessionController::tryLockSession(si.uuid.toString()))
+ qout << " " << i18n("[running]");
+
+ qout << endl;
}
return 0;
}
- ///Manage sessions: There always needs a KDEV_SESSION to be set, so the duchain can be stored in the session-specific directory
- QString session = args->getOption("s");
+ // if empty, restart kdevelop with last active session, see SessionController::defaultSessionId
+ QString session;
+
+ if ( args->isSet("debug") ) {
+ if ( debugArgs.isEmpty() ) {
+ QTextStream qerr(stderr);
+ qerr << endl << i18n("Specify the binary you want to debug.") << endl;
+ return 1;
+ }
+ QString binary = debugArgs.first();
+ if ( binary.contains('/') ) {
+ binary = binary.right(binary.lastIndexOf('/'));
+ }
+ session = i18n("Debug")+" "+binary;
+ } else if ( args->isSet("cs") )
+ {
+ session = args->getOption("cs");
+ foreach(const KDevelop::SessionInfo& si, KDevelop::SessionController::availableSessionInfo())
+ {
+ if ( session == si.name ) {
+ QTextStream qerr(stderr);
+ qerr << endl << i18n("A session with the name %1 exists already. Use the -s switch to open it.", session) << endl;
+ return 1;
+ }
+ }
+ // session doesn't exist, we can create it
+ } else if ( args->isSet("s") ) {
+ session = args->getOption("s");
+ bool found = false;
+ foreach(const KDevelop::SessionInfo& si, KDevelop::SessionController::availableSessionInfo())
+ {
+ if ( session == si.name || session == si.uuid.toString() ) {
+ found = true;
+ break;
+ }
+ }
+ if ( !found ) {
+ QTextStream qerr(stderr);
+ qerr << endl << i18n("Cannot open unknown session %1. See --sessions switch for available sessions or use -cs to create a new one.", session) << endl;
+ return 1;
+ }
+ if ( !KDevelop::SessionController::tryLockSession(KDevelop::SessionController::defaultSessionId(session)) ) {
+ QTextStream qerr(stderr);
+ qerr << endl << i18n("Session %1 is already running.", session) << endl;
+ return 1;
+ }
+ }
- //No session is set, we have to pick one, then we restart kdevelop through kdev_starter, and forward all relevant arguments to it
+ ///Manage sessions: There always needs a KDEV_SESSION to be set, so the duchain can be stored in the session-specific directory
session = KDevelop::SessionController::defaultSessionId(session);
- //@todo Eventually show a session-picking dialog
- KProcess proc;
- proc << QFileInfo(QApplication::applicationFilePath()).path() + "/kdevelop.bin" ;
+ //if session is already running create a new one
+ //if the user explicitely picked a already running session using the -s switch he already
+ //gets got an error
+ if(!KDevelop::SessionController::tryLockSession(session)) {
+ session = QUuid::createUuid();
+ }
+
+#ifdef Q_WS_WIN
+ QFileInfo fi(QFileInfo(QApplication::applicationFilePath()).path() + "/kdevelop.bin.exe");
+#else
+ QFileInfo fi(QFileInfo(QApplication::applicationFilePath()).path() + "/kdevelop.bin");
+#endif
+ if( !fi.exists() ) {
+ QTextStream qerr(stderr);
+ qerr << endl << i18n("Cannot start KDevelop, the kdevelop.bin executable is missing in %1. Please fix your KDevelop installation.", fi.absolutePath() ) << endl;
+ return -1;
+ }
+
//Forward all arguments, except -s as the internal app doesn't setup -s or --sessions arguments
- for(uint a = 1; a < argc; ++a) {
- if( qstrcmp( argv[a], "-s" ) == 0 ) {
+ QList kdevelopBinArgs;
+ for(int a = 1; a < argvOrig.count(); ++a) {
+ // note: KCmdLineArgs does not care whether an option gets passed as with one or two dashes
+ if( argvOrig[a] =="-s" || argvOrig[a] == "--s" || argvOrig[a] == "--cs" || argvOrig[a] == "-cs" ) {
++a;
- } else {
- proc << QString(argv[a]);
+ } else if ( argvOrig[a] != "--sessions" && argvOrig[a] != "-sessions" ) {
+ kdevelopBinArgs << argvOrig[a];
}
}
+
+#ifdef Q_WS_WIN
+ KProcess proc;
+ proc << fi.absoluteFilePath();
+ foreach (const QString &arg, kdevelopBinArgs) {
+ proc << arg;
+ }
proc.setEnv( "KDEV_SESSION", session );
return proc.execute();
-}
+#else
+ QByteArray pathData = fi.absoluteFilePath().toLocal8Bit();
+ char **cmd = 0;
+ cmd = (char**)realloc(cmd, (kdevelopBinArgs.count() + 2) * sizeof(char*));
+ cmd[0] = pathData.data();
+ for (int i = 0; i < kdevelopBinArgs.length(); ++i) {
+ cmd[i+1] = kdevelopBinArgs[i].data();
+ }
+ cmd[kdevelopBinArgs.count() + 1] = 0;
+
+ QByteArray sessionData = session.toLocal8Bit();
+
+ setenv("KDEV_SESSION", sessionData.data(), true);
+ return execv(qPrintable(fi.absoluteFilePath()), cmd);
+#endif
+}
diff -Nru kdevelop-3.9.98/app/main_internal.cpp kdevelop-4.0.1/app/main_internal.cpp
--- kdevelop-3.9.98/app/main_internal.cpp 2010-02-04 00:57:02.000000000 +0000
+++ kdevelop-4.0.1/app/main_internal.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -8,6 +8,7 @@
* Copyright 2001-2002 Bernd Gehrmann *
* Copyright 2001-2002 Matthias Hoelzer-Kluepfel *
* Copyright 2003 Roberto Raggi *
+ * Copyright 2010 Niko Sams *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU Library General Public License as *
@@ -41,6 +42,7 @@
#include
#include
#include
+#include
#include
#include
@@ -48,6 +50,10 @@
#include
#include
#include
+#include
+#include
+#include
+#include
#include "kdevideextension.h"
#include
@@ -59,19 +65,31 @@
using KDevelop::Core;
+class KDevelopApplication: public KApplication {
+public:
+ explicit KDevelopApplication(bool GUIenabled = true): KApplication(GUIenabled) {}
+
+ void saveState( QSessionManager& sm ) {
+ if (KDevelop::Core::self() && KDevelop::Core::self()->sessionController())
+ sm.setRestartCommand(QStringList() << "kdevelop" << "-s" << KDevelop::Core::self()->sessionController()->activeSession()->id().toString());
+ KApplication::saveState(sm);
+ }
+
+};
+
int main( int argc, char *argv[] )
{
static const char description[] = I18N_NOOP( "The KDevelop Integrated Development Environment" );
KAboutData aboutData( "kdevelop", 0, ki18n( "KDevelop" ),
i18n("%1 (using KDevPlatform %2)", QString(VERSION), Core::version()).toUtf8(), ki18n(description), KAboutData::License_GPL,
- ki18n( "Copyright 1999-2009, The KDevelop developers" ), KLocalizedString(), "http://www.kdevelop.org" );
+ ki18n( "Copyright 1999-2010, The KDevelop developers" ), KLocalizedString(), "http://www.kdevelop.org/" );
#include "shared_app_init.cpp"
KCmdLineArgs::addCmdLineOptions( options );
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
- KApplication app;
+ KDevelopApplication app;
KDevIDEExtension::init();
if(!getenv("KDEV_SESSION"))
@@ -91,7 +109,9 @@
splash->show();
}
- Core::initialize(splash);
+ if(!Core::initialize(splash))
+ return 5;
+
KGlobal::locale()->insertCatalog( Core::self()->componentData().catalogName() );
Core* core = Core::self();
@@ -100,41 +120,115 @@
{
foreach(const QString& p, projectNames)
{
- KUrl url(p);
- QString ext = QFileInfo( url.fileName() ).suffix();
- if( ext == "kdev4" )
- {
- core->projectController()->openProject( url );
+ QFileInfo info( p );
+ if( info.suffix() == "kdev4" ) {
+ // make sure the project is not already opened by the session controller
+ bool shouldOpen = true;
+ KUrl url(info.absoluteFilePath());
+ foreach(KDevelop::IProject* p, core->projectController()->projects()) {
+ if (p->projectFileUrl() == url) {
+ shouldOpen = false;
+ break;
+ }
+ }
+ if (shouldOpen) {
+ core->projectController()->openProject( url );
+ }
}
}
}
- int count=args->count();
- for(int i=0; iarg(i);
- //Allow opening specific lines in documents, like mydoc.cpp:10
- int lineNumberOffset = file.lastIndexOf(':');
- KTextEditor::Cursor line;
- if( lineNumberOffset != -1 )
+ if ( args->isSet("debug") ) {
+ if ( debugArgs.isEmpty() ) {
+ QTextStream qerr(stderr);
+ qerr << endl << i18n("Specify the binary you want to debug.") << endl;
+ return 1;
+ }
+ QString binary = debugArgs.first();
+ if ( binary.contains('/') ) {
+ binary = binary.right(binary.lastIndexOf('/'));
+ }
+ QString launchName = i18n("Debug")+' '+binary;
+
+ KDevelop::LaunchConfiguration* launch = 0;
+ kDebug() << launchName;
+ foreach (KDevelop::LaunchConfiguration *l, core->runControllerInternal()->launchConfigurationsInternal()) {
+ kDebug() << l->name();
+ if (l->name() == launchName) {
+ launch = l;
+ }
+ }
+
+ KDevelop::LaunchConfigurationType *type = 0;
+ foreach (KDevelop::LaunchConfigurationType *t, core->runController()->launchConfigurationTypes()) {
+ kDebug() << t->id();
+ if (t->id() == "Native Application") {
+ type = t;
+ break;
+ }
+ }
+ if (!type) {
+ QTextStream qerr(stderr);
+ qerr << endl << i18n("Cannot find native launch configuration type") << endl;
+ return 1;
+ }
+
+ if (launch && launch->type()->id() != "Native Application") launch = 0;
+ if (launch && launch->launcherForMode("debug") != args->getOption("debug")) launch = 0;
+ if (!launch) {
+ kDebug() << launchName << "not found, creating a new one";
+ QPair launcher;
+ launcher.first = "debug";
+ foreach (KDevelop::ILauncher *l, type->launchers()) {
+ if (l->id() == args->getOption("debug")) {
+ if (l->supportedModes().contains("debug")) {
+ launcher.second = l->id();
+ }
+ }
+ }
+ if (launcher.second.isEmpty()) {
+ QTextStream qerr(stderr);
+ qerr << endl << i18n("Cannot find launcher %1").arg(args->getOption("debug")) << endl;
+ return 1;
+ }
+ KDevelop::ILaunchConfiguration* ilaunch = core->runController()->createLaunchConfiguration(type, launcher, 0, launchName);
+ launch = dynamic_cast(ilaunch);
+ }
+
+ type->configureLaunchFromCmdLineArguments(launch->config(), debugArgs);
+ launch->config().writeEntry("Break on Start", true);
+ core->runControllerInternal()->setDefaultLaunch(launch);
+
+ core->runControllerInternal()->execute("debug", launch);
+ } else {
+ int count=args->count();
+ for(int i=0; iarg(i);
+ //Allow opening specific lines in documents, like mydoc.cpp:10
+ int lineNumberOffset = file.lastIndexOf(':');
+ KTextEditor::Cursor line;
+ if( lineNumberOffset != -1 )
{
- file = file.left(lineNumberOffset);
- line = KTextEditor::Cursor(lineNr, 0);
+ bool isInt;
+ int lineNr = file.mid(lineNumberOffset+1).toInt(&isInt);
+ if (isInt)
+ {
+ file = file.left(lineNumberOffset);
+ line = KTextEditor::Cursor(lineNr, 0);
+ }
}
- }
- KUrl f(file);
- if( f.isRelative() )
- f=KUrl(QDir::currentPath(), file);
+ if( QFileInfo( file ).isRelative() ) {
+ file = QDir::currentPath() + QDir::separator() + file;
+ }
+ KUrl f("file://"+file);
- if(!core->documentController()->openDocument(f, line))
- kWarning() << i18n("Could not open %1") << args->arg(i);
+ if(!core->documentController()->openDocument(f, line))
+ kWarning() << i18n("Could not open %1") << args->arg(i);
+ }
+ args->clear();
}
- args->clear();
return app.exec();
}
diff -Nru kdevelop-3.9.98/app/shared_app_init.cpp kdevelop-4.0.1/app/shared_app_init.cpp
--- kdevelop-3.9.98/app/shared_app_init.cpp 2010-02-04 00:57:02.000000000 +0000
+++ kdevelop-4.0.1/app/shared_app_init.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -8,6 +8,7 @@
* Copyright 2001-2002 Bernd Gehrmann *
* Copyright 2001-2002 Matthias Hoelzer-Kluepfel *
* Copyright 2003 Roberto Raggi *
+ * Copyright 2010 Niko Sams *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU Library General Public License as *
@@ -83,7 +84,33 @@
aboutData.addCredit( ki18n("Sascha Cunz") , ki18n( "Cleanup and bugfixes for qEditor, AutoMake and much other stuff" ), "mail@sacu.de" );
aboutData.addCredit( ki18n("Zoran Karavla"), ki18n( "Artwork for the ruby language" ), "webmaster@the-error.net", "http://the-error.net" );
+ //we can't use KCmdLineArgs as it doesn't allow arguments for the debugee
+ //so lookup the --debug switch and eat everything behind by decrementing argc
+ //debugArgs is filled with args after --debug
+ QStringList debugArgs;
+ {
+ bool debugFound = false;
+ int c = argc;
+ for (int i=0; i < c; ++i) {
+ if (debugFound) {
+ debugArgs << argv[i];
+ } else if (QString(argv[i]) == "--debug") {
+ if (argc <= i+1) {
+ argc = i + 1;
+ } else {
+ i++;
+ argc = i + 1;
+ }
+ debugFound = true;
+ } else if (QString(argv[i]).startsWith("--debug=")) {
+ argc = i + 1;
+ debugFound = true;
+ }
+ }
+ }
+
KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineOptions options;
options.add("project ", ki18n( "Url to project to load" ));
options.add("+files", ki18n( "Files to load" ));
+ options.add("debug ", ki18n( "Start debugger, for example gdb. The binary that should be debugged must follow - including arguments." ));
\ No newline at end of file
diff -Nru kdevelop-3.9.98/app/vendor/kate/katepartui.rc kdevelop-4.0.1/app/vendor/kate/katepartui.rc
--- kdevelop-3.9.98/app/vendor/kate/katepartui.rc 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/app/vendor/kate/katepartui.rc 2010-07-17 20:08:19.000000000 +0100
@@ -0,0 +1,130 @@
+
+
+
+ &File
+
+
+
+
+
+
+
+ &Edit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &View
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &Code Folding
+
+
+
+
+
+
+
+
+
+
+
+
+ &Tools
+
+
+
+
+
+
+
+
+
+
+ Word Completion
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &Settings
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Main Toolbar
+
+
+
+
+
+
+
diff -Nru kdevelop-3.9.98/app/x-kdevelop.desktop kdevelop-4.0.1/app/x-kdevelop.desktop
--- kdevelop-3.9.98/app/x-kdevelop.desktop 2010-01-10 10:53:38.000000000 +0000
+++ kdevelop-4.0.1/app/x-kdevelop.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-[Desktop Entry]
-Comment=KDevelop 4 Project File
-Comment[ca]=Fitxer de projecte de KDevelop 4
-Comment[ca@valencia]=Fitxer de projecte de KDevelop 4
-Comment[cs]=Soubor projektu Kdevelop 4
-Comment[de]=KDevelop-4-Projektdatei
-Comment[el]=Αρχείο έργου KDevelop 4
-Comment[en_GB]=KDevelop 4 Project File
-Comment[es]=Archivo de proyecto de KDevelop 4
-Comment[et]=KDevelop 4 projektifail
-Comment[fa]=پروندۀ پروژۀ KDevelop 4
-Comment[fi]=KDevelop 4-projektitiedosto
-Comment[fr]=Fichier projet KDevelop 4
-Comment[ga]=Comhad Tionscadail KDevelop 4
-Comment[gl]=Ficheiro de proxecto de KDevelop 4
-Comment[hi]=के-डेवलप ४ परियोजना फ़ाइल
-Comment[hne]=के-डेवलप ४ परियोजना फाइल
-Comment[it]=File di progetto per KDevelop 4
-Comment[ja]=KDevelop 4 プロジェクトファイル
-Comment[ko]=KDevelop 4 프로젝트 파일
-Comment[lv]=KDevelop 4 projekta fails
-Comment[nb]=KDevelop 4 prosjektfil
-Comment[nds]=KDevelop4-Projektdatei
-Comment[ne]=केडीई विकास ४ परियोजना फाइल
-Comment[nl]=KDevelop 4 projectbestand
-Comment[pl]=Plik projektu KDevelopa 4
-Comment[pt]=Ficheiro de Projecto do KDevelop 4
-Comment[pt_BR]=Arquivo de Projeto do KDevelop 4
-Comment[ro]=Fișier Proiect Kdevelop 4
-Comment[ru]=Файл проекта KDevelop 4
-Comment[sv]=KDevelop 4-projektfil
-Comment[tr]=KDevelop 4 Proje Dosyası
-Comment[uk]=Файл проекту KDevelop 4
-Comment[x-test]=xxKDevelop 4 Project Filexx
-Comment[zh_CN]=KDevelop 4 工程文件
-Comment[zh_TW]=KDevelop 4 專案檔
-DefaultApp=kdevelop
-Icon=kdevelop_project
-Type=MimeType
-MimeType=application/x-kdevelop;
-Patterns=*.kdev4;
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_plaincpp/cmake_plaincpp.kdevtemplate kdevelop-4.0.1/app_templates/cpp/CMake/cmake_plaincpp/cmake_plaincpp.kdevtemplate
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_plaincpp/cmake_plaincpp.kdevtemplate 2010-01-19 12:39:48.000000000 +0000
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_plaincpp/cmake_plaincpp.kdevtemplate 2010-07-17 20:08:19.000000000 +0100
@@ -4,6 +4,7 @@
Name[ca]=Senzilla aplicació C++ basada en CMake
Name[ca@valencia]=Senzilla aplicació C++ basada en CMake
Name[cs]=Jednoduchá aplikace C++ založená na CMake
+Name[da]=Simpel CMake-baseret C++-applikation
Name[de]=Einfache auf CMake basierende C++-Anwendung
Name[en_GB]=Simple CMake-based C++ application
Name[es]=Aplicación C++ sencilla basada en CMake
@@ -11,13 +12,15 @@
Name[fi]=Yksinkertainen CMake-perustainen C++-sovellus
Name[fr]=Application C++ simple utilisant CMake
Name[gl]=Programa básico en C++ baseado en CMake
-Name[it]=Semplice applicazione C++ basata su CMake
+Name[it]=Semplice applicazione in C++ basata su CMake
Name[nb]=Enkelt C++-program basert på CMake
Name[nds]=Eenfach op CMake-baseert "C++"-Programm
Name[nl]=Eenvoudige op CMake gebaseerd C++ programma
+Name[pl]=Prosty program w C++ używający CMake
Name[pt]=Aplicação simples em C++ com CMake
Name[pt_BR]=Simples Aplicativo C++ baseado no CMake
Name[ru]=Простое приложение на С++ с CMake
+Name[sl]=Preprost program v C++, temelječ na CMake
Name[sv]=Enkelt CMake-baserat C++ program
Name[tr]=Basit CMake temelli C++ uygulaması
Name[uk]=Проста заснована на CMake програма C++
@@ -26,4 +29,4 @@
Name[zh_TW]=簡單的使用 CMake 的 C++ 應用程式
Category=C++/No GUI (CMake)
Icon=default-kdevelop
-ShowFilesAfterGeneration=%{dest}/src/main.cpp
+ShowFilesAfterGeneration=%{dest}/main.cpp
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core/cmake_qt4core.kdevtemplate kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core/cmake_qt4core.kdevtemplate
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core/cmake_qt4core.kdevtemplate 2010-01-10 10:53:38.000000000 +0000
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core/cmake_qt4core.kdevtemplate 2010-07-17 20:08:19.000000000 +0100
@@ -4,6 +4,7 @@
Name[ca]=Aplicació principal Qt4 CMake
Name[ca@valencia]=Aplicació principal Qt4 CMake
Name[cs]=Aplikace Qt4 CMake Core
+Name[da]=Qt4 CMake Core-applikation
Name[de]=Qt-4/CMake-Anwendung
Name[el]=Βασική εφαμοργή Qt4 CMake
Name[en_GB]=Qt4 CMake Core application
@@ -13,6 +14,7 @@
Name[fr]=Application principale CMake pour Qt4
Name[gl]=Programa básico de Qt4 con CMake
Name[hne]=क्यूटी४ सीमेक कोर अनुपरयोग
+Name[it]=Applicazione core in Qt4 con CMake
Name[ja]=Qt4 CMake コアアプリケーション
Name[lv]=Qt4 CMake core programma
Name[nb]=Qt4 CMake kjerneprogram
@@ -32,6 +34,7 @@
Comment=Generate a CMake/Qt4 based application (crossplatform compatible)
Comment[ca]=Genera una aplicació basada en CMake/Qt4 (multi plataforma)
Comment[ca@valencia]=Genera una aplicació basada en CMake/Qt4 (multi plataforma)
+Comment[da]=Genererer et CMake-/Qt4-baseret program (krydsplatform kompatibelt)
Comment[de]=Erstellt eine auf CMake und Qt 4 basierende Anwendung (Plattformunabhängig)
Comment[el]=Δημιουργία μιας εφαρμογής με βάση τα CMake/Qt4 (συμβατή με πολλαπλές πλατφόρμες)
Comment[en_GB]=Generate a CMake/Qt4 based application (crossplatform compatible)
@@ -51,6 +54,7 @@
Comment[pt]=Gera uma aplicação baseada no QMake/Qt4 (compatível com várias plataformas)
Comment[pt_BR]=Gera um aplicativo em CMake/Qt4 (compatível com várias plataformas)
Comment[ru]=Создание кроссплатформенного приложения CMake/Qt4
+Comment[sl]=Ustvari program temelječ na CMake/Qt4 (združljiv z več platformami)
Comment[sv]=Skapar ett QMake- och Qt4-baserat program (som fungerar på flera plattformar)
Comment[tr]=CMake/Qt4 tabanlı bir uygulama oluştur (platformlararası uyumlu)
Comment[uk]=Створити програму, засновану на CMake/Qt4 (сумісну з декількома платформами)
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAME}.cpp kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAME}.cpp
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAME}.cpp 2009-08-30 21:22:57.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAME}.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-#include "%{APPNAME}.h"
-
-%{APPNAME}::%{APPNAME}()
-{}
-
-%{APPNAME}::~%{APPNAME}()
-{}
-
-#include "%{APPNAME}.moc"
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAME}.h kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAME}.h
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAME}.h 2009-08-30 21:22:57.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAME}.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-#ifndef %{APPNAME}_H
-#define %{APPNAME}_H
-
-#include
-
-class %{APPNAME} : public QObject
-{
-Q_OBJECT
-public:
- %{APPNAME}();
- virtual ~%{APPNAME}();
-};
-
-#endif // %{APPNAME}_H
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAMEID}.cpp kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAMEID}.cpp
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAMEID}.cpp 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAMEID}.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -0,0 +1,9 @@
+#include "%{APPNAMEID}.h"
+
+%{APPNAMEID}::%{APPNAMEID}()
+{}
+
+%{APPNAMEID}::~%{APPNAMEID}()
+{}
+
+#include "%{APPNAMEID}.moc"
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAMEID}.h kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAMEID}.h
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAMEID}.h 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/%{APPNAMEID}.h 2010-07-17 20:08:19.000000000 +0100
@@ -0,0 +1,14 @@
+#ifndef %{APPNAMEID}_H
+#define %{APPNAMEID}_H
+
+#include
+
+class %{APPNAMEID} : public QObject
+{
+Q_OBJECT
+public:
+ %{APPNAMEID}();
+ virtual ~%{APPNAMEID}();
+};
+
+#endif // %{APPNAME}_H
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/CMakeLists.txt kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/CMakeLists.txt
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/CMakeLists.txt 2009-08-30 21:22:57.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/CMakeLists.txt 2010-07-17 20:08:19.000000000 +0100
@@ -5,9 +5,9 @@
include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
-set(%{APPNAME}_SRCS %{APPNAME}.cpp main.cpp)
-qt4_automoc(${%{APPNAME}_SRCS})
-add_executable(%{APPNAME} ${%{APPNAME}_SRCS})
-target_link_libraries(%{APPNAME} ${QT_QTCORE_LIBRARY})
+set(%{APPNAMEID}_SRCS %{APPNAMEID}.cpp main.cpp)
+qt4_automoc(${%{APPNAMEID}_SRCS})
+add_executable(%{APPNAMEID} ${%{APPNAMEID}_SRCS})
+target_link_libraries(%{APPNAMEID} ${QT_QTCORE_LIBRARY})
add_subdirectory(tests)
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/cmake_qt4core_qtest.kdevtemplate kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/cmake_qt4core_qtest.kdevtemplate
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/cmake_qt4core_qtest.kdevtemplate 2010-01-10 10:53:38.000000000 +0000
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/cmake_qt4core_qtest.kdevtemplate 2010-07-17 20:08:19.000000000 +0100
@@ -3,6 +3,7 @@
Name=Qt4 CMake QTest Core application
Name[ca]=Aplicació principal Qt4 CMake QTest
Name[ca@valencia]=Aplicació principal Qt4 CMake QTest
+Name[da]=Qt4 CMake QTest Core-applikation
Name[de]=Qt-4/CMake/QTest-Anwendung
Name[el]=Βασική εφαρμογή Qt4 CMake QTest
Name[en_GB]=Qt4 CMake QTest Core application
@@ -11,6 +12,7 @@
Name[fi]=Qt4 CMake QTest-ydinsovellus
Name[fr]=Application principale QTest CMake pour Qt4
Name[gl]=Programa básico de Qt4 con CMake e QTest
+Name[it]=Applicazione core QTest in Qt4 con CMake
Name[ja]=Qt4 CMake QTest コアアプリケーション
Name[lv]=Qt4 CMake QTest Core programma
Name[nb]=Qt4 CMake QTest kjerneprogram
@@ -30,6 +32,7 @@
Comment=Generate a CMake/Qt4 based application (crossplatform compatible)
Comment[ca]=Genera una aplicació basada en CMake/Qt4 (multi plataforma)
Comment[ca@valencia]=Genera una aplicació basada en CMake/Qt4 (multi plataforma)
+Comment[da]=Genererer et CMake-/Qt4-baseret program (krydsplatform kompatibelt)
Comment[de]=Erstellt eine auf CMake und Qt 4 basierende Anwendung (Plattformunabhängig)
Comment[el]=Δημιουργία μιας εφαρμογής με βάση τα CMake/Qt4 (συμβατή με πολλαπλές πλατφόρμες)
Comment[en_GB]=Generate a CMake/Qt4 based application (crossplatform compatible)
@@ -49,6 +52,7 @@
Comment[pt]=Gera uma aplicação baseada no QMake/Qt4 (compatível com várias plataformas)
Comment[pt_BR]=Gera um aplicativo em CMake/Qt4 (compatível com várias plataformas)
Comment[ru]=Создание кроссплатформенного приложения CMake/Qt4
+Comment[sl]=Ustvari program temelječ na CMake/Qt4 (združljiv z več platformami)
Comment[sv]=Skapar ett QMake- och Qt4-baserat program (som fungerar på flera plattformar)
Comment[tr]=CMake/Qt4 tabanlı bir uygulama oluştur (platformlararası uyumlu)
Comment[uk]=Створити програму, засновану на CMake/Qt4 (сумісну з декількома платформами)
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/main.cpp kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/main.cpp
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/main.cpp 2009-08-30 21:22:57.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/main.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -1,10 +1,10 @@
#include
-#include "%{APPNAME}.h"
+#include "%{APPNAMEID}.h"
int main(int argc, char** argv)
{
QCoreApplication app(argc, argv);
- %{APPNAME} foo;
+ %{APPNAMEID} foo;
return app.exec();
}
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAMEID}Test.cpp kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAMEID}Test.cpp
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAMEID}Test.cpp 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAMEID}Test.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -0,0 +1,23 @@
+#include "%{APPNAMEID}Test.h"
+#include
+
+void %{APPNAMEID}Test::initTestCase()
+{}
+
+void %{APPNAMEID}Test::init()
+{}
+
+void %{APPNAMEID}Test::cleanup()
+{}
+
+void %{APPNAMEID}Test::cleanupTestCase()
+{}
+
+void %{APPNAMEID}Test::someTest()
+{
+ QCOMPARE(1,2);
+}
+
+
+QTEST_MAIN(%{APPNAMEID}Test)
+#include "%{APPNAMEID}Test.moc"
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAMEID}Test.h kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAMEID}Test.h
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAMEID}Test.h 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAMEID}Test.h 2010-07-17 20:08:19.000000000 +0100
@@ -0,0 +1,18 @@
+#ifndef %{APPNAMEID}TEST_H
+#define %{APPNAMEID}TEST_H
+
+#include
+
+class %{APPNAMEID}Test : public QObject
+{
+Q_OBJECT
+private slots:
+ void initTestCase();
+ void init();
+ void cleanup();
+ void cleanupTestCase();
+
+ void someTest();
+};
+
+#endif // %{APPNAME}TEST_H
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAME}Test.cpp kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAME}Test.cpp
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAME}Test.cpp 2009-08-30 21:22:57.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAME}Test.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-#include "%{APPNAME}Test.h"
-#include
-
-void %{APPNAME}Test::initTestCase()
-{}
-
-void %{APPNAME}Test::init()
-{}
-
-void %{APPNAME}Test::cleanup()
-{}
-
-void %{APPNAME}Test::cleanupTestCase()
-{}
-
-void %{APPNAME}Test::someTest()
-{
- QCOMPARE(1,2);
-}
-
-
-QTEST_MAIN(%{APPNAME}Test)
-#include "%{APPNAME}Test.moc"
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAME}Test.h kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAME}Test.h
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAME}Test.h 2009-08-30 21:22:57.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/%{APPNAME}Test.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-#ifndef %{APPNAME}TEST_H
-#define %{APPNAME}TEST_H
-
-#include
-
-class %{APPNAME}Test : public QObject
-{
-Q_OBJECT
-private slots:
- void initTestCase();
- void init();
- void cleanup();
- void cleanupTestCase();
-
- void someTest();
-};
-
-#endif // %{APPNAME}TEST_H
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/CMakeLists.txt kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/CMakeLists.txt
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/CMakeLists.txt 2009-08-30 21:22:57.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4core_qtest/tests/CMakeLists.txt 2010-07-17 20:08:19.000000000 +0100
@@ -1,8 +1,8 @@
include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
set(CMAKE_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-set(%{APPNAME}Test_SRCS %{APPNAME}Test.cpp)
-qt4_automoc(${%{APPNAME}Test_SRCS})
-add_executable(%{APPNAME}Test ${%{APPNAME}Test_SRCS})
-add_test(%{APPNAME}Test %{APPNAME}Test)
-target_link_libraries(%{APPNAME}Test ${QT_QTTEST_LIBRARY})
+set(%{APPNAMEID}Test_SRCS %{APPNAMEID}Test.cpp)
+qt4_automoc(${%{APPNAMEID}Test_SRCS})
+add_executable(%{APPNAMEID}Test ${%{APPNAMEID}Test_SRCS})
+add_test(%{APPNAMEID}Test %{APPNAMEID}Test)
+target_link_libraries(%{APPNAMEID}Test ${QT_QTTEST_LIBRARY})
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAME}.cpp kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAME}.cpp
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAME}.cpp 2009-08-30 21:22:57.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAME}.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-#include "%{APPNAME}.h"
-
-#include
-#include
-#include
-#include
-
-%{APPNAME}::%{APPNAME}()
-{
- QLabel* l = new QLabel( this );
- l->setText( "Hello World!" );
- setCentralWidget( l );
- QAction* a = new QAction(this);
- a->setText( "Quit" );
- connect(a, SIGNAL(triggered()), SLOT(close()) );
- menuBar()->addMenu( "File" )->addAction( a );
-}
-
-%{APPNAME}::~%{APPNAME}()
-{}
-
-#include "%{APPNAME}.moc"
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAME}.h kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAME}.h
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAME}.h 2009-08-30 21:22:57.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAME}.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-#ifndef %{APPNAME}_H
-#define %{APPNAME}_H
-
-#include
-
-class %{APPNAME} : public QMainWindow
-{
-Q_OBJECT
-public:
- %{APPNAME}();
- virtual ~%{APPNAME}();
-};
-
-#endif // %{APPNAME}_H
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAMEID}.cpp kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAMEID}.cpp
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAMEID}.cpp 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAMEID}.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -0,0 +1,22 @@
+#include "%{APPNAMEID}.h"
+
+#include
+#include
+#include
+#include
+
+%{APPNAMEID}::%{APPNAMEID}()
+{
+ QLabel* l = new QLabel( this );
+ l->setText( "Hello World!" );
+ setCentralWidget( l );
+ QAction* a = new QAction(this);
+ a->setText( "Quit" );
+ connect(a, SIGNAL(triggered()), SLOT(close()) );
+ menuBar()->addMenu( "File" )->addAction( a );
+}
+
+%{APPNAMEID}::~%{APPNAMEID}()
+{}
+
+#include "%{APPNAMEID}.moc"
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAMEID}.h kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAMEID}.h
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAMEID}.h 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4gui/%{APPNAMEID}.h 2010-07-17 20:08:19.000000000 +0100
@@ -0,0 +1,14 @@
+#ifndef %{APPNAMEID}_H
+#define %{APPNAMEID}_H
+
+#include
+
+class %{APPNAMEID} : public QMainWindow
+{
+Q_OBJECT
+public:
+ %{APPNAMEID}();
+ virtual ~%{APPNAMEID}();
+};
+
+#endif // %{APPNAME}_H
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4gui/CMakeLists.txt kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4gui/CMakeLists.txt
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4gui/CMakeLists.txt 2009-08-30 21:22:57.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4gui/CMakeLists.txt 2010-07-17 20:08:19.000000000 +0100
@@ -1,10 +1,10 @@
-project(%{APPNAME})
+project(%{APPNAMEID})
cmake_minimum_required(VERSION 2.6)
find_package(Qt4 REQUIRED)
include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
-set(%{APPNAME}_SRCS %{APPNAME}.cpp main.cpp)
-qt4_automoc(${%{APPNAME}_SRCS})
-add_executable(%{APPNAME} ${%{APPNAME}_SRCS})
-target_link_libraries(%{APPNAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+set(%{APPNAMEID}_SRCS %{APPNAMEID}.cpp main.cpp)
+qt4_automoc(${%{APPNAMEID}_SRCS})
+add_executable(%{APPNAMEID} ${%{APPNAMEID}_SRCS})
+target_link_libraries(%{APPNAMEID} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4gui/cmake_qt4gui.kdevtemplate kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4gui/cmake_qt4gui.kdevtemplate
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4gui/cmake_qt4gui.kdevtemplate 2010-01-19 12:39:48.000000000 +0000
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4gui/cmake_qt4gui.kdevtemplate 2010-07-17 20:08:19.000000000 +0100
@@ -4,6 +4,7 @@
Name[ca]=Aplicació IGU Qt4 CMake
Name[ca@valencia]=Aplicació IGU Qt4 CMake
Name[cs]=Aplikace Qt4 CMake Gui
+Name[da]=Qt4 CMake gui-applikation
Name[de]=Qt-4/CMake-GUI-Anwendung
Name[en_GB]=Qt4 CMake Gui application
Name[es]=Aplicación de interfaz gráfica CMake para Qt4
@@ -11,10 +12,12 @@
Name[fi]=Qt4 CMake graafinen käyttöliittymäsovellus
Name[fr]=Application avec interface graphique CMake pour Qt4
Name[gl]=Programa básico con GUI de Qt4 con CMake
-Name[it]=Applicazione con GUI Qt4 con CMake
+Name[it]=Applicazione con GUI in Qt4 con CMake
+Name[ja]=Qt4 CMake Gui アプリケーション
Name[nb]=Qt4 CMake Gui-program
Name[nds]=Qt4-CMake-Böversietprogramm
Name[nl]=Qt4 CMake Gui-programma
+Name[pl]=Program Qt4 z graficznym interfejsem użytkownika używający CMake
Name[pt]=Aplicação gráfica com CMake para Qt4
Name[pt_BR]=Aplicativo de Interface em Qt4 CMake
Name[sv]=Qt4 CMake-program med grafiskt användargränssnitt
@@ -27,6 +30,7 @@
Comment=Generate a CMake/Qt4 based GUI application (crossplatform compatible)
Comment[ca]=Genera una aplicació basada en CMake/Qt4 (multi plataforma)
Comment[ca@valencia]=Genera una aplicació basada en CMake/Qt4 (multi plataforma)
+Comment[da]=Genererer et CMake-/Qt4-baseret gui-applikation (krydsplatform kompatibelt)
Comment[de]=Erstellt eine auf CMake und der Qt-4-GUI basierende Anwendung (Plattformunabhängig)
Comment[en_GB]=Generate a CMake/Qt4 based GUI application (crossplatform compatible)
Comment[es]=Genera una aplicación con interfaz gráfica basada en CMake/Qt4 (compatible multiplataforma)
@@ -34,9 +38,12 @@
Comment[fi]=Generoi CMake/Qt4-perustainen graafinen käyttöliittymäsovellus (eri käyttöjärjestelmissä yhteensopiva)
Comment[fr]=Génère une application avec interface graphique utilisant CMake/Qt4 (compatible multi-plateforme)
Comment[gl]=Xera un programa con GUI baseado en CMake/Qt4 (compatíbel con multiplataforma)
+Comment[it]=Genera un'applicazione con GUI basata su CMake/Qt4 (compatibile multipiattaforma)
+Comment[ja]=CMake/Qt4 ベースの GUI アプリケーションを作成 (クロスプラットフォーム)
Comment[nb]=Lag et program med grafisk brukerflate basert på CMake/Qt4 (kryssplattform-kompatibelt)
Comment[nds]=En op CMake un Qt4 opbuut Böversiet-Programm opstellen (över Bedriefümgeven weg kompatibel)
Comment[nl]=Genereert een Cmake/Qt4-gebaseerd programma (crossplatform compatibel)
+Comment[pl]=Generuje program z graficznym interfejsem użytkownika używający CMake i Qt4 (wieloplatformowy)
Comment[pt]=Gera uma aplicação gráfica baseada no QMake/Qt4 (compatível com várias plataformas)
Comment[pt_BR]=Gera um aplicativo de interface em CMake/Qt4 (compatível com várias plataformas)
Comment[sv]=Skapar ett QMake- och Qt4-baserat program med grafiskt användargränssnitt (som fungerar på flera plattformar)
diff -Nru kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4gui/main.cpp kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4gui/main.cpp
--- kdevelop-3.9.98/app_templates/cpp/CMake/cmake_qt4gui/main.cpp 2009-08-30 21:22:57.000000000 +0100
+++ kdevelop-4.0.1/app_templates/cpp/CMake/cmake_qt4gui/main.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -1,11 +1,11 @@
#include
-#include "%{APPNAME}.h"
+#include "%{APPNAMEID}.h"
int main(int argc, char** argv)
{
QApplication app(argc, argv);
- %{APPNAME} foo;
+ %{APPNAMEID} foo;
foo.show();
return app.exec();
}
diff -Nru kdevelop-3.9.98/BUGS kdevelop-4.0.1/BUGS
--- kdevelop-3.9.98/BUGS 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/BUGS 2010-07-17 20:08:19.000000000 +0100
@@ -0,0 +1,12 @@
+-when adjusting the project setting you get this:
+ CXXFLAGS= -O2 -g3 -Wall : Command not found.
+
+please use bash as your login shell until the bug is fixed
+
+These are not considered as bugs but a lack of implementation and described for those who will complain:
+
+- The classparser does no macro expansion
+- The widget editor does not generate geometry management implementations
+- TMake is not yet supported
+- KDE 2 is not supported, neither Qt 2.0. KDE 2 is in development and KDevelop will be ported after the next KDE 1.1.x release.
+- If the generation of the KDE libs documentation fails, go to http://developer.kde.org or www.kdevelop.org and get the tar'ed documentation.
diff -Nru kdevelop-3.9.98/cmake/modules/FindCheck.cmake kdevelop-4.0.1/cmake/modules/FindCheck.cmake
--- kdevelop-3.9.98/cmake/modules/FindCheck.cmake 2009-08-30 21:22:57.000000000 +0100
+++ kdevelop-4.0.1/cmake/modules/FindCheck.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-# Find Check, a C unit testing framework.
-#
-# This script tries to set the following variables:
-#
-# CHECK_FOUND - what you'd expect
-# CHECK_INCLUDE_DIR - the TDB include directory
-# CHECK_LIBRARIES - Link these to use TDB
-#
-# Copyright (c) 2008, Manuel Breugelmans
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-find_path(CHECK_INCLUDE_DIR
- check.h )
-
-find_library(CHECK_LIBRARY
- NAMES check )
-
-if (CHECK_INCLUDE_DIR AND CHECK_LIBRARY)
- set(CHECK_FOUND on)
-endif (CHECK_INCLUDE_DIR AND CHECK_LIBRARY)
-macro_log_feature(CHECK_FOUND "Check" "A unit testing framework for C" "http://check.sourceforge.net/" FALSE "" "Needed for building the Check test runner")
diff -Nru kdevelop-3.9.98/cmake/modules/FindCppUnit.cmake kdevelop-4.0.1/cmake/modules/FindCppUnit.cmake
--- kdevelop-3.9.98/cmake/modules/FindCppUnit.cmake 2009-08-30 21:22:57.000000000 +0100
+++ kdevelop-4.0.1/cmake/modules/FindCppUnit.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-
-find_path(CPPUNIT_INCLUDE_DIR
- TestSuite.h PATH_SUFFIXES cppunit )
-
-find_library(CPPUNIT_LIBRARY
- NAMES cppunit-1.12 cppunit )
-
-if (CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)
- set(CPPUNIT_FOUND on)
-endif (CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)
-macro_log_feature(CPPUNIT_FOUND "CppUnit" "A C++ unit testing framework" "http://cppunit.sourceforge.net" FALSE "" "Needed for building the CppUnit test runner")
diff -Nru kdevelop-3.9.98/CMakeLists.txt kdevelop-4.0.1/CMakeLists.txt
--- kdevelop-3.9.98/CMakeLists.txt 2010-02-10 19:26:13.000000000 +0000
+++ kdevelop-4.0.1/CMakeLists.txt 2010-07-17 20:14:00.000000000 +0100
@@ -4,9 +4,9 @@
set(CMAKE_MODULE_PATH ${KDevelop_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
-set( KDEVELOP_VERSION_MAJOR 3 )
-set( KDEVELOP_VERSION_MINOR 9 )
-set( KDEVELOP_VERSION_PATCH 98 )
+set( KDEVELOP_VERSION_MAJOR 4 )
+set( KDEVELOP_VERSION_MINOR 0 )
+set( KDEVELOP_VERSION_PATCH 1 )
set(KDE_MIN_VERSION "4.3.0")
find_package(KDE4 4.3.0 REQUIRED)
@@ -16,30 +16,18 @@
include (MacroLibrary)
include (MacroOptionalAddSubdirectory)
-if( extragear-sdk_SOURCE_DIR )
- if ( ${extragear-sdk_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR} )
- set( KDEVPLATFORM_FOUND TRUE )
- include_directories( ${CMAKE_SOURCE_DIR}/kdevplatform ${CMAKE_SOURCE_DIR}/kdevplatform/plugins )
- set( KDEVPLATFORM_INTERFACES_LIBRARIES kdevplatforminterfaces )
- set( KDEVPLATFORM_SHELL_LIBRARIES kdevplatformshell )
- set( KDEVPLATFORM_TESTS_LIBRARIES kdevplatformtests )
- set( KDEVPLATFORM_UTIL_LIBRARIES kdevplatformutil )
- set( KDEVPLATFORM_PROJECT_LIBRARIES kdevplatformproject )
- set( KDEVPLATFORM_OUTPUTVIEW_LIBRARIES kdevplatformoutputview )
- set( KDEVPLATFORM_LANGUAGE_LIBRARIES kdevplatformlanguage )
- set( KDEVPLATFORM_VCS_LIBRARIES kdevplatformvcs )
- set( KDEVPLATFORM_DEBUGGER_LIBRARIES kdevplatformdebugger )
- set( KDEVPLATFORM_SUBLIME_LIBRARIES sublime )
- include( ${CMAKE_SOURCE_DIR}/kdevplatform/cmake/modules/KDevPlatformMacros.cmake )
- endif ( ${extragear-sdk_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR} )
-endif( extragear-sdk_SOURCE_DIR )
+# Make sure that we're having RPATH on our installed libs, else using kdevelop
+# from prefixes like $HOME/kdevelop breaks
+# Code taken from FindKDE4Internal.cmake from KDE 4.5
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}"
+ _isSystemLibDir)
+if("${_isSystemLibDir}" STREQUAL "-1")
+ set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
+endif("${_isSystemLibDir}" STREQUAL "-1")
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-if( NOT KDEVPLATFORM_FOUND )
-
- find_package(KDevPlatform 0.9.98 REQUIRED)
- include_directories(${KDEVPLATFORM_INCLUDE_DIR})
-
-endif( NOT KDEVPLATFORM_FOUND )
+find_package(KDevPlatform 1.0.0 REQUIRED)
+include_directories(${KDEVPLATFORM_INCLUDE_DIR})
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DHAVE_CONFIG_H=1)
@@ -63,3 +51,6 @@
macro_display_feature_log()
+
+include(MacroOptionalAddSubdirectory)
+macro_optional_add_subdirectory( po )
diff -Nru kdevelop-3.9.98/debian/changelog kdevelop-4.0.1/debian/changelog
--- kdevelop-3.9.98/debian/changelog 2010-08-10 23:36:30.000000000 +0100
+++ kdevelop-4.0.1/debian/changelog 2010-08-10 23:30:21.000000000 +0100
@@ -1,61 +1,121 @@
-kdevelop (4:3.9.98-0ubuntu1) lucid; urgency=low
+kdevelop (4:4.0.1-2~ppa1) lucid; urgency=low
- * New upstream release
- - Build against kdevplatform 3.9.98
- - Refresh 10_private_libs_soversion.diff
- - Update kdevelop.install
+ * Backport to lucid
- -- Alessandro Ghersi Sat, 13 Feb 2010 04:48:19 +0100
+ -- Emanuele Wed, 11 Aug 2010 00:30:01 +0200
-kdevelop (4:3.9.97a-0ubuntu1) lucid; urgency=low
+kdevelop (4:4.0.1-1ubuntu2) maverick; urgency=low
- * New tar from upstream
+ * Disable parallel building to fix FTBFS.
- -- Jonathan Riddell Wed, 16 Dec 2009 12:49:50 +0000
+ -- Felix Geyer Tue, 03 Aug 2010 15:31:02 +0200
-kdevelop (4:3.9.97-0ubuntu1) lucid; urgency=low
+kdevelop (4:4.0.1-1ubuntu1) maverick; urgency=low
- * New upstream beta release
+ * Set export KUBUNTU_DESKTOP_POT=extragear-sdk_kdevelop
- -- Jonathan Riddell Mon, 14 Dec 2009 21:27:24 +0000
+ -- Jonathan Riddell Mon, 26 Jul 2010 18:22:28 +0100
-kdevelop (4:3.9.96-0ubuntu1) lucid; urgency=low
+kdevelop (4:4.0.1-1) unstable; urgency=low
- * Sync with Debian experimental
- * New upstream release:
- - Drop the version correction patch, not needed for upstream version
- - Bump build-depend versions
- - Update .install files
+ * New upstream release.
+ * Add localization packages: Finnish (fi), Dutch (nl), Slovenian (sl) and
+ Thai (th).
+ * Update debian/control:
+ - bump Standards-Version to 3.9.0 (no changes needed).
+ - bump kdevplatform-dev and kdebase-workspace-dev build dependency version.
+ - add shared-mime-info build dependency.
+ - comment turkish localization package, not shipped in this release.
+ * Update debian/rules: remove workaround for FindKDE4Internal.cmake default
+ rpath value, fixed in kdelibs5-dev 4.4.1.
- -- Jonathan Thomas Wed, 04 Nov 2009 09:59:31 -0500
+ -- Fathi Boudra Fri, 23 Jul 2010 20:08:00 +0300
-kdevelop (4:3.9.95-0ubuntu3) karmic; urgency=low
+kdevelop (4:4.0.0-2) unstable; urgency=low
- * Add kubuntu_01_fix_gdb_ver_check.diff from upstream to fix compatibility
- with gdb 7.0 (LP: #450462)
+ * Upload to unstable (Closes: #579947, #481832).
+ * Acknowledge obsolete NMU fixes (Closes: #562410, #546961).
- -- Jonathan Thomas Tue, 13 Oct 2009 12:02:39 -0400
+ -- Jeremy Lainé Wed, 05 May 2010 07:21:55 +0200
-kdevelop (4:3.9.95-2) experimental; urgency=low
+kdevelop (4:4.0.0-1) experimental; urgency=low
- * Add patch to fix kdevelop version.
+ * New upstream release (Closes: #579947, #481832).
+ * Update debian/control:
+ - Bump kdevplatform-dev build dependency version.
+ * Acknowledge obsolete NMU fixes (Closes: #562410, #546961).
- -- Fathi Boudra Mon, 24 Aug 2009 09:24:47 +0200
+ -- Jeremy Lainé Tue, 04 May 2010 08:12:22 +0200
+
+kdevelop (4:3.10.2-1) experimental; urgency=low
+
+ * New upstream release.
+ * Add localizations packages.
+
+ -- Fathi Boudra Sat, 17 Apr 2010 13:43:11 +0300
+
+kdevelop (4:3.10.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Switch to dpkg-source 3.0 (quilt) format.
+ * Update debian/copyright: update authors list.
+ * Add debian/kdevelop.lintian-overrides: override postinst/postrm errors.
+
+ -- Fathi Boudra Sun, 04 Apr 2010 11:45:29 +0200
+
+kdevelop (4:3.9.99-1) experimental; urgency=low
+
+ * New upstream release.
+ * Update debian/control:
+ - Suggests cmake package. (Closes: #561507)
+ - Bump kdevplatform-dev build dependency version.
+
+ -- Fathi Boudra Thu, 18 Feb 2010 09:43:49 +0100
+
+kdevelop (4:3.9.98-1) experimental; urgency=low
+
+ * New upstream release.
+
+ [ Fathi Boudra ]
+ * Remove 10_private_libs_soversion.diff patch.
+ * Update debian/control:
+ - Bump build dependencies versions (debhelper, pkg-kde-tools and
+ kdevplatform-dev).
+ - Bump Standards-Version to 3.8.4 (no changes needed).
+ * Update debian/kdevelop-dev.install file.
+ * Update debian/kdevelop.install file.
+ * Add debian/kdevelop.lintian-overrides file.
+ * Update debian/rules: pass -DCMAKE_SKIP_RPATH=ON
+ to workaround FindKDE4Internal.cmake default rpath value.
-kdevelop (4:3.9.95-0ubuntu2) karmic; urgency=low
+ [ Modestas Vainius ]
+ * Fix Vcs-Browser URL.
- * Fix 10_private_libs_soversion.diff to prevent FTBFS
+ -- Fathi Boudra Thu, 11 Feb 2010 16:48:26 +0100
- -- Jonathan Thomas Sat, 22 Aug 2009 19:53:34 -0400
+kdevelop (4:3.9.97-1) experimental; urgency=low
-kdevelop (4:3.9.95-0ubuntu1) karmic; urgency=low
+ * New upstream release.
+ * Drop 01_kdevelop_r1044086.diff and 02_kdevelop_r1044721.diff patches.
+ * Update debian/kdevelop-data.install: remove valgrind plugin.
- * New upstream release:
- - Fixes LP: #407526
- * Merge from Debian Experimental, remaining changes:
- - Conflict/replace on old -kde4 packages, this can go away in karmic+1
+ -- Fathi Boudra Sat, 12 Dec 2009 20:47:28 +0100
- -- Jonathan Thomas Sat, 22 Aug 2009 15:48:51 -0400
+kdevelop (4:3.9.96-1) experimental; urgency=low
+
+ * New upstream release.
+ * Add 01_kdevelop_r1044086.diff and 02_kdevelop_r1044721.diff patches.
+ * Remove kdevelop version fix.
+ * Update debian/kdevelop-data.install: re-add usr/share/icons/* entry and
+ update installed files.
+
+ -- Fathi Boudra Thu, 12 Nov 2009 16:34:51 +0100
+
+kdevelop (4:3.9.95-2) experimental; urgency=low
+
+ * Add patch to fix kdevelop version.
+
+ -- Fathi Boudra Mon, 24 Aug 2009 09:24:47 +0200
kdevelop (4:3.9.95-1) experimental; urgency=low
@@ -75,14 +135,6 @@
-- Fathi Boudra Tue, 11 Aug 2009 15:57:35 +0200
-kdevelop (4:3.9.94-1ubuntu1) karmic; urgency=low
-
- * Merge from Debian experimental, remaining changes:
- - Conflict/replace -kde4 packages
- - Remove gdb from recommends, version >= 6.8.50 is not yet in Ubuntu
-
- -- Alessandro Ghersi Sun, 28 Jun 2009 20:48:13 +0200
-
kdevelop (4:3.9.94-1) experimental; urgency=low
* New upstream release.
@@ -93,13 +145,6 @@
-- Fathi Boudra Tue, 02 Jun 2009 21:43:19 +0200
-kdevelop (4:3.9.93-1ubuntu1) karmic; urgency=low
-
- * Merge from Debian experimental, remaining changes:
- - Conflict/replace -kde4 packages
-
- -- Jonathan Thomas Mon, 25 May 2009 19:34:26 -0400
-
kdevelop (4:3.9.93-1) experimental; urgency=low
* New upstream release.
@@ -119,24 +164,6 @@
-- Jeremy Lainé Mon, 27 Apr 2009 08:18:04 +0200
-kdevelop-kde4 (4:3.9.91-0ubuntu2) jaunty; urgency=low
-
- * Add kdevplatform to depends so plugins work (LP: #326342)
-
- -- Scott Kitterman Fri, 06 Feb 2009 18:02:03 -0500
-
-kdevelop-kde4 (4:3.9.91-0ubuntu1) jaunty; urgency=low
-
- * New upstream beta release
-
- -- Jonathan Riddell Thu, 05 Feb 2009 14:50:09 +0000
-
-kdevelop-kde4 (4:3.9.90-0ubuntu1) jaunty; urgency=low
-
- * New upstream beta release
-
- -- Jonathan Riddell Wed, 28 Jan 2009 12:05:37 +0000
-
kdevelop (4:3.5.2-1) unstable; urgency=low
* New upstream release.
@@ -299,7 +326,7 @@
* Remove circular dependencies (Closes: #368474)
* Merge kdevelop-plugins into kdevelop
- * Add Recommends on libtool (Closes: #284694)
+ * Add Recommends on libtool (Closes: #284694)
* Update to standards version 3.7.2
* Update versioned Build-Depends on debhelper to >= 5
* Add debian/watch file
@@ -329,7 +356,7 @@
kdevelop3 (4:3.3.1-1) unstable; urgency=low
- * New upstream release
+ * New upstream release
- fix code completion for external libraries (Closes: #355444, #351290)
* Build-Depends on automake1.9, not automaken
* Fix KOffice part C++ template (Closes: #345279)
@@ -351,7 +378,7 @@
* Add Jeremy Lainé to maintainers, acknowledge NMU fixes (Closes: #274966,
#295659, #302133, #304203, #304419, #306485, #309351, #311153, #312160,
#312161, #315170, #326883, #326929, #327710, #327730, #330037, #330038,
- #331346, #336094, #341990)
+ #331346, #336094, #341990)
* Switch to Debian Qt/KDE team's CDBS scripts
* Update Suggests and README.Debian regarding SVN integration
* Remove explicit Build-Depends on g++-3.4 (Closes: #342991)
@@ -411,7 +438,7 @@
* Non-maintainer upload
* Fix kdevdesigner crash on start (Closes: #309351)
* Fix kdevassistant crash on start (Closes: #274966)
- * Fix file permissions of Python/Qt examples (Closes: #330037, #330038)
+ * Fix file permissions of Python/Qt examples (Closes: #330037, #330038)
-- Jeremy Lainé Thu, 15 Sep 2005 08:37:32 +0200
@@ -422,15 +449,15 @@
* Build against new Qt / KDE libraries (Closes: #326929)
* Fix lintian warnings:
- Update to Standards-Version 3.6.2
- - Replace possible bashism "-a" by "&&" in debian/config
+ - Replace possible bashism "-a" by "&&" in debian/config
* Add Suggests on kdesdk-misc to provide kio_svn files
* Translation fixes:
- - Fix debian/templates.master, run debconf-updatepo (Closes: #312161)
+ - Fix debian/templates.master, run debconf-updatepo (Closes: #312161)
- Add Vietnamese debconf translation (Closes: #312160)
- Update Brazilian translation (Closes: #304419)
* Fix adding new classes to qmake projects (Closes: #315170)
* Remove X-KDE-KDevelopIDE category from .desktop entries
- * Add --disable-rpath to configure flags (Closes: #327710)
+ * Add --disable-rpath to configure flags (Closes: #327710)
* Fix debian/menu , package is 'kdevelop3' not 'kdevelop' (Closes: #311153)
* Fix some references to 'kdevelop' in .desktop files (Closes: #304203)
* Add missing Depends on debconf (Closes: #327730)
@@ -925,7 +952,7 @@
kdevelop (1:1.4.0-3.4) unstable; urgency=low
- * Updated the build-depends field
+ * Updated the build-depends field
-- Norman Jordan Sun, 13 May 2001 22:17:08 -0700
@@ -939,52 +966,52 @@
* Change Maintainer (Closes: #90814)
* No longer installs extractrc (Closes: #93012)
- * Suggests kdesdk-scripts
+ * Suggests kdesdk-scripts
-- Norman Jordan Thu, 5 Apr 2001 11:03:57 -0700
kdevelop (1:1.4.0-3.1) unstable; urgency=low
-
+
* NMU
* Fixing build-depends (Closes: #92190)
-
+
-- Ivan E. Moore II Fri, 30 Mar 2001 21:22:00 -0700
kdevelop (1:1.4.0-3) unstable; urgency=low
-
+
* Change Maintainer
* More upstream fixes while I'm at it
-
+
-- Ivan E. Moore II Fri, 23 Mar 2001 03:00:00 -0700
kdevelop (1:1.4.0-2) unstable; urgency=low
-
+
* Removed non en docs as they are provided in kde-i18n now
-
+
-- Ivan E. Moore II Sun, 04 Mar 2001 20:00:00 -0700
kdevelop (1:1.4.0-1) unstable; urgency=low
-
+
* Cleaned up source based off of current CVS branch
* Fix desktop file (Closes: #87802)
* Update Build-Depends
* If you install qt-doc and not qt2.2-doc this works (Closes: #88185)
-
+
-- Ivan E. Moore II Fri, 02 Mar 2001 07:00:00 -0700
kdevelop (1:1.4-final-1) unstable; urgency=low
-
+
* New upstream release
* Fix kde-i18n conflicts (Closes: #87381)
-
+
-- Ivan E. Moore II Mon, 19 Feb 2001 02:06:00 -0700
kdevelop (1:1.4-20010218-1) unstable; urgency=low
-
+
* New upstream cvs pull
* New upload to Debian with permission of Raphael Bossek who did the ITP
* Updating for potato/woody/sid
-
+
-- Ivan E. Moore II Sun, 18 Feb 2001 02:06:00 -0700
kdevelop (1:1.4-20010127-1) unstable; urgency=low
@@ -1005,7 +1032,7 @@
kdevelop (1:1.1beta2-20000206-1) stable; urgency=low
* Back to old configure arguments
- * Mentioned debugger in control file,
+ * Mentioned debugger in control file,
made kdebase a dependency
-- Bernd Gehrmann Mon, 7 Feb 2000 00:10:59 +0100
@@ -1082,10 +1109,7 @@
kdevelop (990422-1) experimental; urgency=low
- * Initial Release
+ * Initial Release
-- Bernd Gehrmann Thu, 22 Apr 1999 20:33:18 +0200
-Local variables:
-mode: debian-changelog
-End:
diff -Nru kdevelop-3.9.98/debian/control kdevelop-4.0.1/debian/control
--- kdevelop-3.9.98/debian/control 2010-08-10 23:36:30.000000000 +0100
+++ kdevelop-4.0.1/debian/control 2010-07-26 18:22:39.000000000 +0100
@@ -4,18 +4,19 @@
Maintainer: Kubuntu Developers
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers
Uploaders: Fathi Boudra , Jeremy Lainé
-Build-Depends: cdbs, debhelper (>= 7), quilt, cmake, pkg-kde-tools,
- kdevplatform-dev (>= 0.9.98), kdebase-workspace-dev (>= 4:4.3.0)
-Standards-Version: 3.8.3
+Build-Depends: cdbs, debhelper (>= 7.4.15), quilt, cmake, pkg-kde-tools (>= 0.6.4),
+ kdevplatform-dev (>= 1.0.1), kdebase-workspace-dev (>= 4:4.4.1), shared-mime-info
+Standards-Version: 3.9.0
Homepage: http://www.kdevelop.org/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdevelop
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdevelop/#_trunk_packages_kdevelop_
Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/kdevelop
Package: kdevelop
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, kdevelop-data (>= ${source:Version}),
lcov
-Recommends: gdb (>= 6.8.50), valgrind
+Recommends: gdb (>= 7.0), valgrind
+Suggests: cmake, kdevelop-l10n
Description: integrated development environment for KDE
KDevelop is an easy to use integrated development environment for KDE.
It supports a wide range of programming languages and features project
@@ -50,3 +51,224 @@
for terminal programs and GUI programs using Qt, KDE or GNOME.
.
This package contains development files for KDevelop.
+
+Package: kdevelop-l10n-ca
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-ca
+Provides: kdevelop-l10n
+Description: Catalan (ca) localization files for the KDevelop IDE
+ This package contains the Catalan translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-cavalencia
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-cavalencia
+Provides: kdevelop-l10n
+Description: Southern Catalan (Valencian) (ca@valencia) files for the KDevelop IDE
+ This package contains the Southern Catalan (Valencian) translations
+ for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-da
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-da
+Provides: kdevelop-l10n
+Description: Danish (da) localization files for the KDevelop IDE
+ This package contains the Danish translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-de
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-de
+Provides: kdevelop-l10n
+Description: German (de) localization files for the KDevelop IDE
+ This package contains the German translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-engb
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-engb
+Provides: kdevelop-l10n
+Description: British English (en_GB) localization files for the KDevelop IDE
+ This package contains the British English translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-es
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-es
+Provides: kdevelop-l10n
+Description: Spanish (es) localization files for the KDevelop IDE
+ This package contains the Spanish translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-et
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-et
+Provides: kdevelop-l10n
+Description: Estonian (et) localization files for the KDevelop IDE
+ This package contains the Estonian translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-fi
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-fi
+Provides: kdevelop-l10n
+Description: Finnish (fi) localization files for the KDevelop IDE
+ This package contains the Finnish translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-fr
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-fr
+Provides: kdevelop-l10n
+Description: French (fr) localization files for the KDevelop IDE
+ This package contains the French translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-gl
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-gl
+Provides: kdevelop-l10n
+Description: Galician (gl) localization files for the KDevelop IDE
+ This package contains the Galician translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-it
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-it
+Provides: kdevelop-l10n
+Description: Italian (it) localization files for the KDevelop IDE
+ This package contains the Italian translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-nds
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-nds
+Provides: kdevelop-l10n
+Description: Low Saxon (nds) localization files for the KDevelop IDE
+ This package contains the Low Saxon translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-nl
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-nl
+Provides: kdevelop-l10n
+Description: Dutch (nl) localization files for the KDevelop IDE
+ This package contains the Dutch translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-pt
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-pt
+Provides: kdevelop-l10n
+Description: Portugese (pt) localization files for the KDevelop IDE
+ This package contains the Portugese translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-ptbr
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-ptbr
+Provides: kdevelop-l10n
+Description: Brazilian Portugese (pt_BR) localization files for the KDevelop IDE
+ This package contains the Brazilian Portugese translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-sl
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-sl
+Provides: kdevelop-l10n
+Description: Slovenian (sl) localization files for the KDevelop IDE
+ This package contains the Slovenian translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-sv
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-sv
+Provides: kdevelop-l10n
+Description: Swedish (sv) localization files for the KDevelop IDE
+ This package contains the Swedish translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-th
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-th
+Provides: kdevelop-l10n
+Description: Thai (th) localization files for the KDevelop IDE
+ This package contains the Thai translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+#Package: kdevelop-l10n-tr
+#Section: localization
+#Architecture: all
+#Recommends: kdevplatform-l10n-tr
+#Provides: kdevelop-l10n
+#Description: Turkish (tr) localization files for the KDevelop IDE
+# This package contains the Turkish translations for KDevelop.
+# .
+# This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-uk
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-uk
+Provides: kdevelop-l10n
+Description: Ukrainian (uk) localization files for the KDevelop IDE
+ This package contains the Ukrainian translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-zhcn
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-zhcn
+Provides: kdevelop-l10n
+Description: Chinese Simplified (zh_CN) localization files for the KDevelop IDE
+ This package contains the Chinese Simplified translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
+
+Package: kdevelop-l10n-zhtw
+Section: localization
+Architecture: all
+Recommends: kdevplatform-l10n-zhtw
+Provides: kdevelop-l10n
+Description: Chinese Traditional (zh_TW) localization files for the KDevelop IDE
+ This package contains the Chinese Traditional translations for KDevelop.
+ .
+ This package is part of the KDevelop IDE.
diff -Nru kdevelop-3.9.98/debian/copyright kdevelop-4.0.1/debian/copyright
--- kdevelop-3.9.98/debian/copyright 2010-08-10 23:36:30.000000000 +0100
+++ kdevelop-4.0.1/debian/copyright 2010-04-05 11:41:10.000000000 +0100
@@ -1,62 +1,84 @@
-This package was debianized by Bernd Gehrmann ,
-then maintained by Ivan E. Moore II and
-Norman Jordan .
+This work was packaged for Debian by:
-The current Debian maintainer is Jeremy Lainé .
+ Bernd Gehrmann
+ Ivan E. Moore II
+ Norman Jordan
+ Jeremy Lainé
+ Fathi Boudra
-It was downloaded from http://www.kdevelop.org/
+It was downloaded from:
-Upstream Authors:
+ http://www.kdevelop.org
- Bernd Gehrmann
- John Birch
- Jonas Nordin
- Richard Dale
- Sandy Meier
- Matthias Hoelzer-Kluepfel
- Victor Roeder
- Kurth Granroth
- The KWrite authors
- Roberto Raggi
- Harald Fernengel
- Simon Hausmann
- Mickael Marchand
- Dominic Seichter
- Yann Hodique
- Heinz Hornung
- Marion Klein
- Ramón Lamana Villar
- Caleb Tennis
- Mario Scalas
- Alexander Dymo
- Dominik Haumann
- Ian Reinhart Geiser
- Amilcar Lucas
- Jens Dagerbo
- Robert Gruber
+Upstream Authors:
-Copyright: 1999-2006 The KDevelop developers
+ Andreas Pakulat
+ Alexander Dymo
+ David Nolden
+ Aleix Pol Gonzalez
+ Vladimir Prus
+ Hamish Rodda
+ Amilcar do Carmo Lucas
+ Niko Sams
+ Milian Wolff
+ Bernd Gehrmann
+ John Birch
+ Jonas Nordin
+ Richard Dale
+ Sandy Meier
+ Matthias Hoelzer-Kluepfel
+ Victor Roeder
+ Kurth Granroth
+ The KWrite authors
+ Roberto Raggi
+ Harald Fernengel
+ Simon Hausmann
+ Mickael Marchand
+ Dominic Seichter
+ Yann Hodique
+ Heinz Hornung
+ Marion Klein
+ Ramón Lamana Villar
+ Caleb Tennis
+ Mario Scalas
+ Dominik Haumann
+ Ian Reinhart Geiser
+ Jens Dagerbo
+ Robert Gruber
+
+Copyright:
+
+ Copyright (C) 1999-2010 The KDevelop developers
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 and version 3 can be found in
+"/usr/share/common-licenses/GPL-2" and "/usr/share/common-licenses/GPL-3".
+
+The Debian packaging is:
+
+ Copyright (C) 2009-2010 Fathi Boudra
+ Copyright (C) 2005-2009 Jeremy Lainé
+ Copyright (C) 2001-2005 Norman Jordan
+ Copyright (C) 1999-2001 Ivan E. Moore II
+ Copyright (C) 1999-2000 Bernd Gehrmann
-This program is free software; you can redistribute it and/or modify
+you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License with
-the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-if not, write to the Free Software Foundation, Inc., 51 Franklin St,
-Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License, version 2, can be found in `/usr/share/common-licenses/GPL-2'.
-
-The Debian packaging is (C) 1999-2008 Bernd Gehrmann
-, Ivan E. Moore II ,
-Norman Jordan , Jeremy Lainé ,
-Fathi Boudra and is licensed under the GPL, see above.
-
diff -Nru kdevelop-3.9.98/debian/kdevelop-data.install kdevelop-4.0.1/debian/kdevelop-data.install
--- kdevelop-3.9.98/debian/kdevelop-data.install 2010-08-10 23:36:30.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-data.install 2010-07-23 21:34:27.000000000 +0100
@@ -1,3 +1,4 @@
+usr/share/icons/*
usr/share/kde4/apps/kdevappwizard/*
usr/share/kde4/apps/kdevcmakebuilder/*
usr/share/kde4/apps/kdevcmakemanager/*
@@ -6,4 +7,4 @@
usr/share/kde4/apps/kdevelop/*
usr/share/kde4/apps/kdevgdb/*
usr/share/kde4/config/*
-usr/share/icons/hicolor/*
+usr/share/mime/packages/kdevelop.xml
diff -Nru kdevelop-3.9.98/debian/kdevelop-dev.install kdevelop-4.0.1/debian/kdevelop-dev.install
--- kdevelop-3.9.98/debian/kdevelop-dev.install 2010-08-10 23:36:30.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-dev.install 2010-02-17 21:03:39.000000000 +0000
@@ -1,3 +1,2 @@
usr/include/kdevelop/*
-usr/lib/lib*.so
usr/share/kde4/apps/cmake/*
diff -Nru kdevelop-3.9.98/debian/kdevelop.install kdevelop-4.0.1/debian/kdevelop.install
--- kdevelop-3.9.98/debian/kdevelop.install 2010-08-10 23:36:30.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop.install 2010-02-17 21:03:39.000000000 +0000
@@ -1,6 +1,6 @@
usr/bin/kdevelop
usr/bin/kdevelop.bin
usr/lib/kde4/*
-usr/lib/lib*.so.*
+usr/lib/libkdev4*.so
usr/share/applications/kde4/*
usr/share/kde4/services/*
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-ca.install kdevelop-4.0.1/debian/kdevelop-l10n-ca.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-ca.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-ca.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/ca
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-cavalencia.install kdevelop-4.0.1/debian/kdevelop-l10n-cavalencia.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-cavalencia.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-cavalencia.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/ca@valencia
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-da.install kdevelop-4.0.1/debian/kdevelop-l10n-da.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-da.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-da.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/da
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-de.install kdevelop-4.0.1/debian/kdevelop-l10n-de.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-de.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-de.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/de
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-engb.install kdevelop-4.0.1/debian/kdevelop-l10n-engb.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-engb.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-engb.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/en_GB
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-es.install kdevelop-4.0.1/debian/kdevelop-l10n-es.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-es.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-es.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/es
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-et.install kdevelop-4.0.1/debian/kdevelop-l10n-et.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-et.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-et.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/et
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-fi.install kdevelop-4.0.1/debian/kdevelop-l10n-fi.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-fi.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-fi.install 2010-07-23 05:24:24.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/fi
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-fr.install kdevelop-4.0.1/debian/kdevelop-l10n-fr.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-fr.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-fr.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/fr
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-gl.install kdevelop-4.0.1/debian/kdevelop-l10n-gl.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-gl.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-gl.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/gl
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-it.install kdevelop-4.0.1/debian/kdevelop-l10n-it.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-it.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-it.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/it
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-nds.install kdevelop-4.0.1/debian/kdevelop-l10n-nds.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-nds.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-nds.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/nds
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-nl.install kdevelop-4.0.1/debian/kdevelop-l10n-nl.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-nl.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-nl.install 2010-07-23 05:24:30.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/nl
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-ptbr.install kdevelop-4.0.1/debian/kdevelop-l10n-ptbr.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-ptbr.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-ptbr.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/pt_BR
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-pt.install kdevelop-4.0.1/debian/kdevelop-l10n-pt.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-pt.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-pt.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/pt
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-sl.install kdevelop-4.0.1/debian/kdevelop-l10n-sl.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-sl.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-sl.install 2010-07-23 05:24:35.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/sl
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-sv.install kdevelop-4.0.1/debian/kdevelop-l10n-sv.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-sv.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-sv.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/sv
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-th.install kdevelop-4.0.1/debian/kdevelop-l10n-th.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-th.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-th.install 2010-07-23 05:24:42.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/th
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-tr.install kdevelop-4.0.1/debian/kdevelop-l10n-tr.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-tr.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-tr.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/tr
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-uk.install kdevelop-4.0.1/debian/kdevelop-l10n-uk.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-uk.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-uk.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/uk
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-zhcn.install kdevelop-4.0.1/debian/kdevelop-l10n-zhcn.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-zhcn.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-zhcn.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/zh_CN
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop-l10n-zhtw.install kdevelop-4.0.1/debian/kdevelop-l10n-zhtw.install
--- kdevelop-3.9.98/debian/kdevelop-l10n-zhtw.install 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop-l10n-zhtw.install 2010-04-17 16:49:33.000000000 +0100
@@ -0,0 +1 @@
+usr/share/locale/zh_TW
\ No newline at end of file
diff -Nru kdevelop-3.9.98/debian/kdevelop.lintian-overrides kdevelop-4.0.1/debian/kdevelop.lintian-overrides
--- kdevelop-3.9.98/debian/kdevelop.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevelop.lintian-overrides 2010-04-05 11:41:10.000000000 +0100
@@ -0,0 +1,7 @@
+kdevelop: package-name-doesnt-match-sonames libkdev4cmakecommon libkdev4cppduchain libkdev4cppparser libkdev4cpprpp
+kdevelop: shlib-without-versioned-soname usr/lib/libkdev4cppparser.so libkdev4cppparser.so
+kdevelop: shlib-without-versioned-soname usr/lib/libkdev4cpprpp.so libkdev4cpprpp.so
+kdevelop: shlib-without-versioned-soname usr/lib/libkdev4cppduchain.so libkdev4cppduchain.so
+kdevelop: shlib-without-versioned-soname usr/lib/libkdev4cmakecommon.so libkdev4cmakecommon.so
+kdevelop: postinst-must-call-ldconfig usr/lib/libkdev4cpprpp.so
+kdevelop: postrm-should-call-ldconfig usr/lib/libkdev4cpprpp.so
diff -Nru kdevelop-3.9.98/debian/kdevplatform1-libs.install kdevelop-4.0.1/debian/kdevplatform1-libs.install
--- kdevelop-3.9.98/debian/kdevplatform1-libs.install 2010-08-10 23:36:30.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevplatform1-libs.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,82 +0,0 @@
-usr/lib/kde4/kcm_kdev_bgsettings.so
-usr/lib/kde4/kcm_kdev_ccsettings.so
-usr/lib/kde4/kcm_kdev_envsettings.so
-usr/lib/kde4/kcm_kdev_genericprojectmanagersettings.so
-usr/lib/kde4/kcm_kdev_pluginsettings.so
-usr/lib/kde4/kcm_kdev_projectsettings.so
-usr/lib/kde4/kcm_kdev_uisettings.so
-usr/lib/kde4/kcm_kdevsourceformattersettings.so
-usr/lib/kde4/kdevappwizard.so
-usr/lib/kde4/kdevclassbrowser.so
-usr/lib/kde4/kdevcontextbrowser.so
-usr/lib/kde4/kdevcvs.so
-usr/lib/kde4/kdevdocumentswitcher.so
-usr/lib/kde4/kdevexecute.so
-usr/lib/kde4/kdevfilemanager.so
-usr/lib/kde4/kdevgenericmanager.so
-usr/lib/kde4/kdevkonsoleview.so
-usr/lib/kde4/kdevmercurial.so
-usr/lib/kde4/kdevopenwith.so
-usr/lib/kde4/kdevpatchreview.so
-usr/lib/kde4/kdevproblemreporter.so
-usr/lib/kde4/kdevprojectmanagerview.so
-usr/lib/kde4/kdevquickopen.so
-usr/lib/kde4/kdevsnippet.so
-usr/lib/kde4/kdevsourceformatter.so
-usr/lib/kde4/kdevstandardoutputview.so
-usr/lib/kde4/kdevsubversion.so
-usr/lib/libkdevplatformdebugger.so.*
-usr/lib/libkdevplatforminterfaces.so.*
-usr/lib/libkdevplatformlanguage.so.*
-usr/lib/libkdevplatformoutputview.so.*
-usr/lib/libkdevplatformproject.so.*
-usr/lib/libkdevplatformshell.so.*
-usr/lib/libkdevplatformtests.so.*
-usr/lib/libkdevplatformutil.so.*
-usr/lib/libkdevplatformvcs.so.*
-usr/share/icons/hicolor/22x22/actions/run-clean.png
-usr/share/icons/hicolor/22x22/actions/run-install.png
-usr/share/kde4/apps/kdevappwizard/kdevappwizard.rc
-usr/share/kde4/apps/kdevappwizard/template_previews/default-kdevelop.png
-usr/share/kde4/apps/kdevclassbrowser/kdevclassbrowser.rc
-usr/share/kde4/apps/kdevcodegen/licenses
-usr/share/kde4/apps/kdevcontextbrowser/kdevcontextbrowser.rc
-usr/share/kde4/apps/kdevcvs/kdevcvs.rc
-usr/share/kde4/apps/kdevdebugger/kdevdebuggershellui.rc
-usr/share/kde4/apps/kdevdocumentswitcher/kdevdocumentswitcher.rc
-usr/share/kde4/apps/kdevfilemanager/kdevfilemanager.rc
-usr/share/kde4/apps/kdevmercurial/kdevmercurial.rc
-usr/share/kde4/apps/kdevpatchreview/kdevpatchreview.rc
-usr/share/kde4/apps/kdevproblemreporter/kdevproblemreporter.rc
-usr/share/kde4/apps/kdevprojectmanagerview/kdevprojectmanagerview.rc
-usr/share/kde4/apps/kdevquickopen/kdevquickopen.rc
-usr/share/kde4/apps/kdevsourceformatter/kdevsourceformatter.rc
-usr/share/kde4/apps/kdevstandardoutputview/kdevstandardoutputview.rc
-usr/share/kde4/services/kcm_kdev_bgsettings.desktop
-usr/share/kde4/services/kcm_kdev_ccsettings.desktop
-usr/share/kde4/services/kcm_kdev_envsettings.desktop
-usr/share/kde4/services/kcm_kdev_genericprojectmanagersettings.desktop
-usr/share/kde4/services/kcm_kdev_pluginsettings.desktop
-usr/share/kde4/services/kcm_kdev_projectsettings.desktop
-usr/share/kde4/services/kcm_kdev_uisettings.desktop
-usr/share/kde4/services/kcm_kdevsourceformattersettings.desktop
-usr/share/kde4/services/kdevappwizard.desktop
-usr/share/kde4/services/kdevclassbrowser.desktop
-usr/share/kde4/services/kdevcontextbrowser.desktop
-usr/share/kde4/services/kdevcvs.desktop
-usr/share/kde4/services/kdevdocumentswitcher.desktop
-usr/share/kde4/services/kdevexecute.desktop
-usr/share/kde4/services/kdevfilemanager.desktop
-usr/share/kde4/services/kdevgenericmanager.desktop
-usr/share/kde4/services/kdevkonsoleview.desktop
-usr/share/kde4/services/kdevmercurial.desktop
-usr/share/kde4/services/kdevopenwith.desktop
-usr/share/kde4/services/kdevpatchreview.desktop
-usr/share/kde4/services/kdevproblemreporter.desktop
-usr/share/kde4/services/kdevprojectmanagerview.desktop
-usr/share/kde4/services/kdevquickopen.desktop
-usr/share/kde4/services/kdevsnippet.desktop
-usr/share/kde4/services/kdevsourceformatter.desktop
-usr/share/kde4/services/kdevstandardoutputview.desktop
-usr/share/kde4/services/kdevsubversion.desktop
-usr/share/kde4/servicetypes/kdevelopplugin.desktop
diff -Nru kdevelop-3.9.98/debian/kdevplatform-dev.install kdevelop-4.0.1/debian/kdevplatform-dev.install
--- kdevelop-3.9.98/debian/kdevplatform-dev.install 2010-08-10 23:36:30.000000000 +0100
+++ kdevelop-4.0.1/debian/kdevplatform-dev.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-usr/include/kdevplatform/debugger
-usr/include/kdevplatform/execute
-usr/include/kdevplatform/interfaces
-usr/include/kdevplatform/kdevplatformversion.h
-usr/include/kdevplatform/language
-usr/include/kdevplatform/outputview
-usr/include/kdevplatform/project
-usr/include/kdevplatform/shell
-usr/include/kdevplatform/tests
-usr/include/kdevplatform/util
-usr/include/kdevplatform/vcs
-usr/lib/cmake/kdevplatform/KDevPlatformConfig.cmake
-usr/lib/cmake/kdevplatform/KDevPlatformConfigVersion.cmake
-usr/lib/cmake/kdevplatform/KDevPlatformMacros.cmake
-usr/lib/cmake/kdevplatform/KDevPlatformTargets-debian.cmake
-usr/lib/cmake/kdevplatform/KDevPlatformTargets.cmake
-usr/lib/libkdevplatformdebugger.so
-usr/lib/libkdevplatforminterfaces.so
-usr/lib/libkdevplatformlanguage.so
-usr/lib/libkdevplatformoutputview.so
-usr/lib/libkdevplatformproject.so
-usr/lib/libkdevplatformshell.so
-usr/lib/libkdevplatformtests.so
-usr/lib/libkdevplatformutil.so
-usr/lib/libkdevplatformvcs.so
-usr/share/kde4/apps/cmake/modules/FindKDevPlatform.cmake
diff -Nru kdevelop-3.9.98/debian/libsublime1.install kdevelop-4.0.1/debian/libsublime1.install
--- kdevelop-3.9.98/debian/libsublime1.install 2010-08-10 23:36:30.000000000 +0100
+++ kdevelop-4.0.1/debian/libsublime1.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/libsublime.so.*
diff -Nru kdevelop-3.9.98/debian/libsublime-dev.install kdevelop-4.0.1/debian/libsublime-dev.install
--- kdevelop-3.9.98/debian/libsublime-dev.install 2010-08-10 23:36:30.000000000 +0100
+++ kdevelop-4.0.1/debian/libsublime-dev.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/include/kdevplatform/sublime/*
-usr/lib/libsublime.so
diff -Nru kdevelop-3.9.98/debian/patches/10_private_libs_soversion.diff kdevelop-4.0.1/debian/patches/10_private_libs_soversion.diff
--- kdevelop-3.9.98/debian/patches/10_private_libs_soversion.diff 2010-08-10 23:36:30.000000000 +0100
+++ kdevelop-4.0.1/debian/patches/10_private_libs_soversion.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-Index: kdevelop-3.9.98/CMakeLists.txt
-===================================================================
---- kdevelop-3.9.98.orig/CMakeLists.txt 2010-02-13 05:21:50.000000000 +0100
-+++ kdevelop-3.9.98/CMakeLists.txt 2010-02-13 05:22:14.000000000 +0100
-@@ -7,6 +7,7 @@
- set( KDEVELOP_VERSION_MAJOR 3 )
- set( KDEVELOP_VERSION_MINOR 9 )
- set( KDEVELOP_VERSION_PATCH 98 )
-+set(PRIVATE_LIBS_SOVERSION ${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}.${KDEVELOP_VERSION_PATCH})
-
- set(KDE_MIN_VERSION "4.3.0")
- find_package(KDE4 4.3.0 REQUIRED)
-Index: kdevelop-3.9.98/languages/cpp/cppduchain/CMakeLists.txt
-===================================================================
---- kdevelop-3.9.98.orig/languages/cpp/cppduchain/CMakeLists.txt 2009-11-04 11:45:46.000000000 -0500
-+++ kdevelop-3.9.98/languages/cpp/cppduchain/CMakeLists.txt 2009-11-04 11:46:04.000000000 -0500
-@@ -62,6 +62,7 @@
- kdev4cppparser
- ${KDE4_KTEXTEDITOR_LIBS}
- kdev4cpprpp)
-+set_target_properties(kdev4cppduchain PROPERTIES SOVERSION ${PRIVATE_LIBS_SOVERSION})
- install(TARGETS kdev4cppduchain ${INSTALL_TARGETS_DEFAULT_ARGS})
-
- ########### install files ###############
-Index: kdevelop-3.9.98/languages/cpp/parser/CMakeLists.txt
-===================================================================
---- kdevelop-3.9.98.orig/languages/cpp/parser/CMakeLists.txt 2009-11-04 11:45:05.000000000 -0500
-+++ kdevelop-3.9.98/languages/cpp/parser/CMakeLists.txt 2009-11-04 11:45:33.000000000 -0500
-@@ -35,4 +35,5 @@
- # to the plugin target
- kde4_add_library(kdev4cppparser SHARED ${kdevcppparser_LIB_SRCS})
- target_link_libraries(kdev4cppparser ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} kdev4cpprpp )
-+set_target_properties(kdev4cppparser PROPERTIES SOVERSION ${PRIVATE_LIBS_SOVERSION})
- install(TARGETS kdev4cppparser ${INSTALL_TARGETS_DEFAULT_ARGS} )
-Index: kdevelop-3.9.98/languages/cpp/parser/rpp/CMakeLists.txt
-===================================================================
---- kdevelop-3.9.98.orig/languages/cpp/parser/rpp/CMakeLists.txt 2009-11-04 11:44:34.000000000 -0500
-+++ kdevelop-3.9.98/languages/cpp/parser/rpp/CMakeLists.txt 2009-11-04 11:44:58.000000000 -0500
-@@ -22,6 +22,7 @@
- # to the plugin target
- kde4_add_library(kdev4cpprpp SHARED ${kdevcpprpp_LIB_SRCS})
- target_link_libraries(kdev4cpprpp ${KDE4_KDECORE_LIBS} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS} )
-+set_target_properties(kdev4cpprpp PROPERTIES SOVERSION ${PRIVATE_LIBS_SOVERSION})
- install(TARGETS kdev4cpprpp ${INSTALL_TARGETS_DEFAULT_ARGS} )
-
- ########### install files ###############
-Index: kdevelop-3.9.98/projectmanagers/cmake/CMakeLists.txt
-===================================================================
---- kdevelop-3.9.98.orig/projectmanagers/cmake/CMakeLists.txt 2010-02-13 05:05:36.000000000 +0100
-+++ kdevelop-3.9.98/projectmanagers/cmake/CMakeLists.txt 2010-02-13 05:06:18.000000000 +0100
-@@ -71,6 +71,7 @@
- ${KDE4_KTEXTEDITOR_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES}
- ${QT_QTSCRIPT_LIBRARY} ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
- )
-+set_target_properties(kdev4cmakecommon PROPERTIES SOVERSION ${PRIVATE_LIBS_SOVERSION})
-
- kde4_add_ui_files( cmakemanager_SRCS ${cmakemanager_UI} )
- kde4_add_plugin( kdevcmakemanager ${cmakemanager_SRCS} )
diff -Nru kdevelop-3.9.98/debian/patches/series kdevelop-4.0.1/debian/patches/series
--- kdevelop-3.9.98/debian/patches/series 2010-08-10 23:36:30.000000000 +0100
+++ kdevelop-4.0.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-10_private_libs_soversion.diff
diff -Nru kdevelop-3.9.98/debian/README.source kdevelop-4.0.1/debian/README.source
--- kdevelop-3.9.98/debian/README.source 2010-08-10 23:36:30.000000000 +0100
+++ kdevelop-4.0.1/debian/README.source 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-This package uses quilt for upstream source code patch management. Please read
-/usr/share/doc/quilt/README.source for more information how to apply, unapply,
-add, modify or remove patches.
-
-Please note that /usr/share/doc/quilt/README.source is only available in quilt
-version 0.46-4.1 or later.
diff -Nru kdevelop-3.9.98/debian/rules kdevelop-4.0.1/debian/rules
--- kdevelop-3.9.98/debian/rules 2010-08-10 23:36:30.000000000 +0100
+++ kdevelop-4.0.1/debian/rules 2010-08-03 15:51:23.000000000 +0100
@@ -1,7 +1,12 @@
#!/usr/bin/make -f
+export KUBUNTU_DESKTOP_POT=extragear-sdk_kdevelop
+
include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
+# disable parallel building as it fails on the archive buildds
+DEB_BUILD_PARALLEL=
+
binary-install/kdevelop::
install -D -p -m0644 debian/kdevelop.xpm \
debian/kdevelop/usr/share/pixmaps/kdevelop.xpm
diff -Nru kdevelop-3.9.98/debian/source/format kdevelop-4.0.1/debian/source/format
--- kdevelop-3.9.98/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debian/source/format 2010-08-10 23:36:32.000000000 +0100
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru kdevelop-3.9.98/debuggers/gdb/CMakeLists.txt kdevelop-4.0.1/debuggers/gdb/CMakeLists.txt
--- kdevelop-3.9.98/debuggers/gdb/CMakeLists.txt 2009-12-07 02:50:03.000000000 +0000
+++ kdevelop-4.0.1/debuggers/gdb/CMakeLists.txt 2010-07-17 20:08:19.000000000 +0100
@@ -25,7 +25,7 @@
gdbparser.cpp
stty.cpp
disassemblewidget.cpp
- memviewdlg.cpp
+# memviewdlg.cpp
processselection.cpp
gdboutputwidget.cpp
# debuggertracingdialog.cpp
@@ -36,6 +36,7 @@
stringhelpers.cpp
debugsession.cpp
gdblaunchconfig.cpp
+ debugjob.cpp
selectcoredialog.cpp
variablecontroller.cpp
gdbframestackmodel.cpp
diff -Nru kdevelop-3.9.98/debuggers/gdb/debuggerconfigwidget.ui kdevelop-4.0.1/debuggers/gdb/debuggerconfigwidget.ui
--- kdevelop-3.9.98/debuggers/gdb/debuggerconfigwidget.ui 2009-06-03 07:03:42.000000000 +0100
+++ kdevelop-4.0.1/debuggers/gdb/debuggerconfigwidget.ui 2010-07-17 20:08:19.000000000 +0100
@@ -135,21 +135,7 @@
-
-
-
- Use the floating toolbar. This toolbar always stays
-on top of all windows so that if the app covers KDevelop
-you have control of the app through the small toolbar. It
-can also be docked into the panel.
-
-This toolbar is in addition to the toolbar in KDevelop.
-
-
- E&nable floating toolbar
-
-
-
+
@@ -309,7 +296,6 @@
kcfg_displayStaticMemberskcfg_asmDemanglekcfg_breakOnLoadingLibrary
- kcfg_enableFloatingToolBarkcfg_dbgTerminalkcfg_configGdbScriptkcfg_runShellScript
diff -Nru kdevelop-3.9.98/debuggers/gdb/debuggerplugin.cpp kdevelop-4.0.1/debuggers/gdb/debuggerplugin.cpp
--- kdevelop-3.9.98/debuggers/gdb/debuggerplugin.cpp 2009-07-25 23:14:43.000000000 +0100
+++ kdevelop-4.0.1/debuggers/gdb/debuggerplugin.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -80,6 +80,7 @@
#include
#include "gdblaunchconfig.h"
+#include "debugjob.h"
namespace GDBDebugger
@@ -144,9 +145,7 @@
gdbfactory = new DebuggerToolFactory(
this, "org.kdevelop.debugger.ConsoleView",Qt::BottomDockWidgetArea);
- viewerfactory = new DebuggerToolFactory(
- this, "org.kdevelop.debugger.VariousViews", Qt::BottomDockWidgetArea);
-
+
core()->uiController()->addToolView(
i18n("Disassemble"),
disassemblefactory);
@@ -155,9 +154,13 @@
i18n("GDB"),
gdbfactory);
+ /*
+ viewerfactory = new DebuggerToolFactory(
+ this, "org.kdevelop.debugger.VariousViews", Qt::BottomDockWidgetArea);
core()->uiController()->addToolView(
i18n("Debug views"),
viewerfactory);
+ */
setupActions();
@@ -182,13 +185,14 @@
{
core()->uiController()->removeToolView(disassemblefactory);
core()->uiController()->removeToolView(gdbfactory);
- core()->uiController()->removeToolView(viewerfactory);
+ //core()->uiController()->removeToolView(viewerfactory);
}
void CppDebuggerPlugin::setupActions()
{
KActionCollection* ac = actionCollection();
+ /*
KAction* action = new KAction(KIcon("dbgmemview"), i18n("Viewers"), this);
action->setToolTip( i18n("Debugger viewers") );
action->setWhatsThis(i18n("Debugger viewers
Various information about application being executed. There are 4 views available: "
@@ -198,9 +202,10 @@
"Libraries"));
connect(action, SIGNAL(triggered(bool)), this, SIGNAL(addMemoryView()));
ac->addAction("debug_memview", action);
+ */
- action = new KAction(KIcon("core"), i18n("Examine Core File..."), this);
+ KAction* action = new KAction(KIcon("core"), i18n("Examine Core File..."), this);
action->setToolTip( i18n("Examine core file") );
action->setWhatsThis( i18n("Examine core file
"
"This loads a core file, which is typically created "
@@ -278,15 +283,12 @@
CppDebuggerPlugin::~CppDebuggerPlugin()
{
- delete floatingToolBar;
-
GDBParser::destroy();
}
void CppDebuggerPlugin::initializeGuiState()
{
- stateChanged("stopped");
}
KDevelop::ContextMenuExtension CppDebuggerPlugin::contextMenuExtension( KDevelop::Context* context )
@@ -363,7 +365,13 @@
emit showMessage(this, i18n("Examining core file %1", dlg.core().toLocalFile()), 1000);
- createSession()->examineCoreFile(dlg.binary(), dlg.core());
+ DebugSession* session = createSession();
+ session->examineCoreFile(dlg.binary(), dlg.core());
+
+ KillSessionJob *job = new KillSessionJob(session);
+ job->setObjectName(i18n("Debug core file"));
+ core()->runController()->registerJob(job);
+ job->start();
}
@@ -387,7 +395,13 @@
{
emit showMessage(this, i18n("Attaching to process %1", pid), 1000);
- createSession()->attachToProcess(pid);
+ DebugSession* session = createSession();
+ session->attachToProcess(pid);
+
+ KillSessionJob *job = new KillSessionJob(session);
+ job->setObjectName(i18n("Debug process %1", pid));
+ core()->runController()->registerJob(job);
+ job->start();
}
// Used to disable breakpoint actions when non-text document selected
diff -Nru kdevelop-3.9.98/debuggers/gdb/debuggerplugin.h kdevelop-4.0.1/debuggers/gdb/debuggerplugin.h
--- kdevelop-3.9.98/debuggers/gdb/debuggerplugin.h 2009-07-22 15:16:10.000000000 +0100
+++ kdevelop-4.0.1/debuggers/gdb/debuggerplugin.h 2010-07-17 20:08:19.000000000 +0100
@@ -98,7 +98,7 @@
void reset();
- void addMemoryView();
+ //void addMemoryView();
private Q_SLOTS:
void setupDBus();
@@ -134,8 +134,6 @@
void attachProcess(int pid);
void setupActions();
- QPointer floatingToolBar;
-
QHash m_drkonqis;
QSignalMapper* m_drkonqiMap;
QString m_drkonqi;
@@ -152,7 +150,7 @@
DebugSession* m_session;
DebuggerToolFactory< DisassembleWidget >* disassemblefactory;
DebuggerToolFactory< GDBOutputWidget >* gdbfactory;
- DebuggerToolFactory< ViewerWidget >* viewerfactory;
+ //DebuggerToolFactory< ViewerWidget >* viewerfactory;
};
diff -Nru kdevelop-3.9.98/debuggers/gdb/debugjob.cpp kdevelop-4.0.1/debuggers/gdb/debugjob.cpp
--- kdevelop-3.9.98/debuggers/gdb/debugjob.cpp 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debuggers/gdb/debugjob.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -0,0 +1,151 @@
+/*
+* GDB Debugger Support
+*
+* Copyright 2006 Vladimir Prus
+* Copyright 2007 Hamish Rodda
+* Copyright 2009 Andreas Pakulat
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of the
+* License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc.,
+* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#include "debugjob.h"
+#include "debuggerplugin.h"
+#include
+#include
+#include
+#include
+#include
+#include
+#include "debugsession.h"
+
+using namespace GDBDebugger;
+using namespace KDevelop;
+
+DebugJob::DebugJob( GDBDebugger::CppDebuggerPlugin* p, KDevelop::ILaunchConfiguration* launchcfg, QObject* parent)
+ : KDevelop::OutputJob(parent), m_launchcfg( launchcfg )
+{
+ setCapabilities(Killable);
+
+ m_session = p->createSession();
+ connect(m_session, SIGNAL(applicationStandardOutputLines(QStringList)), SLOT(stderrReceived(QStringList)));
+ connect(m_session, SIGNAL(applicationStandardErrorLines(QStringList)), SLOT(stdoutReceived(QStringList)));
+ connect(m_session, SIGNAL(finished()), SLOT(done()) );
+
+ setObjectName(launchcfg->name());
+}
+
+void DebugJob::start()
+{
+ KConfigGroup grp = m_launchcfg->config();
+ KDevelop::EnvironmentGroupList l(KGlobal::config());
+ IExecutePlugin* iface = KDevelop::ICore::self()->pluginController()->pluginForExtension("org.kdevelop.IExecutePlugin")->extension();
+ Q_ASSERT(iface);
+ QString err;
+ QString executable = iface->executable( m_launchcfg, err ).toLocalFile();
+ QString envgrp = iface->environmentGroup( m_launchcfg );
+
+ if( !err.isEmpty() )
+ {
+ setError( -1 );
+ setErrorText( err );
+ emitResult();
+ return;
+ }
+
+ if( envgrp.isEmpty() )
+ {
+ kWarning() << i18n("No environment group specified, looks like a broken "
+ "configuration, please check run configuration '%1'. "
+ "Using default environment group.", m_launchcfg->name() );
+ envgrp = l.defaultGroup();
+ }
+
+ QStringList arguments = iface->arguments( m_launchcfg, err );
+ if( !err.isEmpty() )
+ {
+ setError( -1 );
+ setErrorText( err );
+ }
+ if( error() != 0 )
+ {
+ emitResult();
+ return;
+ }
+
+ setStandardToolView(KDevelop::IOutputView::DebugView);
+ setBehaviours(KDevelop::IOutputView::AllowUserClose | KDevelop::IOutputView::AutoScroll);
+ setModel( new KDevelop::OutputModel(), KDevelop::IOutputView::TakeOwnership );
+ setTitle(m_launchcfg->name());
+
+ startOutput();
+
+ m_session->startProgram( m_launchcfg );
+}
+
+bool DebugJob::doKill()
+{
+ kDebug();
+ m_session->stopDebugger();
+ return true;
+}
+
+void DebugJob::stderrReceived(const QStringList& l )
+{
+ if (KDevelop::OutputModel* m = model()) {
+ m->appendLines( l );
+ }
+}
+
+void DebugJob::stdoutReceived(const QStringList& l )
+{
+ if (KDevelop::OutputModel* m = model()) {
+ m->appendLines( l );
+ }
+}
+
+KDevelop::OutputModel* DebugJob::model()
+{
+ return dynamic_cast( KDevelop::OutputJob::model() );
+}
+
+
+void DebugJob::done()
+{
+ emitResult();
+}
+
+
+KillSessionJob::KillSessionJob(DebugSession *session, QObject* parent): m_session(session), KJob(parent)
+{
+ connect(m_session, SIGNAL(finished()), SLOT(sessionFinished()));
+ setCapabilities(Killable);
+}
+
+void KillSessionJob::start()
+{
+ //NOOP
+}
+
+bool KillSessionJob::doKill()
+{
+ m_session->stopDebugger();
+ return true;
+}
+
+void KillSessionJob::sessionFinished()
+{
+ emitResult();
+}
diff -Nru kdevelop-3.9.98/debuggers/gdb/debugjob.h kdevelop-4.0.1/debuggers/gdb/debugjob.h
--- kdevelop-3.9.98/debuggers/gdb/debugjob.h 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debuggers/gdb/debugjob.h 2010-07-17 20:08:19.000000000 +0100
@@ -0,0 +1,75 @@
+/*
+* GDB Debugger Support
+*
+* Copyright 2006 Vladimir Prus
+* Copyright 2007 Hamish Rodda
+* Copyright 2009 Andreas Pakulat
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of the
+* License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc.,
+* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+#ifndef GDBDEBUGJOB
+#define GDBDEBUGJOB
+
+#include
+
+namespace KDevelop
+{
+class OutputModel;
+class ILaunchConfiguration;
+}
+
+namespace GDBDebugger
+{
+class CppDebuggerPlugin;
+class DebugSession;
+
+
+class DebugJob : public KDevelop::OutputJob
+{
+Q_OBJECT
+public:
+ DebugJob( CppDebuggerPlugin*, KDevelop::ILaunchConfiguration*, QObject* parent = 0 );
+ virtual void start();
+protected:
+ virtual bool doKill();
+private slots:
+ void stdoutReceived(const QStringList&);
+ void stderrReceived(const QStringList&);
+ void done();
+private:
+ KDevelop::OutputModel* model();
+ DebugSession* m_session;
+ KDevelop::ILaunchConfiguration* m_launchcfg;
+};
+
+//this job is just here to be able to kill the debug session
+class KillSessionJob : public KJob
+{
+Q_OBJECT
+public:
+ KillSessionJob(DebugSession *session, QObject *parent = 0);
+ virtual void start();
+protected:
+ virtual bool doKill();
+private:
+ DebugSession* m_session;
+private slots:
+ void sessionFinished();
+};
+
+}
+
+#endif
diff -Nru kdevelop-3.9.98/debuggers/gdb/debugsession.cpp kdevelop-4.0.1/debuggers/gdb/debugsession.cpp
--- kdevelop-3.9.98/debuggers/gdb/debugsession.cpp 2010-01-08 18:00:54.000000000 +0000
+++ kdevelop-4.0.1/debuggers/gdb/debugsession.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -47,6 +47,8 @@
#include
#include
#include
+#include
+#include
#include "breakpointcontroller.h"
#include "variablecontroller.h"
@@ -165,20 +167,9 @@
if (changedState & s_dbgNotStarted) {
if (newState & s_dbgNotStarted) {
message = i18n("Debugger stopped");
- if (floatingToolBar)
- floatingToolBar->hide();
} else {
setSessionState(StartingState);
- if (m_config.readEntry("Floating Toolbar", false))
- {
- #ifndef QT_MAC
- if (!floatingToolBar) {
- floatingToolBar = new KToolBar(qApp->activeWindow());
- floatingToolBar->show();
- }
- #endif
- }
}
//core()->running(this, false);
@@ -293,7 +284,7 @@
// real binary name.
queueCmd(new GDBCommand(GDBMI::FileExecAndSymbols));
- queueCmd(new GDBCommand(GDBMI::TargetAttach, pid));
+ queueCmd(new GDBCommand(GDBMI::TargetAttach, pid, this, &DebugSession::handleTargetAttach, true));
raiseEvent(connected_to_program);
@@ -963,12 +954,28 @@
KConfigGroup grp = cfg->config();
KDevelop::EnvironmentGroupList l(KGlobal::config());
+ if (grp.readEntry("Break on Start", false)) {
+ BreakpointModel* m = KDevelop::ICore::self()->debugController()->breakpointModel();
+ bool found = false;
+ foreach (KDevelop::Breakpoint *b, m->breakpoints()) {
+ if (b->location() == "main") {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ KDevelop::ICore::self()->debugController()->breakpointModel()->addCodeBreakpoint("main");
+ }
+ }
+
+
// Configuration values
bool config_breakOnLoadingLibrary_ = grp.readEntry( GDBDebugger::breakOnLibLoadEntry, false );
bool config_forceBPSet_ = grp.readEntry( GDBDebugger::allowForcedBPEntry, true );
bool config_displayStaticMembers_ = grp.readEntry( GDBDebugger::staticMembersEntry, false );
bool config_asmDemangle_ = grp.readEntry( GDBDebugger::demangleNamesEntry, true );
- bool config_dbgTerminal_ = grp.readEntry( GDBDebugger::separateTerminalEntry, false );
+ //bool config_dbgTerminal_ = grp.readEntry( GDBDebugger::separateTerminalEntry, false );
+ bool config_dbgTerminal_ = false;
KUrl config_dbgShell_ = grp.readEntry( GDBDebugger::debuggerShellEntry, KUrl() );
KUrl config_configGdbScript_ = grp.readEntry( GDBDebugger::remoteGdbConfigEntry, KUrl() );
KUrl config_runShellScript_ = grp.readEntry( GDBDebugger::remoteGdbShellEntry, KUrl() );
@@ -1077,46 +1084,9 @@
}
else
{
- QFileInfo app(executable);
-
- if (!app.exists())
- {
- KMessageBox::error(
- qApp->activeWindow(),
- i18n("Application does not exist"
- "
The application you are trying to debug, "
- " %1\n"
- " does not exist. Check that you have specified "
- "the right application in the debugger configuration.",
- app.fileName()),
- i18n("Application does not exist"));
-
- // FIXME: after this, KDevelop will still show that debugger
- // is running, because DebuggerPart::slotStopDebugger won't be
- // called, and core()->running(this, false) won't be called too.
- stopDebugger();
- return false;
- }
-
- if (!app.isExecutable())
- {
- KMessageBox::error(
- qApp->activeWindow(),
- i18n("Could not run application '%1'."
- "
The application does not have the executable bit set. "
- "Try rebuilding the project, or change permissions "
- "manually.",
- app.fileName()),
- i18n("Could not run application"));
- stopDebugger();
- return false;
- }
- else
- {
- queueCmd(new GDBCommand(GDBMI::FileExecAndSymbols, executable));
- raiseEvent(connected_to_program);
- queueCmd(new GDBCommand(GDBMI::ExecRun));
- }
+ queueCmd(new GDBCommand(GDBMI::FileExecAndSymbols, executable, this, &DebugSession::handleFileExecAndSymbols, true));
+ raiseEvent(connected_to_program);
+ queueCmd(new GDBCommand(GDBMI::ExecRun));
}
setStateOff(s_appNotStarted|s_programExited);
@@ -1124,6 +1094,7 @@
return true;
}
+
// **************************************************************************
// SLOTS
// *****
@@ -1438,6 +1409,31 @@
}
+void DebugSession::handleFileExecAndSymbols(const GDBMI::ResultRecord& r)
+{
+ if (r.reason == "error") {
+ KMessageBox::error(
+ qApp->activeWindow(),
+ i18n("Could not start debugger: ")+
+ r["msg"].literal(),
+ i18n("Startup error"));
+ stopDebugger();
+ }
+}
+
+void DebugSession::handleTargetAttach(const GDBMI::ResultRecord& r)
+{
+ if (r.reason == "error") {
+ KMessageBox::error(
+ qApp->activeWindow(),
+ i18n("Could not attach debugger: ")+
+ r["msg"].literal(),
+ i18n("Startup error"));
+ stopDebugger();
+ }
+}
+
}
+
#include "debugsession.moc"
diff -Nru kdevelop-3.9.98/debuggers/gdb/debugsession.h kdevelop-4.0.1/debuggers/gdb/debugsession.h
--- kdevelop-3.9.98/debuggers/gdb/debugsession.h 2010-01-16 12:11:36.000000000 +0000
+++ kdevelop-4.0.1/debuggers/gdb/debugsession.h 2010-07-17 20:08:19.000000000 +0100
@@ -62,8 +62,7 @@
static QString staticMembersEntry = "Display Static Members";
static QString demangleNamesEntry = "Display Demangle Names";
static QString breakOnLibLoadEntry = "Try Setting Breakpoints On Loading Libraries";
-static QString separateTerminalEntry = "Separate Terminal For Application IO";
-static QString floatingToolbarEntry = "Floating Toolbar";
+//static QString separateTerminalEntry = "Separate Terminal For Application IO";
static QString allowForcedBPEntry = "Allow Forced Breakpoint Set";
class DebugSession : public KDevelop::IDebugSession
@@ -128,7 +127,6 @@
KDevelop::ProcessLineMaker *m_gdbLineMaker;
DebuggerState m_sessionState;
bool justRestarted_;
- QPointer floatingToolBar;
KConfigGroup m_config;
QPointer m_gdb;
@@ -274,6 +272,8 @@
void slotKillGdb();
void handleVersion(const QStringList& s);
+ void handleFileExecAndSymbols(const GDBMI::ResultRecord& r);
+ void handleTargetAttach(const GDBMI::ResultRecord& r);
public Q_SLOTS:
void slotKill();
diff -Nru kdevelop-3.9.98/debuggers/gdb/gdblaunchconfig.cpp kdevelop-4.0.1/debuggers/gdb/gdblaunchconfig.cpp
--- kdevelop-3.9.98/debuggers/gdb/gdblaunchconfig.cpp 2010-01-30 22:21:53.000000000 +0000
+++ kdevelop-4.0.1/debuggers/gdb/gdblaunchconfig.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -34,13 +34,13 @@
#include
#include
#include
-#include
#include
#include
#include
#include
#include
#include
+#include
#include "debugsession.h"
#include "debuggerplugin.h"
@@ -48,6 +48,9 @@
#include "ui_debuggerconfigwidget.h"
#include
#include
+#include "debugjob.h"
+
+using namespace KDevelop;
GdbConfigPage::GdbConfigPage( QWidget* parent )
: LaunchConfigurationPage(parent), ui( new Ui::DebuggerConfigWidget )
@@ -57,10 +60,9 @@
connect(ui->kcfg_asmDemangle, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
connect(ui->kcfg_breakOnLoadingLibrary, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
connect(ui->kcfg_configGdbScript, SIGNAL(textChanged(QString)), this, SIGNAL(changed()));
- connect(ui->kcfg_dbgTerminal, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+ //connect(ui->kcfg_dbgTerminal, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
connect(ui->kcfg_debuggingShell, SIGNAL(textChanged(QString)), this, SIGNAL(changed()));
connect(ui->kcfg_displayStaticMembers, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
- connect(ui->kcfg_enableFloatingToolBar, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
connect(ui->kcfg_gdbPath, SIGNAL(textChanged(QString)), this, SIGNAL(changed()));
connect(ui->kcfg_runGdbScript, SIGNAL(textChanged(QString)), this, SIGNAL(changed()));
connect(ui->kcfg_runShellScript, SIGNAL(textChanged(QString)), this, SIGNAL(changed()));
@@ -84,8 +86,7 @@
//TODO: add ui for this
//ui->kcfg_allowForceBP->setChecked( cfg.readEtnry( GDBDebugger::allowForcedBPEntry, true ) );
ui->kcfg_breakOnLoadingLibrary->setChecked( cfg.readEntry( GDBDebugger::breakOnLibLoadEntry, true) );
- ui->kcfg_dbgTerminal->setChecked( cfg.readEntry( GDBDebugger::separateTerminalEntry, false) );
- ui->kcfg_enableFloatingToolBar->setChecked( cfg.readEntry(GDBDebugger::floatingToolbarEntry, false) );
+ //ui->kcfg_dbgTerminal->setChecked( cfg.readEntry( GDBDebugger::separateTerminalEntry, false) );
blockSignals( block );
}
@@ -99,8 +100,7 @@
cfg.writeEntry(GDBDebugger::staticMembersEntry, ui->kcfg_displayStaticMembers->isChecked() );
cfg.writeEntry(GDBDebugger::demangleNamesEntry, ui->kcfg_asmDemangle->isChecked() );
cfg.writeEntry(GDBDebugger::breakOnLibLoadEntry, ui->kcfg_breakOnLoadingLibrary->isChecked() );
- cfg.writeEntry(GDBDebugger::separateTerminalEntry, ui->kcfg_dbgTerminal->isChecked() );
- cfg.writeEntry(GDBDebugger::floatingToolbarEntry, ui->kcfg_enableFloatingToolBar->isChecked() );
+ //cfg.writeEntry(GDBDebugger::separateTerminalEntry, ui->kcfg_dbgTerminal->isChecked() );
}
QString GdbConfigPage::title() const
@@ -146,7 +146,7 @@
{
l << depjob;
}
- l << new GdbJob( m_plugin, cfg );
+ l << new GDBDebugger::DebugJob( m_plugin, cfg );
return new KDevelop::ExecuteCompositeJob( KDevelop::ICore::self()->runController(), l );
}
kWarning() << "Unknown launch mode" << launchMode << "for config:" << cfg->name();
@@ -168,96 +168,6 @@
return new GdbConfigPage( parent );
}
-GdbJob::GdbJob( GDBDebugger::CppDebuggerPlugin* p, KDevelop::ILaunchConfiguration* launchcfg, QObject* parent)
- : KDevelop::OutputJob(parent), m_launchcfg( launchcfg )
-{
- setCapabilities(Killable);
-
- m_session = p->createSession();
- connect(m_session, SIGNAL(applicationStandardOutputLines(QStringList)), SLOT(stderrReceived(QStringList)));
- connect(m_session, SIGNAL(applicationStandardErrorLines(QStringList)), SLOT(stdoutReceived(QStringList)));
- connect(m_session, SIGNAL(finished()), SLOT(done()) );
-}
-
-void GdbJob::start()
-{
- KConfigGroup grp = m_launchcfg->config();
- KDevelop::EnvironmentGroupList l(KGlobal::config());
- IExecutePlugin* iface = KDevelop::ICore::self()->pluginController()->pluginForExtension("org.kdevelop.IExecutePlugin")->extension();
- Q_ASSERT(iface);
- QString err;
- QString executable = iface->executable( m_launchcfg, err ).toLocalFile();
- QString envgrp = iface->environmentGroup( m_launchcfg );
-
- if( !err.isEmpty() )
- {
- setError( -1 );
- setErrorText( err );
- emitResult();
- return;
- }
-
- if( envgrp.isEmpty() )
- {
- kWarning() << i18n("No environment group specified, looks like a broken "
- "configuration, please check run configuration '%1'. "
- "Using default environment group.", m_launchcfg->name() );
- envgrp = l.defaultGroup();
- }
-
- QStringList arguments = iface->arguments( m_launchcfg, err );
- if( !err.isEmpty() )
- {
- setError( -1 );
- setErrorText( err );
- }
- if( error() != 0 )
- {
- emitResult();
- return;
- }
-
- setStandardToolView(KDevelop::IOutputView::DebugView);
- setBehaviours(KDevelop::IOutputView::AllowUserClose | KDevelop::IOutputView::AutoScroll);
- setModel( new KDevelop::OutputModel(), KDevelop::IOutputView::TakeOwnership );
- setTitle(m_launchcfg->name());
-
- startOutput();
-
- m_session->startProgram( m_launchcfg );
-}
-
-bool GdbJob::doKill()
-{
- kDebug();
- m_session->stopDebugger();
- return true;
-}
-
-void GdbJob::stderrReceived(const QStringList& l )
-{
- if (KDevelop::OutputModel* m = model()) {
- m->appendLines( l );
- }
-}
-
-void GdbJob::stdoutReceived(const QStringList& l )
-{
- if (KDevelop::OutputModel* m = model()) {
- m->appendLines( l );
- }
-}
-
-KDevelop::OutputModel* GdbJob::model()
-{
- return dynamic_cast( KDevelop::OutputJob::model() );
-}
-
-
-void GdbJob::done()
-{
- emitResult();
-}
#include "gdblaunchconfig.moc"
diff -Nru kdevelop-3.9.98/debuggers/gdb/gdblaunchconfig.h kdevelop-4.0.1/debuggers/gdb/gdblaunchconfig.h
--- kdevelop-3.9.98/debuggers/gdb/gdblaunchconfig.h 2009-08-30 21:22:57.000000000 +0100
+++ kdevelop-4.0.1/debuggers/gdb/gdblaunchconfig.h 2010-07-17 20:08:19.000000000 +0100
@@ -44,24 +44,6 @@
class DebugSession;
}
-class GdbJob : public KDevelop::OutputJob
-{
-Q_OBJECT
-public:
- GdbJob( GDBDebugger::CppDebuggerPlugin*, KDevelop::ILaunchConfiguration*, QObject* parent = 0 );
- virtual void start();
-protected:
- virtual bool doKill();
-private slots:
- void stdoutReceived(const QStringList&);
- void stderrReceived(const QStringList&);
- void done();
-private:
- KDevelop::OutputModel* model();
- GDBDebugger::DebugSession* m_session;
- KDevelop::ILaunchConfiguration* m_launchcfg;
-};
-
class GdbConfigPageFactory : public KDevelop::LaunchConfigurationPageFactory
{
public:
diff -Nru kdevelop-3.9.98/debuggers/gdb/gdbvariable.cpp kdevelop-4.0.1/debuggers/gdb/gdbvariable.cpp
--- kdevelop-3.9.98/debuggers/gdb/gdbvariable.cpp 2009-11-28 11:51:54.000000000 +0000
+++ kdevelop-4.0.1/debuggers/gdb/gdbvariable.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -77,7 +77,12 @@
void GdbVariable::setVarobj(const QString& v)
{
- Q_ASSERT(varobj_.isEmpty());
+ if (!varobj_.isEmpty()) {
+ // this should not happen
+ // but apperently it does when attachMaybe is called a second time before
+ // the first -var-create call returned
+ allVariables_.remove(varobj_);
+ }
varobj_ = v;
allVariables_[varobj_] = this;
}
@@ -148,7 +153,7 @@
s->addCommand(
new GDBCommand(
GDBMI::VarCreate,
- QString("var%1 @ %2").arg(nextId++).arg(expression()),
+ QString("var%1 @ %2").arg(nextId++).arg(enquotedExpression()),
new CreateVarobjHandler(this, callback, callbackMethod)));
}
}
@@ -310,3 +315,11 @@
{
return varobj_;
}
+
+QString GdbVariable::enquotedExpression() const
+{
+ QString expr = expression();
+ expr.replace('"', "\\\"");
+ expr = expr.prepend('"').append('"');
+ return expr;
+}
diff -Nru kdevelop-3.9.98/debuggers/gdb/gdbvariable.h kdevelop-4.0.1/debuggers/gdb/gdbvariable.h
--- kdevelop-3.9.98/debuggers/gdb/gdbvariable.h 2009-09-18 14:58:00.000000000 +0100
+++ kdevelop-4.0.1/debuggers/gdb/gdbvariable.h 2010-07-17 20:08:19.000000000 +0100
@@ -61,6 +61,7 @@
private: // Internal
friend class ::CreateVarobjHandler;
friend class ::FetchMoreChildrenHandler;
+ QString enquotedExpression() const;
void setVarobj(const QString& v);
QString varobj_;
diff -Nru kdevelop-3.9.98/debuggers/gdb/kdevgdb.desktop kdevelop-4.0.1/debuggers/gdb/kdevgdb.desktop
--- kdevelop-3.9.98/debuggers/gdb/kdevgdb.desktop 2010-01-10 10:53:38.000000000 +0000
+++ kdevelop-4.0.1/debuggers/gdb/kdevgdb.desktop 2010-07-17 20:08:19.000000000 +0100
@@ -4,6 +4,7 @@
Comment=This plugin provides a frontend for GDB, a source-level debugger for C, C++ and more.
Comment[ca]=Aquest connector proveeix d'un frontal per GDB, un depurador a nivell de codi per C,C++ i més llenguatges.
Comment[ca@valencia]=Este connector proveeix d'un frontal per GDB, un depurador a nivell de codi per C,C++ i més llenguatges.
+Comment[da]=Dette plugin sørger for en brugerflade til GDB, en fejlsøger til C, C++ og mere.
Comment[de]=Dieses Modul stellt eine Oberfläche für GDB zur Verfügung. GDB ist ein Debugger für C, C++ und weitere.
Comment[el]=Αυτό το πρόσθετο προσφέρει ένα σύστημα περιβάλλοντος για το GDB, έναν αποσφαλματωτή επιπέδου πηγαίου κώδικα για τις C, C++ και άλλες γλώσσες.
Comment[en_GB]=This plugin provides a frontend for GDB, a source-level debugger for C, C++ and more.
@@ -13,15 +14,17 @@
Comment[fr]=Ce module externe fournit une interface pour GDB, un débogueur au niveau des sources pour C, C++, etc.
Comment[ga]=Soláthraíonn an breiseán seo comhéadan ar GDB, dífhabhtóir foinse C, C++ agus a thuilleadh.
Comment[gl]=Esta extensión fornece unha interface para GDB, un depurador a nivel do código fonte para C, C++ e outros.
-Comment[it]=Questa estensione fornisce una interfaccia per il GDB, un debugger a livello sorgente per C, C++ e altro.
+Comment[it]=Questa estensione fornisce un'interfaccia per il GDB, un debugger a livello sorgente per C, C++ e altro.
Comment[ja]=このプラグインは、C, C++ などのソースレベルデバッガ GDB のフロントエンドを提供します。
Comment[lv]=Šis spraudnis nodrošina priekšpusi GDB, C, C++ un cita pirmkoda atkļūdotāja.
Comment[nb]=Dette programtillegget gir en brukerflate til GDB, et feilsøkingsprogram på kildenivå for C og C++
Comment[nds]=Dit Moduul stellt en Böversiet för GDB praat, en Bornkode-Fehlersöker för C, C++ un anner Spraken.
Comment[nl]=Deze plugin levert een frontend voor GDB, een broncodedebugger voor C, C++ en meer.
+Comment[pl]=Ta wtyczka udostępnia interfejs do GDB, debuggera dla C, C++ i innych języków.
Comment[pt]=Este 'plugin' oferece uma interface para o GDB, um depurador a nível do código-fonte para C, C++, entre outros.
Comment[pt_BR]=Este plugin oferece uma interface para o GDB, um depurador em nível de código-fonte para C, C++, entre outros.
Comment[ru]=Этот модуль предоставляет интерфейс к GDB, отладчику исходного кода для C, C++ и других языков.
+Comment[sl]=Ta vstavek prinaša vmesnik za GDB, razhroščevalnik na ravni izvorne kode za C, C++ in več.
Comment[sv]=Insticksprogrammet tillhandahåller ett gränssnitt till GDB, en källkodsavlusare för C, C++ med mera.
Comment[tr]=Bu eklenti, C, C++ ve daha fazlası için bir kaynak-düzeyinde hata ayıklayıcı olan GDB için bir önucu sağlar.
Comment[uk]=Цей додаток надає можливість користуватися клієнтським інтерфейсом GDB, зневадника вихідного коду на C, C++ тощо.
@@ -32,6 +35,7 @@
Name[ca]=Implementació de GDB
Name[ca@valencia]=Implementació de GDB
Name[cs]=Podpora GDB
+Name[da]=GDB-understøttelse
Name[de]=Unterstützung für GDB
Name[el]=Υποστήριξη GDB
Name[en_GB]=GDB Support
@@ -47,9 +51,11 @@
Name[nb]=GDB-støtte
Name[nds]=GDB-Ünnerstütten
Name[nl]=Ondersteuning voor GDB
+Name[pl]=Obsługa GDB
Name[pt]=Suporte a GDB
Name[pt_BR]=Suporte a GDB
Name[ru]=Поддержка GDB
+Name[sl]=Podpora za GDB
Name[sv]=GDB stöd
Name[tr]=GDB Desteği
Name[uk]=Підтримка GDB
@@ -100,7 +106,7 @@
Icon=debugger
X-KDE-Library=kdevgdb
X-KDevelop-Category=Global
-X-KDevelop-Version=8
+X-KDevelop-Version=9
X-KDE-PluginInfo-Name=kdevgdb
X-KDE-PluginInfo-License=GPL
ServiceTypes=KDevelop/Plugin
diff -Nru kdevelop-3.9.98/debuggers/gdb/kdevgdbui.rc kdevelop-4.0.1/debuggers/gdb/kdevgdbui.rc
--- kdevelop-3.9.98/debuggers/gdb/kdevgdbui.rc 2009-06-03 07:04:19.000000000 +0100
+++ kdevelop-4.0.1/debuggers/gdb/kdevgdbui.rc 2010-07-17 20:08:19.000000000 +0100
@@ -1,5 +1,5 @@
-
+Run
@@ -18,31 +18,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru kdevelop-3.9.98/debuggers/gdb/printers/.gitignore kdevelop-4.0.1/debuggers/gdb/printers/.gitignore
--- kdevelop-3.9.98/debuggers/gdb/printers/.gitignore 2009-06-27 21:34:12.000000000 +0100
+++ kdevelop-4.0.1/debuggers/gdb/printers/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-*.pyc
diff -Nru kdevelop-3.9.98/debuggers/gdb/printers/qt4.py kdevelop-4.0.1/debuggers/gdb/printers/qt4.py
--- kdevelop-3.9.98/debuggers/gdb/printers/qt4.py 2010-01-23 10:42:33.000000000 +0000
+++ kdevelop-4.0.1/debuggers/gdb/printers/qt4.py 2010-07-17 20:08:19.000000000 +0100
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: iso-8859-1 -*-
# Pretty-printers for Qt4.
# Copyright (C) 2009 Niko Sams
@@ -26,20 +26,24 @@
self.val = val
def to_string(self):
- ret = ""
- i = 0
- while i < self.val['d']['size']:
- if self.val['d']['data'][i] > 256:
- #TODO: fix this properly
- ret += '?'
- else:
- ret += chr(self.val['d']['data'][i])
- i = i + 1
- return ret
+ #ret = ""
+ #i = 0
+ size = self.val['d']['size']
+ #while i < size:
+ # char = self.val['d']['data'][i]
+ # if (char > 127):
+ # ret += "\\u%x" % int(char)
+ # else:
+ # ret += chr(char)
+ # i = i + 1
+ #return ret
+ dataAsCharPointer = self.val['d']['data'].cast(gdb.lookup_type("char").pointer())
+ return dataAsCharPointer.string(encoding = 'UTF-16', length = size * 2)
def display_hint (self):
return 'string'
+
class QByteArrayPrinter:
def __init__(self, val):
@@ -395,7 +399,7 @@
def to_string(self):
try:
return self.val['d']['encodedOriginal']
- except RuntimeError as error:
+ except RuntimeError, error:
#if no debug information is avaliable for Qt, try guessing the correct address for encodedOriginal
#problem with this is that if QUrlPrivate members get changed, this fails
offset = gdb.lookup_type('int').sizeof
@@ -443,6 +447,17 @@
return 'QSet'
+class QCharPrinter:
+
+ def __init__(self, val):
+ self.val = val
+
+ def to_string(self):
+ return unichr(self.val['ucs'])
+
+ def display_hint (self):
+ return 'string'
+
def register_qt4_printers (obj):
if obj == None:
obj = gdb
@@ -489,6 +504,7 @@
pretty_printers_dict[re.compile('^QDateTime$')] = lambda val: QDateTimePrinter(val)
pretty_printers_dict[re.compile('^QUrl$')] = lambda val: QUrlPrinter(val)
pretty_printers_dict[re.compile('^QSet<.*>$')] = lambda val: QSetPrinter(val)
+ pretty_printers_dict[re.compile('^QChar$')] = lambda val: QCharPrinter(val)
pretty_printers_dict = {}
diff -Nru kdevelop-3.9.98/debuggers/gdb/printers/tests/CMakeLists.txt kdevelop-4.0.1/debuggers/gdb/printers/tests/CMakeLists.txt
--- kdevelop-3.9.98/debuggers/gdb/printers/tests/CMakeLists.txt 2010-01-30 19:53:11.000000000 +0000
+++ kdevelop-4.0.1/debuggers/gdb/printers/tests/CMakeLists.txt 2010-07-17 20:08:19.000000000 +0100
@@ -46,6 +46,9 @@
add_executable(qsetstring qsetstring.cpp)
target_link_libraries(qsetstring ${QT_QTCORE_LIBRARY})
+add_executable(qchar qchar.cpp)
+target_link_libraries(qchar ${QT_QTCORE_LIBRARY})
+
kde4_add_unit_test(qtprinters qtprinters.cpp)
target_link_libraries(qtprinters
${QT_QTCORE_LIBRARY}
diff -Nru kdevelop-3.9.98/debuggers/gdb/printers/tests/qchar.cpp kdevelop-4.0.1/debuggers/gdb/printers/tests/qchar.cpp
--- kdevelop-3.9.98/debuggers/gdb/printers/tests/qchar.cpp 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/debuggers/gdb/printers/tests/qchar.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -0,0 +1,6 @@
+#include
+int main()
+{
+ QChar c('k');
+ return 0;
+}
diff -Nru kdevelop-3.9.98/debuggers/gdb/printers/tests/qtprinters.cpp kdevelop-4.0.1/debuggers/gdb/printers/tests/qtprinters.cpp
--- kdevelop-3.9.98/debuggers/gdb/printers/tests/qtprinters.cpp 2010-01-23 10:42:33.000000000 +0000
+++ kdevelop-4.0.1/debuggers/gdb/printers/tests/qtprinters.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -274,7 +274,14 @@
QVERIFY(out.contains("] = \"30\""));
}
-//QSet
+void QtPrintersTest::testQChar()
+{
+ GdbProcess gdb("qchar");
+ gdb.execute("break qchar.cpp:5");
+ gdb.execute("run");
+ QVERIFY(gdb.execute("print c").contains("\"k\""));
+}
+
}
QTEST_MAIN(GDBDebugger::QtPrintersTest)
diff -Nru kdevelop-3.9.98/debuggers/gdb/printers/tests/qtprinters.h kdevelop-4.0.1/debuggers/gdb/printers/tests/qtprinters.h
--- kdevelop-3.9.98/debuggers/gdb/printers/tests/qtprinters.h 2010-01-23 10:42:33.000000000 +0000
+++ kdevelop-4.0.1/debuggers/gdb/printers/tests/qtprinters.h 2010-07-17 20:08:19.000000000 +0100
@@ -44,6 +44,7 @@
void testQHashString();
void testQSetInt();
void testQSetString();
+ void testQChar();
};
}
diff -Nru kdevelop-3.9.98/debuggers/gdb/unittests/gdbtest.cpp kdevelop-4.0.1/debuggers/gdb/unittests/gdbtest.cpp
--- kdevelop-3.9.98/debuggers/gdb/unittests/gdbtest.cpp 2010-01-30 10:28:27.000000000 +0000
+++ kdevelop-4.0.1/debuggers/gdb/unittests/gdbtest.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -47,6 +47,8 @@
#include "debugsession.h"
#include "gdbframestackmodel.h"
+using KDevelop::AutoTestShell;
+
namespace GDBDebugger {
@@ -935,6 +937,46 @@
WAIT_FOR_STATE(session, DebugSession::EndedState);
}
+void GdbTest::testVariablesWatchesQuotes()
+{
+ TestDebugSession *session = new TestDebugSession;
+ session->variableController()->setAutoUpdate(KDevelop::IVariableController::UpdateWatches);
+
+ TestLaunchConfiguration cfg;
+
+ const QString testString("test");
+ const QString quotedTestString("\"" + testString + "\"");
+
+ breakpoints()->addCodeBreakpoint(debugeeFileName, 38);
+ QVERIFY(session->startProgram(&cfg));
+ WAIT_FOR_STATE(session, DebugSession::PausedState);
+
+ variableCollection()->watches()->add(quotedTestString); //just a constant string
+ QTest::qWait(300);
+
+ QModelIndex i = variableCollection()->index(0, 0);
+ QCOMPARE(variableCollection()->rowCount(i), 1);
+ COMPARE_DATA(variableCollection()->index(0, 0, i), quotedTestString);
+ COMPARE_DATA(variableCollection()->index(0, 1, i), "[" + QString::number(testString.length() + 1) + "]");
+
+ QModelIndex testStr = variableCollection()->index(0, 0, i);
+ COMPARE_DATA(variableCollection()->index(0, 0, testStr), "...");
+ variableCollection()->expanded(testStr);
+ QTest::qWait(100);
+ int len = testString.length();
+ for (int ind = 0; ind < len; ind++)
+ {
+ COMPARE_DATA(variableCollection()->index(ind, 0, testStr), QString::number(ind));
+ QChar c = testString.at(ind);
+ QString value = QString::number(c.toLatin1()) + " '" + c + "'";
+ COMPARE_DATA(variableCollection()->index(ind, 1, testStr), value);
+ }
+ COMPARE_DATA(variableCollection()->index(len, 0, testStr), QString::number(len));
+ COMPARE_DATA(variableCollection()->index(len, 1, testStr), "0 '\\000'");
+
+ session->run();
+ WAIT_FOR_STATE(session, DebugSession::EndedState);
+}
void GdbTest::testVariablesWatchesTwoSessions()
{
diff -Nru kdevelop-3.9.98/debuggers/gdb/unittests/gdbtest.h kdevelop-4.0.1/debuggers/gdb/unittests/gdbtest.h
--- kdevelop-3.9.98/debuggers/gdb/unittests/gdbtest.h 2010-01-30 10:28:27.000000000 +0000
+++ kdevelop-4.0.1/debuggers/gdb/unittests/gdbtest.h 2010-07-17 20:08:19.000000000 +0100
@@ -62,6 +62,7 @@
void testVariablesLocals();
void testVariablesLocalsStruct();
void testVariablesWatches();
+ void testVariablesWatchesQuotes();
void testVariablesWatchesTwoSessions();
void testVariablesStopDebugger();
void testVariablesStartSecondSession();
diff -Nru kdevelop-3.9.98/debuggers/gdb/variablecontroller.cpp kdevelop-4.0.1/debuggers/gdb/variablecontroller.cpp
--- kdevelop-3.9.98/debuggers/gdb/variablecontroller.cpp 2009-12-16 19:56:57.000000000 +0000
+++ kdevelop-4.0.1/debuggers/gdb/variablecontroller.cpp 2010-07-17 20:08:19.000000000 +0100
@@ -154,7 +154,7 @@
void VariableController::updateLocals()
{
debugSession()->addCommand(
- new GDBCommand(GDBMI::StackListLocals, "--all-values",
+ new GDBCommand(GDBMI::StackListLocals, "--simple-values",
new StackListLocalsHandler(debugSession())));
}
@@ -166,7 +166,7 @@
if (!c.isLetterOrNumber() && c != '_')
return QString();
- int start = Utils::expressionAt(line, index);
+ int start = Utils::expressionAt(line, index+1);
int end = index;
for (; end < line.size(); ++end)
{
diff -Nru kdevelop-3.9.98/doc/addendum/index.cvlog kdevelop-4.0.1/doc/addendum/index.cvlog
--- kdevelop-3.9.98/doc/addendum/index.cvlog 1970-01-01 01:00:00.000000000 +0100
+++ kdevelop-4.0.1/doc/addendum/index.cvlog 2010-07-17 20:08:19.000000000 +0100
@@ -0,0 +1,1258 @@
+=== LinuxDoc conversion errors ===================
+-> Check if any important attributes have been left behind.
+ INPUT OUTPUT
+Line Tag Line Tag
+ 2 `BOOK' 0 `book'
+! Normally this should not be a problem, but check anyway ...
+ 6 `' 0 `'
+! Check the authorname ( instead of ?)
+ 8 `REF' 0 `'
+ 11 `TOC' 0 `'
+ 45 `' 0 `'
+! check if reference ID mini-HOWTO was meant for a section (if not, eg for an anchor, change manually)
+ 52 `BF' 0 `'
+! Check and correct manually
+ 52 `HTMLURL' 0 `'
+ 62 `HTMLURL' 0 `