From 2ed3f0995d7f2ea6a0d2f04d7266f0c736b4ebc0 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Fri, 20 Oct 2017 17:12:59 +0200
Subject: [PATCH] Move Windows Store Artwork to make sure it's not accidentally
 included in APPX packages

---
 build.xml                                           |   2 +-
 .../Artwork => icons/artwork}/artwork_1440x2160.png | Bin
 .../Artwork => icons/artwork}/artwork_150x150.png   | Bin
 .../Artwork => icons/artwork}/artwork_2160x2160.png | Bin
 .../Artwork => icons/artwork}/artwork_300x300.png   | Bin
 .../Artwork => icons/artwork}/artwork_4096x4096.png | Bin
 .../Artwork => icons/artwork}/artwork_71x71.png     | Bin
 installer/{appx/Artwork => icons/artwork}/build.sh  |   0
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename installer/{appx/Artwork => icons/artwork}/artwork_1440x2160.png (100%)
 rename installer/{appx/Artwork => icons/artwork}/artwork_150x150.png (100%)
 rename installer/{appx/Artwork => icons/artwork}/artwork_2160x2160.png (100%)
 rename installer/{appx/Artwork => icons/artwork}/artwork_300x300.png (100%)
 rename installer/{appx/Artwork => icons/artwork}/artwork_4096x4096.png (100%)
 rename installer/{appx/Artwork => icons/artwork}/artwork_71x71.png (100%)
 rename installer/{appx/Artwork => icons/artwork}/build.sh (100%)

diff --git a/build.xml b/build.xml
index 2bdea863..afcd0d03 100644
--- a/build.xml
+++ b/build.xml
@@ -619,7 +619,7 @@
 		<property name="dir.staging" location="${dir.dist}/appx/${arch}" />
 
 		<copy todir="${dir.staging}">
-			<fileset dir="${dir.installer}/appx" includes="*.exe, *.properties, *.ico, Assets/*.png" />
+			<fileset dir="${dir.installer}/appx" includes="*.exe, *.properties, *.ico, **/*.png" />
 			<fileset dir="${dir.lib}/native/win32-${arch}" />
 		</copy>
 		<copy todir="${dir.staging}/lib">
diff --git a/installer/appx/Artwork/artwork_1440x2160.png b/installer/icons/artwork/artwork_1440x2160.png
similarity index 100%
rename from installer/appx/Artwork/artwork_1440x2160.png
rename to installer/icons/artwork/artwork_1440x2160.png
diff --git a/installer/appx/Artwork/artwork_150x150.png b/installer/icons/artwork/artwork_150x150.png
similarity index 100%
rename from installer/appx/Artwork/artwork_150x150.png
rename to installer/icons/artwork/artwork_150x150.png
diff --git a/installer/appx/Artwork/artwork_2160x2160.png b/installer/icons/artwork/artwork_2160x2160.png
similarity index 100%
rename from installer/appx/Artwork/artwork_2160x2160.png
rename to installer/icons/artwork/artwork_2160x2160.png
diff --git a/installer/appx/Artwork/artwork_300x300.png b/installer/icons/artwork/artwork_300x300.png
similarity index 100%
rename from installer/appx/Artwork/artwork_300x300.png
rename to installer/icons/artwork/artwork_300x300.png
diff --git a/installer/appx/Artwork/artwork_4096x4096.png b/installer/icons/artwork/artwork_4096x4096.png
similarity index 100%
rename from installer/appx/Artwork/artwork_4096x4096.png
rename to installer/icons/artwork/artwork_4096x4096.png
diff --git a/installer/appx/Artwork/artwork_71x71.png b/installer/icons/artwork/artwork_71x71.png
similarity index 100%
rename from installer/appx/Artwork/artwork_71x71.png
rename to installer/icons/artwork/artwork_71x71.png
diff --git a/installer/appx/Artwork/build.sh b/installer/icons/artwork/build.sh
similarity index 100%
rename from installer/appx/Artwork/build.sh
rename to installer/icons/artwork/build.sh