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)
---
 .../java/app_templates/javahello/CMakeLists.txt    |  2 +-
 languages/java/app_templates/javahello/Makefile.am |  2 +-
 .../app_templates/javahello/javahello.kdevelop     | 69 ++++++++++++++++++++++
 .../app_templates/javahello/javahello.kdevtemplate |  4 +-
 .../app_templates/javahello/javahello.tdevelop     | 69 ----------------------
 5 files changed, 73 insertions(+), 73 deletions(-)
 create mode 100644 languages/java/app_templates/javahello/javahello.kdevelop
 delete mode 100644 languages/java/app_templates/javahello/javahello.tdevelop

(limited to 'languages/java/app_templates/javahello')

diff --git a/languages/java/app_templates/javahello/CMakeLists.txt b/languages/java/app_templates/javahello/CMakeLists.txt
index 8129bbc1..bbfc746f 100644
--- a/languages/java/app_templates/javahello/CMakeLists.txt
+++ b/languages/java/app_templates/javahello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( javahello.tar.gz ALL
   COMMAND tar zcf javahello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    Main.java build.xml javahello.filelist javahello.tdevelop
+    Main.java build.xml javahello.filelist javahello.kdevelop
 )
 
 
diff --git a/languages/java/app_templates/javahello/Makefile.am b/languages/java/app_templates/javahello/Makefile.am
index f47e7056..8551a6ac 100644
--- a/languages/java/app_templates/javahello/Makefile.am
+++ b/languages/java/app_templates/javahello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = Main.java build.xml javahello.filelist javahello.tdevelop
+dataFiles = Main.java build.xml javahello.filelist javahello.kdevelop
 templateName= javahello
 
 ### no need to change below:
diff --git a/languages/java/app_templates/javahello/javahello.kdevelop b/languages/java/app_templates/javahello/javahello.kdevelop
new file mode 100644
index 00000000..c3eb6898
--- /dev/null
+++ b/languages/java/app_templates/javahello/javahello.kdevelop
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<kdevelop>
+  <general>
+    <author>%{AUTHOR}</author>
+    <email>%{EMAIL}</email>
+    <version>%{VERSION}</version>
+    <projectmanagement>KDevAntProject</projectmanagement>
+    <primarylanguage>Java</primarylanguage>
+    <ignoreparts>
+      <part>KDevDebugger</part>
+    </ignoreparts>
+  </general>
+  <kdevcustomproject>
+    <build>
+      <buildtool>ant</buildtool>
+    </build>
+  </kdevcustomproject>
+ <kdevdoctreeview>
+    <ignoretocs>
+      <toc>ada</toc>
+      <toc>ada_bugs_gcc</toc>
+      <toc>bash</toc>
+      <toc>bash_bugs</toc>
+      <toc>c++_bugs_gcc</toc>
+      <toc>clanlib</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>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>sw</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>
+  <kdevfileview>
+    <tree>
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
+    </tree>
+  </kdevfileview>
+</kdevelop>
diff --git a/languages/java/app_templates/javahello/javahello.kdevtemplate b/languages/java/app_templates/javahello/javahello.kdevtemplate
index 62fcffc5..a7427704 100644
--- a/languages/java/app_templates/javahello/javahello.kdevtemplate
+++ b/languages/java/app_templates/javahello/javahello.kdevtemplate
@@ -73,8 +73,8 @@ Archive=javahello.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/javahello.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/javahello.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/java/app_templates/javahello/javahello.tdevelop b/languages/java/app_templates/javahello/javahello.tdevelop
deleted file mode 100644
index a41fae72..00000000
--- a/languages/java/app_templates/javahello/javahello.tdevelop
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<tdevelop>
-  <general>
-    <author>%{AUTHOR}</author>
-    <email>%{EMAIL}</email>
-    <version>%{VERSION}</version>
-    <projectmanagement>KDevAntProject</projectmanagement>
-    <primarylanguage>Java</primarylanguage>
-    <ignoreparts>
-      <part>KDevDebugger</part>
-    </ignoreparts>
-  </general>
-  <kdevcustomproject>
-    <build>
-      <buildtool>ant</buildtool>
-    </build>
-  </kdevcustomproject>
- <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>c++_bugs_gcc</toc>
-      <toc>clanlib</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>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>sw</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>
-  <kdevfileview>
-    <tree>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-    </tree>
-  </kdevfileview>
-</tdevelop>
-- 
cgit v1.2.1