From fd0a9bee7092724f7192ab27be8fa6f0592abf30 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 22 Feb 2017 14:53:10 +0000
Subject: [PATCH] Copy in pythonlibs.zip as part of the build process if it
 exists

---
 renderdocui/Windows/Dialogs/PythonShell.cs | 11 ++++++++++-
 renderdocui/renderdocui.csproj             |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/renderdocui/Windows/Dialogs/PythonShell.cs b/renderdocui/Windows/Dialogs/PythonShell.cs
index 96576b12b..a7e63071a 100644
--- a/renderdocui/Windows/Dialogs/PythonShell.cs
+++ b/renderdocui/Windows/Dialogs/PythonShell.cs
@@ -318,7 +318,8 @@ namespace renderdocui.Windows.Dialogs
             if (!m_LibsLoaded)
             {
                 interactiveOutput.Text = String.Format("!!! pythonlibs.zip not found! Check installation !!!{0}" +
-                    "!!! If building locally, ensure you have compiled python libraries and copied to binary folder: !!!{0}" +
+                    "!!! If building locally, ensure you have compiled python libraries: !!!{0}" +
+                    "!!! Download IronPython-2.7.4 package, run this command and rebuild renderdocui !!!{0}" +
                     "cd renderdocui/3rdparty/ironpython/ && ./compilelibs.sh /path/to/IronPython-2.7.4{0}{0}{1}",
                     Environment.NewLine, interactiveOutput.Text);
             }
@@ -545,6 +546,14 @@ namespace renderdocui.Windows.Dialogs
                                 "# The 'renderdoc' module is available, as the matching namespace in C#\n\n",
                                 IronPython.CurrentVersion.AssemblyFileVersion);
 
+            if (!m_LibsLoaded)
+            {
+                scriptEditor.Text += "# !!! pythonlibs.zip not found! Check installation !!!\n" +
+                    "# !!! If building locally, ensure you have compiled python libraries: !!!\n" +
+                    "# !!! Download IronPython-2.7.4 package, run this command and rebuild renderdocui !!!\n" +
+                    "# cd renderdocui/3rdparty/ironpython/ && ./compilelibs.sh /path/to/IronPython-2.7.4\n\n";
+            }
+
             scriptEditor.Text = scriptEditor.Text.Replace("\n", Environment.NewLine);
         }
 
diff --git a/renderdocui/renderdocui.csproj b/renderdocui/renderdocui.csproj
index c52ca1753..0a98953bf 100644
--- a/renderdocui/renderdocui.csproj
+++ b/renderdocui/renderdocui.csproj
@@ -548,6 +548,11 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="3rdparty\ironpython\pythonlibs.zip" Condition="Exists('3rdparty\ironpython\pythonlibs.zip')">
+      <Link>pythonlibs.zip</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
     <Content Include="3rdparty\ScintillaNET\SciLexer.dll">
       <Link>SciLexer.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>