lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-08 16:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Copy in pythonlibs.zip as part of the build process if it exists

Browse Source
This commit is contained in:
baldurk
2017-02-22 14:53:10 +00:00
parent a41c5db715
commit fd0a9bee70
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdocui/Windows/Dialogs/PythonShell.cs
+10 -1
View File
@@ -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);
}
renderdocui/renderdocui.csproj
+5
View File
@@ -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>