commit 3c79080bfa6e22dd10d983672569c9f6bfe37c1b
author Zane Shelley <zshelle@us.ibm.com> Wed Aug 04 22:19:26 2021 -0500
committer Zane Shelley <zshelle@us.ibm.com> Thu Aug 05 10:51:54 2021 -0500
tree 6f264de44ec450ba91dc4d32e043557fe8eba04b
parent d2854b75a6e47ca5fcff90916f6e28c1f2e97d22

Install RAS data file schema document

In addition, moved all data files to same subdirectory and put the
schema document in its own subdirectory.

Change-Id: Ib961907ffe30a009f5e03cf694ad78f5357bc764
Signed-off-by: Zane Shelley <zshelle@us.ibm.com>

analyzer/ras-data/data/ras-data-explorer-11.json

diff --git a/analyzer/ras-data/explorer/ras_data_explorer_11.json b/analyzer/ras-data/data/ras-data-explorer-11.json
similarity index 100%
rename from analyzer/ras-data/explorer/ras_data_explorer_11.json
rename to analyzer/ras-data/data/ras-data-explorer-11.json

analyzer/ras-data/data/ras-data-explorer-20.json

diff --git a/analyzer/ras-data/explorer/ras_data_explorer_20.json b/analyzer/ras-data/data/ras-data-explorer-20.json
similarity index 100%
rename from analyzer/ras-data/explorer/ras_data_explorer_20.json
rename to analyzer/ras-data/data/ras-data-explorer-20.json

analyzer/ras-data/data/ras-data-p10-10.json

diff --git a/analyzer/ras-data/p10/ras_data_p10_10.json b/analyzer/ras-data/data/ras-data-p10-10.json
similarity index 100%
rename from analyzer/ras-data/p10/ras_data_p10_10.json
rename to analyzer/ras-data/data/ras-data-p10-10.json

analyzer/ras-data/data/ras-data-p10-20.json

diff --git a/analyzer/ras-data/p10/ras_data_p10_20.json b/analyzer/ras-data/data/ras-data-p10-20.json
similarity index 100%
rename from analyzer/ras-data/p10/ras_data_p10_20.json
rename to analyzer/ras-data/data/ras-data-p10-20.json

analyzer/ras-data/explorer/meson.build

diff --git a/analyzer/ras-data/explorer/meson.build b/analyzer/ras-data/explorer/meson.build
deleted file mode 100644
index 54462c5..0000000
--- a/analyzer/ras-data/explorer/meson.build
+++ /dev/null
@@ -1,6 +0,0 @@
-
-explorer_data_files = files(
-    'ras_data_explorer_11.json',
-    'ras_data_explorer_20.json',
-)
-

analyzer/ras-data/meson.build

diff --git a/analyzer/ras-data/meson.build b/analyzer/ras-data/meson.build
index 2c40fbd..73198de 100644
--- a/analyzer/ras-data/meson.build
+++ b/analyzer/ras-data/meson.build
@@ -1,11 +1,18 @@
 
-subdir('p10')      # for p10_data_files
-subdir('explorer') # for explorer_data_files
+# Install the RAS data files
 
-data_files = [
-    p10_data_files,
-    explorer_data_files,
-]
+ras_data_files = files(
+    'data/ras-data-p10-10.json',
+    'data/ras-data-p10-20.json',
+    'data/ras-data-explorer-11.json',
+    'data/ras-data-explorer-20.json',
+)
 
-install_data( data_files, install_dir : package_dir )
+install_data( ras_data_files, install_dir: join_paths(package_dir, 'ras-data') )
+
+# Install the RAS data schema
+
+ras_data_schema = files( 'schema/ras-data-schema.json' )
+
+install_data( ras_data_schema, install_dir: join_paths(package_dir, 'schema') )
 

analyzer/ras-data/p10/meson.build

diff --git a/analyzer/ras-data/p10/meson.build b/analyzer/ras-data/p10/meson.build
deleted file mode 100644
index 691fe21..0000000
--- a/analyzer/ras-data/p10/meson.build
+++ /dev/null
@@ -1,6 +0,0 @@
-
-p10_data_files = files(
-    'ras_data_p10_10.json',
-    'ras_data_p10_20.json',
-)
-

analyzer/ras-data/schema/ras-data-schema.json

diff --git a/analyzer/ras-data/ras-data-schema.json b/analyzer/ras-data/schema/ras-data-schema.json
similarity index 100%
rename from analyzer/ras-data/ras-data-schema.json
rename to analyzer/ras-data/schema/ras-data-schema.json