From e044c5463329652f28565dfc7de24ef8b0edaa6f Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Wed, 17 Jun 2015 15:33:10 +0900
Subject: Revert to .kdevelop files with <kdevelop> entity name for project
 files. This resolves bug 2308.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 .../cpp/app_templates/chello_gba/CMakeLists.txt    |   2 +-
 languages/cpp/app_templates/chello_gba/Makefile.am |   2 +-
 .../cpp/app_templates/chello_gba/app.kdevelop      | 100 +++++++++++++++++++++
 .../cpp/app_templates/chello_gba/app.tdevelop      | 100 ---------------------
 .../chello_gba/chellogba.kdevtemplate              |   4 +-
 5 files changed, 104 insertions(+), 104 deletions(-)
 create mode 100644 languages/cpp/app_templates/chello_gba/app.kdevelop
 delete mode 100644 languages/cpp/app_templates/chello_gba/app.tdevelop

(limited to 'languages/cpp/app_templates/chello_gba')

diff --git a/languages/cpp/app_templates/chello_gba/CMakeLists.txt b/languages/cpp/app_templates/chello_gba/CMakeLists.txt
index b11230fe..3011e87e 100644
--- a/languages/cpp/app_templates/chello_gba/CMakeLists.txt
+++ b/languages/cpp/app_templates/chello_gba/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( chellogba.tar.gz ALL
   COMMAND tar zcf chellogba.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     main.c font.raw.c master.pal.c src-Makefile.am
     c-Makefile.am c-Makefile.cvs configure.in chellogba.png
-    app.tdevelop main.h gba.h font.bmp README.devel
+    app.kdevelop main.h gba.h font.bmp README.devel
 )
 
 
diff --git a/languages/cpp/app_templates/chello_gba/Makefile.am b/languages/cpp/app_templates/chello_gba/Makefile.am
index fbc6c2b4..2a72573e 100644
--- a/languages/cpp/app_templates/chello_gba/Makefile.am
+++ b/languages/cpp/app_templates/chello_gba/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = main.c font.raw.c master.pal.c src-Makefile.am c-Makefile.am \
-	c-Makefile.cvs configure.in chellogba.png app.tdevelop \
+	c-Makefile.cvs configure.in chellogba.png app.kdevelop \
 	main.h gba.h font.bmp README.devel
 templateName = chellogba
 
