Merge pull request #83 from matty0ung/jsonTidyUp2

Various fixes, plus new default content
Brewken · Jun 17, 2024 · 6f15adc · 6f15adc
2 parents 00be992 + 35473cf
commit 6f15adc
Show file tree

Hide file tree

Showing 73 changed files with 28,186 additions and 1,181 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -814,7 +814,9 @@ set(filesToInstall_docs ${repoDir}/README.md)
 
 # List of data files to be installed.
 set(filesToInstall_data ${repoDir}/data/default_db.sqlite
-                        ${repoDir}/data/DefaultData.xml)
+                        ${repoDir}/data/DefaultContent001-OriginalDefaultData.xml
+                        ${repoDir}/data/DefaultContent002-BJCP_2021_Styles.json
+                        ${repoDir}/data/DefaultContent003-Ingredients-Hops-Yeasts.json)
 
 # Desktop files to install.
 set(filesToInstall_desktop ${repoDir}/linux/${PROJECT_NAME}.desktop)

diff --git a/data/DefaultData.xml → ...DefaultContent001-OriginalDefaultData.xml b/data/DefaultData.xml → ...DefaultContent001-OriginalDefaultData.xml
diff --git a/data/DefaultContent002-BJCP_2021_Styles.json b/data/DefaultContent002-BJCP_2021_Styles.json