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)
---
 .../ada/app_templates/adahello/CMakeLists.txt      |  2 +-
 languages/ada/app_templates/adahello/Makefile.am   |  2 +-
 .../app_templates/adahello/adahello.kdevtemplate   |  8 +--
 languages/ada/app_templates/adahello/app.kdevelop  | 84 ++++++++++++++++++++++
 .../app_templates/adahello/app.kdevelop.filelist   |  1 +
 languages/ada/app_templates/adahello/app.tdevelop  | 84 ----------------------
 .../app_templates/adahello/app.tdevelop.filelist   |  1 -
 7 files changed, 91 insertions(+), 91 deletions(-)
 create mode 100644 languages/ada/app_templates/adahello/app.kdevelop
 create mode 100644 languages/ada/app_templates/adahello/app.kdevelop.filelist
 delete mode 100644 languages/ada/app_templates/adahello/app.tdevelop
 delete mode 100644 languages/ada/app_templates/adahello/app.tdevelop.filelist

(limited to 'languages/ada')

diff --git a/languages/ada/app_templates/adahello/CMakeLists.txt b/languages/ada/app_templates/adahello/CMakeLists.txt
index cbd00e6e..5c0dbc7a 100644
--- a/languages/ada/app_templates/adahello/CMakeLists.txt
+++ b/languages/ada/app_templates/adahello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( adahello.tar.gz ALL
   COMMAND
-    tar zcf adahello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} main.adb app.tdevelop ada-Makefile app.tdevelop.filelist )
+    tar zcf adahello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} main.adb app.kdevelop ada-Makefile app.kdevelop.filelist )
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/adahello.tar.gz adahello.png
diff --git a/languages/ada/app_templates/adahello/Makefile.am b/languages/ada/app_templates/adahello/Makefile.am
index 5a970c91..45e04df7 100644
--- a/languages/ada/app_templates/adahello/Makefile.am
+++ b/languages/ada/app_templates/adahello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = main.adb app.tdevelop ada-Makefile app.tdevelop.filelist
+dataFiles = main.adb app.kdevelop ada-Makefile app.kdevelop.filelist
 
 ### no need to change below:
 template_DATA = adahello.kdevtemplate
diff --git a/languages/ada/app_templates/adahello/adahello.kdevtemplate b/languages/ada/app_templates/adahello/adahello.kdevtemplate
index 0cc09da2..3079b840 100644
--- a/languages/ada/app_templates/adahello/adahello.kdevtemplate
+++ b/languages/ada/app_templates/adahello/adahello.kdevtemplate
@@ -75,8 +75,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
@@ -85,8 +85,8 @@ Dest=%{dest}/Makefile
 
 [FILE3]
 Type=install
-Source=%{src}/app.tdevelop.filelist
-Dest=%{dest}/%{APPNAMELC}.tdevelop.filelist
+Source=%{src}/app.kdevelop.filelist
+Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
 
 [MkDir1]
 Type=mkdir
diff --git a/languages/ada/app_templates/adahello/app.kdevelop b/languages/ada/app_templates/adahello/app.kdevelop
new file mode 100644
index 00000000..b430f6e8
--- /dev/null
+++ b/languages/ada/app_templates/adahello/app.kdevelop
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<kdevelop>
+ <general>
+  <author>%{AUTHOR}</author>
+  <email>%{EMAIL}</email>
+  <version>%{VERSION}</version>
+  <projectmanagement>KDevCustomProject</projectmanagement>
+  <primarylanguage>Ada</primarylanguage>
+  <keywords>
+   <keyword>Ada</keyword>
+   <keyword>Code</keyword>
+  </keywords>
+ </general>
+ <kdevcustomproject>
+    <run>
+      <directoryradio>build</directoryradio>
+      <customdirectory>/</customdirectory>
+      <mainprogram>%{APPNAMELC}</mainprogram>
+      <programargs/>
+      <terminal>false</terminal>
+      <autocompile>false</autocompile>
+      <envvars/>
+    </run>
+    <build>
+      <buildtool>make</buildtool>
+      <builddir/>
+    </build> 
+ </kdevcustomproject>
+ <kdevdoctreeview>
+    <ignoretocs>
+      <toc>bash</toc>
+      <toc>bash_bugs</toc>
+      <toc>c++_bugs_gcc</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>libc</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>KDE Libraries (Doxygen)</toc>
+    </ignoredoxygen>
+ </kdevdoctreeview>
+ <kdevfilecreate>
+  <useglobaltypes>
+   <type ext="ads"/>
+   <type ext="adb"/>
+   <type ext="ada"/>
+  </useglobaltypes>
+ </kdevfilecreate>
+</kdevelop>
diff --git a/languages/ada/app_templates/adahello/app.kdevelop.filelist b/languages/ada/app_templates/adahello/app.kdevelop.filelist
new file mode 100644
index 00000000..e5b69ca2
--- /dev/null
+++ b/languages/ada/app_templates/adahello/app.kdevelop.filelist
@@ -0,0 +1 @@
+src/%{APPNAMELC}.adb
\ No newline at end of file
diff --git a/languages/ada/app_templates/adahello/app.tdevelop b/languages/ada/app_templates/adahello/app.tdevelop
deleted file mode 100644
index a94f7e34..00000000
--- a/languages/ada/app_templates/adahello/app.tdevelop
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-<tdevelop>
- <general>
-  <author>%{AUTHOR}</author>
-  <email>%{EMAIL}</email>
-  <version>%{VERSION}</version>
-  <projectmanagement>KDevCustomProject</projectmanagement>
-  <primarylanguage>Ada</primarylanguage>
-  <keywords>
-   <keyword>Ada</keyword>
-   <keyword>Code</keyword>
-  </keywords>
- </general>
- <kdevcustomproject>
-    <run>
-      <directoryradio>build</directoryradio>
-      <customdirectory>/</customdirectory>
-      <mainprogram>%{APPNAMELC}</mainprogram>
-      <programargs/>
-      <terminal>false</terminal>
-      <autocompile>false</autocompile>
-      <envvars/>
-    </run>
-    <build>
-      <buildtool>make</buildtool>
-      <builddir/>
-    </build> 
- </kdevcustomproject>
- <kdevdoctreeview>
-    <ignoretocs>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>c++_bugs_gcc</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>libc</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>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
-  <useglobaltypes>
-   <type ext="ads"/>
-   <type ext="adb"/>
-   <type ext="ada"/>
-  </useglobaltypes>
- </kdevfilecreate>
-</tdevelop>
diff --git a/languages/ada/app_templates/adahello/app.tdevelop.filelist b/languages/ada/app_templates/adahello/app.tdevelop.filelist
deleted file mode 100644
index e5b69ca2..00000000
--- a/languages/ada/app_templates/adahello/app.tdevelop.filelist
+++ /dev/null
@@ -1 +0,0 @@
-src/%{APPNAMELC}.adb
\ No newline at end of file
-- 
cgit v1.2.3