diff --git a/languages/cpp/app_templates/chello_gba/app.kdevelop b/languages/cpp/app_templates/chello_gba/app.kdevelop
new file mode 100644
index 00000000..b9830c51
--- /dev/null
+++ b/languages/cpp/app_templates/chello_gba/app.kdevelop
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<kdevelop>
+ <general>
+  <author>%{AUTHOR}</author>
+  <email>%{EMAIL}</email>
+  <version>%{VERSION}</version>
+  <projectmanagement>KDevAutoProject</projectmanagement>
+  <primarylanguage>C</primarylanguage>
+  <keywords>
+   <keyword>C</keyword>
+   <keyword>GBA</keyword>
+  </keywords>
+  <ignoreparts>
+   <part>KDevDebugger</part>
+  </ignoreparts>
+ </general>
+ <kdevautoproject>
+  <general>
+   <activetarget>src/%{APPNAMELC}</activetarget>
+  </general>
+  <run>
+   <disable_default>true</disable_default>
+  </run>
+  <configurations>
+   <default>
+    <configargs>--host=arm-gcc-elf --build=i386</configargs>
+    <ldflags>-T lnkscript crt0.o</ldflags>
+    <ccompiler>kdevgccoptions</ccompiler>
+    <cxxcompiler>kdevgppoptions</cxxcompiler>
+    <f77compiler>kdevg77options</f77compiler>
+    <ccompilerbinary>arm-agb-elf-gcc</ccompilerbinary>
+    <cxxcompilerbinary>arm-agb-elf-g++</cxxcompilerbinary>
+    <cflags>-nostartfiles</cflags>
+   </default>
+  </configurations>
+ </kdevautoproject>
+ <kdevvisualadvance>
+   <binary>src/%{APPNAMELC}.gba</binary>
+ </kdevvisualadvance>
+ <kdevdoctreeview>
+    <ignoretocs>
+      <toc>ada</toc>
+      <toc>ada_bugs_gcc</toc>
+      <toc>bash</toc>
+      <toc>bash_bugs</toc>
+      <toc>clanlib</toc>
+      <toc>w3c-dom-level2-html</toc>
+      <toc>fortran_bugs_gcc</toc>
+      <toc>gnome1</toc>
+      <toc>gnustep</toc>
+      <toc>gtk</toc>
+      <toc>gtk_bugs</toc>
+      <toc>haskell</toc>
+      <toc>haskell_bugs_ghc</toc>
+      <toc>java_bugs_gcc</toc>
+      <toc>java_bugs_sun</toc>
+      <toc>kde2book</toc>
+      <toc>libstdc++</toc>
+      <toc>opengl</toc>
+      <toc>pascal_bugs_fp</toc>
+      <toc>php</toc>
+      <toc>php_bugs</toc>
+      <toc>perl</toc>
+      <toc>perl_bugs</toc>
+      <toc>python</toc>
+      <toc>python_bugs</toc>
+      <toc>qt-kdev3</toc>
+      <toc>ruby</toc>
+      <toc>ruby_bugs</toc>
+      <toc>sdl</toc>
+      <toc>stl</toc>
+      <toc>w3c-svg</toc>
+      <toc>sw</toc>
+      <toc>w3c-uaag10</toc>
+      <toc>wxwidgets_bugs</toc>
+    </ignoretocs>
+    <ignoreqt_xml>
+      <toc>Guide to the Qt Translation Tools</toc>
+      <toc>Qt Assistant Manual</toc>
+      <toc>Qt Designer Manual</toc>
+      <toc>Qt Reference Documentation</toc>
+      <toc>qmake User Guide</toc>
+    </ignoreqt_xml>
+    <ignoredoxygen>
+      <toc>TDE Libraries (Doxygen)</toc>
+    </ignoredoxygen>
+ </kdevdoctreeview>
+ <kdevfilecreate>
+  <useglobaltypes>
+   <type ext="c"/>
+   <type ext="h"/>
+  </useglobaltypes>
+ </kdevfilecreate>
+  <kdevdocumentation>
+    <projectdoc>
+      <docsystem>Doxygen Documentation Collection</docsystem>
+      <docurl>%{APPNAMELC}.tag</docurl>
+    </projectdoc>
+  </kdevdocumentation>
+</kdevelop>
diff --git a/languages/cpp/app_templates/chello_gba/app.tdevelop b/languages/cpp/app_templates/chello_gba/app.tdevelop
deleted file mode 100644
index 2f59c978..00000000
--- a/languages/cpp/app_templates/chello_gba/app.tdevelop
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0"?>
-<tdevelop>
- <general>
-  <author>%{AUTHOR}</author>
-  <email>%{EMAIL}</email>
-  <version>%{VERSION}</version>
-  <projectmanagement>KDevAutoProject</projectmanagement>
-  <primarylanguage>C</primarylanguage>
-  <keywords>
-   <keyword>C</keyword>
-   <keyword>GBA</keyword>
-  </keywords>
-  <ignoreparts>
-   <part>KDevDebugger</part>
-  </ignoreparts>
- </general>
- <kdevautoproject>
-  <general>
-   <activetarget>src/%{APPNAMELC}</activetarget>
-  </general>
-  <run>
-   <disable_default>true</disable_default>
-  </run>
-  <configurations>
-   <default>
-    <configargs>--host=arm-gcc-elf --build=i386</configargs>
-    <ldflags>-T lnkscript crt0.o</ldflags>
-    <ccompiler>kdevgccoptions</ccompiler>
-    <cxxcompiler>kdevgppoptions</cxxcompiler>
-    <f77compiler>kdevg77options</f77compiler>
-    <ccompilerbinary>arm-agb-elf-gcc</ccompilerbinary>
-    <cxxcompilerbinary>arm-agb-elf-g++</cxxcompilerbinary>
-    <cflags>-nostartfiles</cflags>
-   </default>
-  </configurations>
- </kdevautoproject>
- <kdevvisualadvance>
-   <binary>src/%{APPNAMELC}.gba</binary>
- </kdevvisualadvance>
- <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>libstdc++</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>stl</toc>
-      <toc>w3c-svg</toc>
-      <toc>sw</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>TDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
-  <useglobaltypes>
-   <type ext="c"/>
-   <type ext="h"/>
-  </useglobaltypes>
- </kdevfilecreate>
-  <kdevdocumentation>
-    <projectdoc>
-      <docsystem>Doxygen Documentation Collection</docsystem>
-      <docurl>%{APPNAMELC}.tag</docurl>
-    </projectdoc>
-  </kdevdocumentation>
-</tdevelop>
diff --git a/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate b/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate
index ef89357f..3e58b178 100644
--- a/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate
+++ b/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate
@@ -77,8 +77,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
-- 
cgit v1.2.3