From c320d3909aae3b7baa8891e8d8a84ef7fc28b7dd Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@theqtcompany.com>
Date: Thu, 24 Mar 2016 12:46:10 +0100
Subject: [PATCH] Move 3rdparty resources into 3rdparty subdirectory

Change-Id: Ib6363629ef3e4d10bca64936a46147b5defc048b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 share/qtcreator/static.pro                       |  1 -
 share/share.qbs                                  | 12 +++++++++++-
 src/share/3rdparty/data.pro                      | 16 ++++++++++++++++
 .../3rdparty}/generic-highlighter/alert.xml      |  0
 .../3rdparty}/generic-highlighter/autoconf.xml   |  0
 .../share/3rdparty}/generic-highlighter/bash.xml |  0
 .../3rdparty}/generic-highlighter/cmake.xml      |  0
 .../share/3rdparty}/generic-highlighter/css.xml  |  0
 .../3rdparty}/generic-highlighter/doxygen.xml    |  0
 .../share/3rdparty}/generic-highlighter/dtd.xml  |  0
 .../share/3rdparty}/generic-highlighter/html.xml |  0
 .../share/3rdparty}/generic-highlighter/ini.xml  |  0
 .../share/3rdparty}/generic-highlighter/java.xml |  0
 .../3rdparty}/generic-highlighter/javadoc.xml    |  0
 .../3rdparty}/generic-highlighter/makefile.xml   |  0
 .../share/3rdparty}/generic-highlighter/perl.xml |  0
 .../share/3rdparty}/generic-highlighter/ruby.xml |  0
 .../generic-highlighter/valgrind-suppression.xml |  0
 .../share/3rdparty}/generic-highlighter/xml.xml  |  0
 .../share/3rdparty}/generic-highlighter/yacc.xml |  0
 src/src.pro                                      |  3 ++-
 21 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 src/share/3rdparty/data.pro
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/alert.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/autoconf.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/bash.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/cmake.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/css.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/doxygen.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/dtd.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/html.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/ini.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/java.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/javadoc.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/makefile.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/perl.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/ruby.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/valgrind-suppression.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/xml.xml (100%)
 rename {share/qtcreator => src/share/3rdparty}/generic-highlighter/yacc.xml (100%)

diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro
index 9b3b102b9e5..068ec0039dc 100644
--- a/share/qtcreator/static.pro
+++ b/share/qtcreator/static.pro
@@ -22,7 +22,6 @@ DATA_DIRS = \
     qml \
     qml-type-descriptions \
     modeleditor \
-    generic-highlighter \
     glsl \
     cplusplus
 macx: DATA_DIRS += scripts
diff --git a/share/share.qbs b/share/share.qbs
index f00a8e7697d..9a51fea6a93 100644
--- a/share/share.qbs
+++ b/share/share.qbs
@@ -13,7 +13,6 @@ Product {
             "cplusplus/**/*",
             "debugger/**/*",
             "designer/**/*",
-            "generic-highlighter/**/*",
             "glsl/**/*",
             "modeleditor/**/*",
             "qml/**/*",
@@ -29,6 +28,17 @@ Product {
         ]
     }
 
