From d6c432e852ff542918f6da7d6681fb6b8f227289 Mon Sep 17 00:00:00 2001
From: Ruslan Baratov <ruslan_baratov@yahoo.com>
Date: Wed, 20 Dec 2017 12:30:03 +0300
Subject: [PATCH 1/4] Fix directory name

If GAUZE_RESOURCE_DIR ends with '/' the 'get_filename_component' function will
return empty string as last component.
---
 cmake/templates/AndroidTest.cmake.in | 8 ++++++++
 cmake/templates/iOSTest.cmake.in     | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/cmake/templates/AndroidTest.cmake.in b/cmake/templates/AndroidTest.cmake.in
index 96c2a93..19dc18d 100644
--- a/cmake/templates/AndroidTest.cmake.in
+++ b/cmake/templates/AndroidTest.cmake.in
@@ -142,7 +142,15 @@ foreach(arg ${app_arguments})
     if(NOT IS_DIRECTORY "${resource_dir}")
       message(FATAL_ERROR "Not a directory: ${resource_dir}")
     endif()
+
+    # Remove trailing '/' so we can get last component correctly
+    get_filename_component(resource_dir "${resource_dir}" ABSOLUTE)
+
     get_filename_component(res_name "${resource_dir}" NAME)
+    if("${res_name}" STREQUAL "")
+      message(FATAL_ERROR "Can't get directory name")
+    endif()
+
     set(res_path "${data_dir}/${res_name}")
     set(arguments "${arguments} \"${res_path}\"")
 
diff --git a/cmake/templates/iOSTest.cmake.in b/cmake/templates/iOSTest.cmake.in
index 7cec3b0..75509ed 100644
--- a/cmake/templates/iOSTest.cmake.in
+++ b/cmake/templates/iOSTest.cmake.in
@@ -160,7 +160,15 @@ foreach(arg ${app_arguments})
     if(NOT IS_DIRECTORY "${resource_dir}")
       message(FATAL_ERROR "Not a directory: ${resource_dir}")
     endif()
+
+    # Remove trailing '/' so we can get last component correctly
+    get_filename_component(resource_dir "${resource_dir}" ABSOLUTE)
+
     get_filename_component(res_name "${resource_dir}" NAME)
+    if("${res_name}" STREQUAL "")
+      message(FATAL_ERROR "Can't get directory name")
+    endif()
+
     set(res_path "@GAUZE_IOS_UPLOAD_ROOT@/${res_name}")
 
     # We need to keep GAUZE_RESOURCE_FILE for one more round of

From 7696cb0ed00fcc483ec823df71265227a3b8fe15 Mon Sep 17 00:00:00 2001
From: Ruslan Baratov <ruslan_baratov@yahoo.com>
Date: Wed, 20 Dec 2017 12:54:32 +0300
Subject: [PATCH 2/4] Update Hunter

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aeea8f4..d0b17ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.3) # IN_LIST
 
 include("cmake/HunterGate.cmake")
 HunterGate(
-    URL "https://github.com/ruslo/hunter/archive/v0.19.10.tar.gz"
-    SHA1 "73b5a5253b75d5ed79c89242c167ca1f94386621"
+    URL "https://github.com/ruslo/hunter/archive/v0.19.205.tar.gz"
+    SHA1 "9771566fa6d618202d8447122b3e7951505ed779"
 )
 
 project(gauze VERSION 0.2.1)

From 532816764fc8d5e73b0fff31f179122e55f51c12 Mon Sep 17 00:00:00 2001
From: Ruslan Baratov <ruslan_baratov@yahoo.com>
Date: Wed, 20 Dec 2017 12:55:47 +0300
Subject: [PATCH 3/4] Update CI toolchains

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f733d33..6945f5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,13 +48,13 @@ matrix:
     - os: osx
       env: CONFIG=Release TOOLCHAIN=libcxx
     - os: osx
-      env: CONFIG=Debug TOOLCHAIN=osx-10-11
+      env: CONFIG=Debug TOOLCHAIN=osx-10-12
     - os: osx
-      env: CONFIG=Release TOOLCHAIN=osx-10-11
+      env: CONFIG=Release TOOLCHAIN=osx-10-12
     - os: osx
-      env: CONFIG=Debug TOOLCHAIN=ios-nocodesign-9-3
+      env: CONFIG=Debug TOOLCHAIN=ios-nocodesign-10-3
     - os: osx
-      env: CONFIG=Release TOOLCHAIN=ios-nocodesign-9-3
+      env: CONFIG=Release TOOLCHAIN=ios-nocodesign-10-3
     - os: osx
       env: CONFIG=Debug TOOLCHAIN=android-ndk-r10e-api-19-armeabi-v7a-neon
     - os: osx

From 6b79ed9942bf0f0c3bee88088500fbb235fc1823 Mon Sep 17 00:00:00 2001
From: Ruslan Baratov <ruslan_baratov@yahoo.com>
Date: Wed, 20 Dec 2017 12:59:30 +0300
Subject: [PATCH 4/4] Remove old toolchains

---
 appveyor.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0e1475e..6b142a4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,16 +2,6 @@
 
 environment:
   matrix:
-    - TOOLCHAIN: "vs-10-2010"
-      CONFIG: "Release"
-    - TOOLCHAIN: "vs-10-2010"
-      CONFIG: "Debug"
-
-    - TOOLCHAIN: "vs-11-2012"
-      CONFIG: "Release"
-    - TOOLCHAIN: "vs-11-2012"
-      CONFIG: "Debug"
-
     - TOOLCHAIN: "vs-12-2013-win64"
       CONFIG: "Release"
     - TOOLCHAIN: "vs-12-2013-win64"