From 8b9c0d28fe084e8c7912a55f29052052edcfdd6e 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>
(cherry picked from commit e044c5463329652f28565dfc7de24ef8b0edaa6f)
---
 .../cpp/app_templates/generichello/Makefile.am     |  2 +-
 .../cpp/app_templates/generichello/app.kdevelop    | 61 ++++++++++++++++++++++
 .../cpp/app_templates/generichello/app.tdevelop    | 61 ----------------------
 .../generichello/generichello.kdevtemplate         |  4 +-
 4 files changed, 64 insertions(+), 64 deletions(-)
 create mode 100644 languages/cpp/app_templates/generichello/app.kdevelop
 delete mode 100644 languages/cpp/app_templates/generichello/app.tdevelop

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

diff --git a/languages/cpp/app_templates/generichello/Makefile.am b/languages/cpp/app_templates/generichello/Makefile.am
index 75bad862..b558eecd 100644
--- a/languages/cpp/app_templates/generichello/Makefile.am
+++ b/languages/cpp/app_templates/generichello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.cpp cpphello.png app.tdevelop app.prj
+dataFiles = main.cpp cpphello.png app.kdevelop app.prj
 templateName = cppgenerichello
 
 # BELOW is not the GENERIC Template-Template;
diff --git a/languages/cpp/app_templates/generichello/app.kdevelop b/languages/cpp/app_templates/generichello/app.kdevelop
new file mode 100644
index 00000000..c0b6cc1e
--- /dev/null
+++ b/languages/cpp/app_templates/generichello/app.kdevelop
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<kdevelop>
+ <general>
+  <author>%{AUTHOR}</author>
+  <email>%{EMAIL}</email>
+  <version>%{VERSION}</version>
+  <projectmanagement>KDevGenericProject</projectmanagement>
+  <primarylanguage>C++</primarylanguage>
+  <keywords>
+   <keyword>C++</keyword>
+   <keyword>Code</keyword>
+  </keywords>
+ </general>
+ <kdevgenericproject>
+  <backend>ShellScript</backend>
+  <project>%{APPNAMELC}.prj</project>
+  <general>
+   <activetarget>src/%{APPNAMELC}</activetarget>
+   <useconfiguration>debug</useconfiguration>
+  </general>
+  <run>
+   <mainprogram>src/%{APPNAMELC}</mainprogram>
+   <terminal>true</terminal>
+  </run>
+    <configurations>
+      <optimized>
+        <builddir>optimized</builddir>
+        <ccompiler>GccOptions</ccompiler>
+        <cxxcompiler>GppOptions</cxxcompiler>
+        <f77compiler>G77Options</f77compiler>
+        <cxxflags>-O2 -g0</cxxflags>
+      </optimized>
+      <debug>
+        <configargs>--enable-debug=full</configargs>
+        <builddir>debug</builddir>
+        <ccompiler>GccOptions</ccompiler>
+        <cxxcompiler>GppOptions</cxxcompiler>
+        <f77compiler>G77Options</f77compiler>
+        <cxxflags>-O0 -g3</cxxflags>
+      </debug>
+    </configurations>
+ </kdevgenericproject>
+ <kdevfilecreate>
+  <useglobaltypes>
+   <type ext="cpp"/>
+   <type ext="h"/>
+  </useglobaltypes>
+ </kdevfilecreate>
+ <kdevfileview>
+    <groups>
+      <group pattern="*.h" name="Header files" />
+      <group pattern="*.cpp" name="Source files" />
+    </groups>
+ </kdevfileview>
+  <kdevdocumentation>
+    <projectdoc>
+      <docsystem>Doxygen Documentation Collection</docsystem>
+      <docurl>%{APPNAMELC}.tag</docurl>
+    </projectdoc>
+  </kdevdocumentation>
+</kdevelop>
diff --git a/languages/cpp/app_templates/generichello/app.tdevelop b/languages/cpp/app_templates/generichello/app.tdevelop
deleted file mode 100644
index 63f5ce16..00000000
--- a/languages/cpp/app_templates/generichello/app.tdevelop
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<tdevelop>
- <general>
-  <author>%{AUTHOR}</author>
-  <email>%{EMAIL}</email>
-  <version>%{VERSION}</version>
-  <projectmanagement>KDevGenericProject</projectmanagement>
-  <primarylanguage>C++</primarylanguage>
-  <keywords>
-   <keyword>C++</keyword>
-   <keyword>Code</keyword>
-  </keywords>
- </general>
- <kdevgenericproject>
-  <backend>ShellScript</backend>
-  <project>%{APPNAMELC}.prj</project>
-  <general>
-   <activetarget>src/%{APPNAMELC}</activetarget>
-   <useconfiguration>debug</useconfiguration>
-  </general>
-  <run>
-   <mainprogram>src/%{APPNAMELC}</mainprogram>
-   <terminal>true</terminal>
-  </run>
-    <configurations>
-      <optimized>
-        <builddir>optimized</builddir>
-        <ccompiler>GccOptions</ccompiler>
-        <cxxcompiler>GppOptions</cxxcompiler>
-        <f77compiler>G77Options</f77compiler>
-        <cxxflags>-O2 -g0</cxxflags>
-      </optimized>
-      <debug>
-        <configargs>--enable-debug=full</configargs>
-        <builddir>debug</builddir>
-        <ccompiler>GccOptions</ccompiler>
-        <cxxcompiler>GppOptions</cxxcompiler>
-        <f77compiler>G77Options</f77compiler>
-        <cxxflags>-O0 -g3</cxxflags>
-      </debug>
-    </configurations>
- </kdevgenericproject>
- <kdevfilecreate>
-  <useglobaltypes>
-   <type ext="cpp"/>
-   <type ext="h"/>
-  </useglobaltypes>
- </kdevfilecreate>
- <kdevfileview>
-    <groups>
-      <group pattern="*.h" name="Header files" />
-      <group pattern="*.cpp" name="Source files" />
-    </groups>
- </kdevfileview>
-  <kdevdocumentation>
-    <projectdoc>
-      <docsystem>Doxygen Documentation Collection</docsystem>
-      <docurl>%{APPNAMELC}.tag</docurl>
-    </projectdoc>
-  </kdevdocumentation>
-</tdevelop>
diff --git a/languages/cpp/app_templates/generichello/generichello.kdevtemplate b/languages/cpp/app_templates/generichello/generichello.kdevtemplate
index f30eea5b..92bed6fc 100644
--- a/languages/cpp/app_templates/generichello/generichello.kdevtemplate
+++ b/languages/cpp/app_templates/generichello/generichello.kdevtemplate
@@ -73,8 +73,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