From 8491cdab7791e0a382464b0ce723448785b008ff Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Thu, 11 Jan 2018 15:31:25 -1000 Subject: [PATCH] Update boo --- hecl/driver/ToolPackage.hpp | 8 +++++--- hecl/extern/boo | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hecl/driver/ToolPackage.hpp b/hecl/driver/ToolPackage.hpp index 10102386a..20001675a 100644 --- a/hecl/driver/ToolPackage.hpp +++ b/hecl/driver/ToolPackage.hpp @@ -53,11 +53,13 @@ class ToolPackage final : public ToolBase CheckFile(childPath); } - /* Directory with 2 components not "Shared" and no nested !world.blend files == General PAK */ + /* Directory with 2 components not "Shared" or macOS app buundle + * and no nested !world.blend files == General PAK */ if (checkGeneral && origSize == m_selectedItems.size()) { auto pathComps = path.getPathComponents(); - if (pathComps.size() == 2 && pathComps[0] != _S("out") && pathComps[1] != _S("Shared")) + if (pathComps.size() == 2 && pathComps[0] != _S("out") && + pathComps[1] != _S("Shared") && pathComps[0].find(".app") == hecl::SystemString::npos) AddSelectedItem(path); } } @@ -172,7 +174,7 @@ public: hecl::Printf(_S("ABOUT TO PACKAGE:\n")); for (auto& item : m_selectedItems) - hecl::Printf(_S("%s\n"), item.getRelativePath().data()); + hecl::Printf(_S(" %s\n"), item.getRelativePath().data()); if (continuePrompt()) { diff --git a/hecl/extern/boo b/hecl/extern/boo index 1a48dd9c4..cbfd4ddad 160000 --- a/hecl/extern/boo +++ b/hecl/extern/boo @@ -1 +1 @@ -Subproject commit 1a48dd9c42cd25030281345831e7cfb2359426bd +Subproject commit cbfd4ddad01181cd128a12fbfca751c3484f4384