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)
---
 .../php/app_templates/phphello/CMakeLists.txt      |  2 +-
 languages/php/app_templates/phphello/Makefile.am   |  2 +-
 languages/php/app_templates/phphello/app.kdevelop  | 87 ++++++++++++++++++++++
 languages/php/app_templates/phphello/app.tdevelop  | 87 ----------------------
 languages/php/app_templates/phphello/phphello      |  4 +-
 .../app_templates/phphello/phphello.kdevtemplate   |  4 +-
 6 files changed, 93 insertions(+), 93 deletions(-)
 create mode 100644 languages/php/app_templates/phphello/app.kdevelop
 delete mode 100644 languages/php/app_templates/phphello/app.tdevelop

(limited to 'languages/php/app_templates')

diff --git a/languages/php/app_templates/phphello/CMakeLists.txt b/languages/php/app_templates/phphello/CMakeLists.txt
index 4e534e08..ae644c70 100644
--- a/languages/php/app_templates/phphello/CMakeLists.txt
+++ b/languages/php/app_templates/phphello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( phphello.tar.gz ALL
   COMMAND tar zcf phphello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.php app.tdevelop
+    app.php app.kdevelop
 )
 
 
diff --git a/languages/php/app_templates/phphello/Makefile.am b/languages/php/app_templates/phphello/Makefile.am
index bc983960..12d29f1b 100644
--- a/languages/php/app_templates/phphello/Makefile.am
+++ b/languages/php/app_templates/phphello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = app.php app.tdevelop
+dataFiles = app.php app.kdevelop
 templateName = phphello
 
 ### no need to change below:
diff --git a/languages/php/app_templates/phphello/app.kdevelop b/languages/php/app_templates/phphello/app.kdevelop
new file mode 100644
index 00000000..c8844e1e
--- /dev/null
+++ b/languages/php/app_templates/phphello/app.kdevelop
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<kdevelop>
+ <general>
+  <author>%{AUTHOR}</author>
+  <email>%{EMAIL}</email>
+  <version>%{VERSION}</version>
+  <projectmanagement>KDevScriptProject</projectmanagement>
+  <primarylanguage>PHP</primarylanguage>
+  <keywords>
+   <keyword>PHP</keyword>
+  </keywords>
+  <ignoreparts>
+   <part>KDevDoxygen</part>
+   <part>KDevdistpart</part>
+   <part>KDevVisualBoyAdvance</part>
+  </ignoreparts>
+ </general>
+ <kdevscriptproject>
+  <general>
+   <activedir></activedir>
+   <includepatterns>*.php,*.phps,*.php3,*.inc</includepatterns>
+  </general>
+ </kdevscriptproject>
+ <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>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>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>
+<kdevphpsupport>
+	<codeHelp>
+	   <codeCompletion>true</codeCompletion>
+	   <codeHinting>true</codeHinting>
+	   <realtimeParsing>true</realtimeParsing>
+	  </codeHelp>
+</kdevphpsupport>
+  <kdevfilecreate>
+    <useglobaltypes>
+      <type ext="php"/>
+    </useglobaltypes>
+  </kdevfilecreate>
+  <kdevfileview>
+    <groups>
+      <group pattern="*.php;*.phps;*.php3" name="PHP files" />
+      <group pattern="*.inc" name="Include files" />
+    </groups>
+  </kdevfileview>
+</kdevelop>
diff --git a/languages/php/app_templates/phphello/app.tdevelop b/languages/php/app_templates/phphello/app.tdevelop
deleted file mode 100644
index 2cdb1c70..00000000
--- a/languages/php/app_templates/phphello/app.tdevelop
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<tdevelop>
- <general>
-  <author>%{AUTHOR}</author>
-  <email>%{EMAIL}</email>
-  <version>%{VERSION}</version>
-  <projectmanagement>KDevScriptProject</projectmanagement>
-  <primarylanguage>PHP</primarylanguage>
-  <keywords>
-   <keyword>PHP</keyword>
-  </keywords>
-  <ignoreparts>
-   <part>KDevDoxygen</part>
-   <part>KDevdistpart</part>
-   <part>KDevVisualBoyAdvance</part>
-  </ignoreparts>
- </general>
- <kdevscriptproject>
-  <general>
-   <activedir></activedir>
-   <includepatterns>*.php,*.phps,*.php3,*.inc</includepatterns>
-  </general>
- </kdevscriptproject>
- <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>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>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>
-<kdevphpsupport>
-	<codeHelp>
-	   <codeCompletion>true</codeCompletion>
-	   <codeHinting>true</codeHinting>
-	   <realtimeParsing>true</realtimeParsing>
-	  </codeHelp>
-</kdevphpsupport>
-  <kdevfilecreate>
-    <useglobaltypes>
-      <type ext="php"/>
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevfileview>
-    <groups>
-      <group pattern="*.php;*.phps;*.php3" name="PHP files" />
-      <group pattern="*.inc" name="Include files" />
-    </groups>
-  </kdevfileview>
-</tdevelop>
diff --git a/languages/php/app_templates/phphello/phphello b/languages/php/app_templates/phphello/phphello
index 7ba99d9c..f9f1a69f 100644
--- a/languages/php/app_templates/phphello/phphello
+++ b/languages/php/app_templates/phphello/phphello
@@ -12,8 +12,8 @@ Archive=phphello.tar.gz
 
 [PROJECT]
 Type=install
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [APP.PHP]
 Type=install
diff --git a/languages/php/app_templates/phphello/phphello.kdevtemplate b/languages/php/app_templates/phphello/phphello.kdevtemplate
index 481f2748..8d52f490 100644
--- a/languages/php/app_templates/phphello/phphello.kdevtemplate
+++ b/languages/php/app_templates/phphello/phphello.kdevtemplate
@@ -67,8 +67,8 @@ Archive=phphello.tar.gz
 [PROJECT]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [APP.PHP]
 Type=install
-- 
cgit v1.2.3