+    Group {
+        name: "3rdparty"
+        qbs.install: true
+        qbs.installDir: project.ide_data_path
+        qbs.installSourceBase: project.ide_source_tree + "/src/share/3rdparty"
+        prefix: project.ide_source_tree + "/src/share/3rdparty/"
+        files: [
+            "generic-highlighter/**/*"
+        ]
+    }
+
     Group {
         name: "Conditional"
         qbs.install: true
diff --git a/src/share/3rdparty/data.pro b/src/share/3rdparty/data.pro
new file mode 100644
index 00000000000..3f3b5d905c8
--- /dev/null
+++ b/src/share/3rdparty/data.pro
@@ -0,0 +1,16 @@
+TEMPLATE = aux
+
+include(../../../qtcreator.pri)
+
+STATIC_BASE = $$PWD
+STATIC_OUTPUT_BASE = $$IDE_DATA_PATH
+STATIC_INSTALL_BASE = $$INSTALL_DATA_PATH
+
+DATA_DIRS = \
+    generic-highlighter
+
+for(data_dir, DATA_DIRS) {
+    STATIC_FILES += $$files($$PWD/$$data_dir/*, true)
+}
+
+include(../../../qtcreatordata.pri)
diff --git a/share/qtcreator/generic-highlighter/alert.xml b/src/share/3rdparty/generic-highlighter/alert.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/alert.xml
rename to src/share/3rdparty/generic-highlighter/alert.xml
diff --git a/share/qtcreator/generic-highlighter/autoconf.xml b/src/share/3rdparty/generic-highlighter/autoconf.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/autoconf.xml
rename to src/share/3rdparty/generic-highlighter/autoconf.xml
diff --git a/share/qtcreator/generic-highlighter/bash.xml b/src/share/3rdparty/generic-highlighter/bash.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/bash.xml
rename to src/share/3rdparty/generic-highlighter/bash.xml
diff --git a/share/qtcreator/generic-highlighter/cmake.xml b/src/share/3rdparty/generic-highlighter/cmake.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/cmake.xml
rename to src/share/3rdparty/generic-highlighter/cmake.xml
diff --git a/share/qtcreator/generic-highlighter/css.xml b/src/share/3rdparty/generic-highlighter/css.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/css.xml
rename to src/share/3rdparty/generic-highlighter/css.xml
diff --git a/share/qtcreator/generic-highlighter/doxygen.xml b/src/share/3rdparty/generic-highlighter/doxygen.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/doxygen.xml
rename to src/share/3rdparty/generic-highlighter/doxygen.xml
diff --git a/share/qtcreator/generic-highlighter/dtd.xml b/src/share/3rdparty/generic-highlighter/dtd.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/dtd.xml
rename to src/share/3rdparty/generic-highlighter/dtd.xml
diff --git a/share/qtcreator/generic-highlighter/html.xml b/src/share/3rdparty/generic-highlighter/html.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/html.xml
rename to src/share/3rdparty/generic-highlighter/html.xml
diff --git a/share/qtcreator/generic-highlighter/ini.xml b/src/share/3rdparty/generic-highlighter/ini.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/ini.xml
rename to src/share/3rdparty/generic-highlighter/ini.xml
diff --git a/share/qtcreator/generic-highlighter/java.xml b/src/share/3rdparty/generic-highlighter/java.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/java.xml
rename to src/share/3rdparty/generic-highlighter/java.xml
diff --git a/share/qtcreator/generic-highlighter/javadoc.xml b/src/share/3rdparty/generic-highlighter/javadoc.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/javadoc.xml
rename to src/share/3rdparty/generic-highlighter/javadoc.xml
diff --git a/share/qtcreator/generic-highlighter/makefile.xml b/src/share/3rdparty/generic-highlighter/makefile.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/makefile.xml
rename to src/share/3rdparty/generic-highlighter/makefile.xml
diff --git a/share/qtcreator/generic-highlighter/perl.xml b/src/share/3rdparty/generic-highlighter/perl.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/perl.xml
rename to src/share/3rdparty/generic-highlighter/perl.xml
diff --git a/share/qtcreator/generic-highlighter/ruby.xml b/src/share/3rdparty/generic-highlighter/ruby.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/ruby.xml
rename to src/share/3rdparty/generic-highlighter/ruby.xml
diff --git a/share/qtcreator/generic-highlighter/valgrind-suppression.xml b/src/share/3rdparty/generic-highlighter/valgrind-suppression.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/valgrind-suppression.xml
rename to src/share/3rdparty/generic-highlighter/valgrind-suppression.xml
diff --git a/share/qtcreator/generic-highlighter/xml.xml b/src/share/3rdparty/generic-highlighter/xml.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/xml.xml
rename to src/share/3rdparty/generic-highlighter/xml.xml
diff --git a/share/qtcreator/generic-highlighter/yacc.xml b/src/share/3rdparty/generic-highlighter/yacc.xml
similarity index 100%
rename from share/qtcreator/generic-highlighter/yacc.xml
rename to src/share/3rdparty/generic-highlighter/yacc.xml
diff --git a/src/src.pro b/src/src.pro
index 0cbba619fd0..496c500dbdd 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -32,4 +32,5 @@ SUBDIRS += \
     app \
     plugins \
     tools \
-    share/qtcreator/data.pro
+    share/qtcreator/data.pro \
+    share/3rdparty/data.pro