From 3f58e554ba8730bf4a6e862e3096a4d13d212288 Mon Sep 17 00:00:00 2001
From: redtide <redtid3@gmail.com>
Date: Sun, 20 Jun 2021 17:37:08 +0200
Subject: [PATCH] Reorganization of data resources

---
 .gitattributes                                      |   2 +-
 build-packages.sh                                   |  10 +++++-----
 meson.build                                         |   2 +-
 {dev-utils => resources/icons}/icon.icns            | Bin
 icon.ico => resources/icons/icon.ico                | Bin
 icon.inl => resources/icons/icon.inl                |   0
 res.rc => resources/icons/icon.rc                   |   0
 {dev-utils => resources/icons}/lite.svg             |   0
 {dev-utils => resources/linux}/lite-xl.desktop      |   0
 {dev-utils => resources/macos}/Info.plist           |   0
 .../macos}/macos-retina-display.md                  |   0
 src/main.c                                          |   2 +-
 12 files changed, 8 insertions(+), 8 deletions(-)
 rename {dev-utils => resources/icons}/icon.icns (100%)
 rename icon.ico => resources/icons/icon.ico (100%)
 rename icon.inl => resources/icons/icon.inl (100%)
 rename res.rc => resources/icons/icon.rc (100%)
 rename {dev-utils => resources/icons}/lite.svg (100%)
 rename {dev-utils => resources/linux}/lite-xl.desktop (100%)
 rename {dev-utils => resources/macos}/Info.plist (100%)
 rename {dev-utils => resources/macos}/macos-retina-display.md (100%)

diff --git a/.gitattributes b/.gitattributes
index bd2cfac4..31ff9dfc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,3 @@
 winlib/*  linguist-vendored
 src/lib/* linguist-vendored
-icon.inl  linguist-vendored
+resources/icons/icon.inl linguist-vendored
diff --git a/build-packages.sh b/build-packages.sh
index 76b0ebf5..593aaba8 100755
--- a/build-packages.sh
+++ b/build-packages.sh
@@ -84,7 +84,7 @@ lite_build_package_windows () {
   rm -fr ".package-build"
   echo "created package $package_name"
 }
-  
+
 lite_build_package_macos () {
   local build="$1"
   local arch="$2"
@@ -100,8 +100,8 @@ lite_build_package_macos () {
   for module_name in plugins colors; do
     cp -r "$build/third/data/$module_name" "$datadir"
   done
-  cp dev-utils/icon.icns "$appdir/Contents/Resources/icon.icns"
-  cp dev-utils/Info.plist "$appdir/Contents/Info.plist"
+  cp resources/icons/icon.icns "$appdir/Contents/Resources/icon.icns"
+  cp resources/macos/Info.plist "$appdir/Contents/Info.plist"
   cp "$build/src/lite" "$bindir/lite-xl"
   strip "$bindir/lite-xl"
   pushd ".package-build"
@@ -142,8 +142,8 @@ lite_build_package_linux () {
   strip "$bindir/lite"
   if [ -z "$portable" ]; then
     mkdir -p "$pdir/share/applications" "$pdir/share/icons/hicolor/scalable/apps"
-    cp "dev-utils/lite-xl.desktop" "$pdir/share/applications"
-    cp "dev-utils/lite.svg" "$pdir/share/icons/hicolor/scalable/apps/lite-xl.svg"
+    cp "resources/linux/lite-xl.desktop" "$pdir/share/applications"
+    cp "resources/icons/lite.svg" "$pdir/share/icons/hicolor/scalable/apps/lite-xl.svg"
   fi
   pushd ".package-build"
   local package_name="lite-xl-$os-$arch$portable.tar.gz"
diff --git a/meson.build b/meson.build
index c1108ee7..38eda308 100644
--- a/meson.build
+++ b/meson.build
@@ -55,7 +55,7 @@ endif
 lite_rc = []
 if host_machine.system() == 'windows'
     windows = import('windows')
-    lite_rc += windows.compile_resources('res.rc')
+    lite_rc += windows.compile_resources('resources/icons/icon.rc')
 endif
 
 # On macos we need to use the SDL renderer to support retina displays
diff --git a/dev-utils/icon.icns b/resources/icons/icon.icns
similarity index 100%
rename from dev-utils/icon.icns
rename to resources/icons/icon.icns
diff --git a/icon.ico b/resources/icons/icon.ico
similarity index 100%
rename from icon.ico
rename to resources/icons/icon.ico
diff --git a/icon.inl b/resources/icons/icon.inl
similarity index 100%
rename from icon.inl
rename to resources/icons/icon.inl
diff --git a/res.rc b/resources/icons/icon.rc
similarity index 100%
rename from res.rc
rename to resources/icons/icon.rc
diff --git a/dev-utils/lite.svg b/resources/icons/lite.svg
similarity index 100%
rename from dev-utils/lite.svg
rename to resources/icons/lite.svg
diff --git a/dev-utils/lite-xl.desktop b/resources/linux/lite-xl.desktop
similarity index 100%
rename from dev-utils/lite-xl.desktop
rename to resources/linux/lite-xl.desktop
diff --git a/dev-utils/Info.plist b/resources/macos/Info.plist
similarity index 100%
rename from dev-utils/Info.plist
rename to resources/macos/Info.plist
diff --git a/dev-utils/macos-retina-display.md b/resources/macos/macos-retina-display.md
similarity index 100%
rename from dev-utils/macos-retina-display.md
rename to resources/macos/macos-retina-display.md
diff --git a/src/main.c b/src/main.c
index 46befe51..f84cc3b8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -79,7 +79,7 @@ static void get_exe_filename(char *buf, int sz) {
 
 static void init_window_icon(void) {
 #ifndef _WIN32
-  #include "../icon.inl"
+  #include "../resources/icons/icon.inl"
   (void) icon_rgba_len; /* unused */
   SDL_Surface *surf = SDL_CreateRGBSurfaceFrom(
     icon_rgba, 64, 64,