lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 10:00:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove C# renderdocui UI. Add qrenderdoc to visual studio solution

Browse Source
This commit is contained in:
baldurk
2017-08-14 16:56:47 +01:00
parent c812dfec07
commit 2b01ee78f2
340 changed files with 64 additions and 143630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/dist.sh
+1 -9
View File
@@ -15,9 +15,6 @@ if [ $# -ne 1 ] || [ $1 != "autobuild" ]; then
echo "Have you rebuilt the documentation? (cd docs/ && ./make.sh htmlhelp)"
read;
echo "Have you built the python libraries? (cd renderdocui/3rdparty/ironpython/ && ./compilelibs.sh /path/to/IronPython)"
read;
echo "Have you marked the git commit hash in version info? (./scripts/hash_version.sh)"
read;
@@ -40,9 +37,6 @@ pushd Win32/Release
find * -not -path 'obj*' -exec cp -r --parents '{}' ../../dist/Release32/ \;
popd
cp renderdocui/3rdparty/ironpython/pythonlibs.zip dist/Release64/
cp renderdocui/3rdparty/ironpython/pythonlibs.zip dist/Release32/
# Copy in d3dcompiler from windows kit 8.1
cp /c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/Redist/D3D/x64/d3dcompiler_47.dll dist/Release64/
cp /c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/Redist/D3D/x86/d3dcompiler_47.dll dist/Release32/
@@ -91,10 +85,8 @@ fi
cp -R dist/Release64 dist/ReleasePDBs64
cp -R dist/Release32 dist/ReleasePDBs32
# Remove all pdbs except renderdocui.pdb (which we keep so we can get callstack crashes)
# Remove all pdbs
find dist/Release{32,64}/ -iname '*.pdb' -exec rm '{}' \;
cp dist/ReleasePDBs32/renderdocui.pdb dist/Release32/
cp dist/ReleasePDBs64/renderdocui.pdb dist/Release64/
# Remove any build associated files that might have gotten dumped in the folders
rm -f dist/Release{32,64}/*.{exp,lib,metagen,xml} dist/Release{32,64}/*.vshost.*
scripts/hash_version.sh
-1
View File
@@ -10,5 +10,4 @@ GIT_HASH=`git status > /dev/null 2>&1 && git rev-parse HEAD || echo NO_GIT_COMMI
rm -f ver
sed "s/NO_GIT_COMMIT_HASH_DEFINED/$GIT_HASH/" renderdoc/api/replay/version.h > ver && mv ver renderdoc/api/replay/version.h
sed -b "s/NO_GIT_COMMIT_HASH_DEFINED/$GIT_HASH/" renderdocui/Properties/AssemblyInfo.cs > ver && mv ver renderdocui/Properties/AssemblyInfo.cs
rm -f ver
scripts/installer/Installer32.wxs
+20 -22
View File
@@ -41,16 +41,14 @@
<Directory Id='ProgramFilesFolder' Name='PFiles'>
<Directory Id='INSTALLDIR' Name='RenderDoc'>
<Component Id='RenderDocUI' Guid='0DB375D5-7712-4853-AA75-536DF863C827'>
<File Id='renderdocuiEXE' Name='renderdocui.exe' DiskId='1' Source='dist/Release32/renderdocui.exe' KeyPath='yes'>
<Component Id='QRenderDoc' Guid='0DB375D5-7712-4853-AA75-536DF863C827'>
<File Id='qrenderdocEXE' Name='qrenderdoc.exe' DiskId='1' Source='dist/Release32/qrenderdoc.exe' KeyPath='yes'>
<Shortcut Id="startmenuRenderDoc" Directory="ProgramMenuDir" Name="RenderDoc" WorkingDirectory='INSTALLDIR' Icon="icon.ico" IconIndex="0" Advertise="yes" />
</File>
<File Id='renderdocuiPDB' Name='renderdocui.pdb' DiskId='1' Source='dist/Release32/renderdocui.pdb' />
<File Id='renderdocuiCFG' Name='renderdocui.exe.config' DiskId='1' Source='dist/Release32/renderdocui.exe.config' />
<RegistryValue Root="HKLM" Id="VerbRDC" Action="write"
Key="Software\Classes\RenderDoc.RDCCapture.1\shell\open\command"
Value='"[#renderdocuiEXE]" "%1"'
Value='"[#qrenderdocEXE]" "%1"'
Type="expandable" />
<RegistryValue Root="HKLM" Id="VerbDescRDC" Action="write"
Key="Software\Classes\RenderDoc.RDCCapture.1"
@@ -58,7 +56,7 @@
Type="expandable" />
<RegistryValue Root="HKLM" Id="VerbIconRDC" Action="write"
Key="Software\Classes\RenderDoc.RDCCapture.1\DefaultIcon"
Value='[#renderdocuiEXE]'
Value='[#qrenderdocEXE]'
Type="expandable" />
<RegistryValue Root="HKLM" Id="RDCProgIDCLSID" Action="write"
Key="Software\Classes\RenderDoc.RDCCapture.1\CLSID"
@@ -67,7 +65,7 @@
<RegistryValue Root="HKLM" Id="VerbCAP" Action="write"
Key="Software\Classes\RenderDoc.RDCSettings.1\shell\open\command"
Value='"[#renderdocuiEXE]" "%1"'
Value='"[#qrenderdocEXE]" "%1"'
Type="expandable" />
<RegistryValue Root="HKLM" Id="VerbDescCAP" Action="write"
Key="Software\Classes\RenderDoc.RDCSettings.1"
@@ -75,7 +73,7 @@
Type="expandable" />
<RegistryValue Root="HKLM" Id="VerbIconCAP" Action="write"
Key="Software\Classes\RenderDoc.RDCSettings.1\DefaultIcon"
Value='[#renderdocuiEXE]'
Value='[#qrenderdocEXE]'
Type="expandable" />
</Component>
@@ -166,39 +164,39 @@
<Component Id="ImageOpenWith" Guid="1F56AF06-3E83-4D7E-85A2-6A309A55FF4F">
<RegistryValue Root="HKLM" Id="RDCOpenWithCommand" Action="write" KeyPath='yes'
Key="Software\Classes\Applications\renderdocui.exe\shell\open\command"
Value='"[#renderdocuiEXE]" "%1"'
Key="Software\Classes\Applications\qrenderdoc.exe\shell\open\command"
Value='"[#qrenderdocEXE]" "%1"'
Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithDDS" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.dds' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithHDR" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.hdr' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithJPG" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.jpg' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithJPEG" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.jpeg' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithPNG" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.png' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithEXR" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.exr' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithTGA" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.tga' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithBMP" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.bmp' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithGIF" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.gif' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithPSD" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.psd' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithProgidDDS" Action="write"
@@ -250,7 +248,7 @@
<Feature Id='Complete' Title='RenderDoc' Description='Everything included.' AllowAdvertise='no' Absent='disallow' Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
<Feature Id='MainProgram' Title='Program' Description='The main executable with everything needed to capture and replay.' AllowAdvertise='no' Absent='disallow' Level='1'>
<ComponentRef Id='RenderDocUI' />
<ComponentRef Id='QRenderDoc' />
<ComponentRef Id='RenderDocCPP' />
<ComponentRef Id='RenderDocCMD' />
@@ -293,7 +291,7 @@
<WixVariable Id="WixUIDialogBmp" Value="scripts/installer/dlgbmp.bmp" />
<Icon Id="chm.ico" SourceFile="scripts/installer/chm.ico" />
<Icon Id="icon.ico" SourceFile="renderdocui/Resources/icon.ico" />
<Icon Id="icon.ico" SourceFile="qrenderdoc/Resources/icon.ico" />
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
<Property Id="ARPHELPLINK" Value="http://renderdoc.org/" />
scripts/installer/Installer64.wxs
+20 -22
View File
@@ -31,16 +31,14 @@
<Directory Id='ProgramFiles64Folder' Name='PFiles'>
<Directory Id='INSTALLDIR' Name='RenderDoc'>
<Component Id='RenderDocUI' Win64="yes" Guid='44398F0D-3FE3-470A-A137-BDFDFE82353D'>
<File Id='renderdocuiEXE' Name='renderdocui.exe' DiskId='1' Source='dist/Release64/renderdocui.exe' KeyPath='yes'>
<Component Id='QRenderDoc' Win64="yes" Guid='44398F0D-3FE3-470A-A137-BDFDFE82353D'>
<File Id='qrenderdocEXE' Name='qrenderdoc.exe' DiskId='1' Source='dist/Release64/qrenderdoc.exe' KeyPath='yes'>
<Shortcut Id="startmenuRenderDoc" Directory="ProgramMenuDir" Name="RenderDoc" WorkingDirectory='INSTALLDIR' Icon="icon.ico" IconIndex="0" Advertise="yes" />
</File>
<File Id='renderdocuiPDB' Name='renderdocui.pdb' DiskId='1' Source='dist/Release64/renderdocui.pdb' />
<File Id='renderdocuiCFG' Name='renderdocui.exe.config' DiskId='1' Source='dist/Release64/renderdocui.exe.config' />
<RegistryValue Root="HKLM" Id="VerbRDC" Action="write"
Key="Software\Classes\RenderDoc.RDCCapture.1\shell\open\command"
Value='"[#renderdocuiEXE]" "%1"'
Value='"[#qrenderdocEXE]" "%1"'
Type="expandable" />
<RegistryValue Root="HKLM" Id="VerbDescRDC" Action="write"
Key="Software\Classes\RenderDoc.RDCCapture.1"
@@ -48,7 +46,7 @@
Type="expandable" />
<RegistryValue Root="HKLM" Id="VerbIconRDC" Action="write"
Key="Software\Classes\RenderDoc.RDCCapture.1\DefaultIcon"
Value='[#renderdocuiEXE]'
Value='[#qrenderdocEXE]'
Type="expandable" />
<RegistryValue Root="HKLM" Id="RDCProgIDCLSID" Action="write"
Key="Software\Classes\RenderDoc.RDCCapture.1\CLSID"
@@ -57,7 +55,7 @@
<RegistryValue Root="HKLM" Id="VerbCAP" Action="write"
Key="Software\Classes\RenderDoc.RDCSettings.1\shell\open\command"
Value='"[#renderdocuiEXE]" "%1"'
Value='"[#qrenderdocEXE]" "%1"'
Type="expandable" />
<RegistryValue Root="HKLM" Id="VerbDescCAP" Action="write"
Key="Software\Classes\RenderDoc.RDCSettings.1"
@@ -65,7 +63,7 @@
Type="expandable" />
<RegistryValue Root="HKLM" Id="VerbIconCAP" Action="write"
Key="Software\Classes\RenderDoc.RDCSettings.1\DefaultIcon"
Value='[#renderdocuiEXE]'
Value='[#qrenderdocEXE]'
Type="expandable" />
</Component>
@@ -185,39 +183,39 @@
</Directory>
<Component Id="ImageOpenWith" Guid="BD518767-45FB-412F-86E8-E741AAA48906">
<RegistryValue Root="HKLM" Id="RDCOpenWithCommand" Action="write" KeyPath='yes'
Key="Software\Classes\Applications\renderdocui.exe\shell\open\command"
Value='"[#renderdocuiEXE]" "%1"'
Key="Software\Classes\Applications\qrenderdoc.exe\shell\open\command"
Value='"[#qrenderdocEXE]" "%1"'
Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithDDS" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.dds' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithHDR" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.hdr' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithJPG" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.jpg' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithJPEG" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.jpeg' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithPNG" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.png' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithEXR" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.exr' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithTGA" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.tga' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithBMP" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.bmp' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithGIF" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.gif' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithPSD" Action="write"
Key="Software\Classes\Applications\renderdocui.exe\SupportedTypes"
Key="Software\Classes\Applications\qrenderdoc.exe\SupportedTypes"
Name='.psd' Value='' Type="string" />
<RegistryValue Root="HKLM" Id="RDCOpenWithProgidDDS" Action="write"
Key="Software\Classes\.dds\OpenWithProgids" Name='RenderDoc.RDCCapture.1' Value='' Type="string" />
@@ -268,7 +266,7 @@
<Feature Id='Complete' Title='RenderDoc' Description='Everything included.' AllowAdvertise='no' Absent='disallow' Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
<Feature Id='MainProgram' Title='Program' Description='The main executable with everything needed to capture and replay.' AllowAdvertise='no' Absent='disallow' Level='1'>
<ComponentRef Id='RenderDocUI' />
<ComponentRef Id='QRenderDoc' />
<ComponentRef Id='RenderDocCPP' />
<ComponentRef Id='RenderDocCMD' />
@@ -318,7 +316,7 @@
<WixVariable Id="WixUIDialogBmp" Value="scripts/installer/dlgbmp.bmp" />
<Icon Id="chm.ico" SourceFile="scripts/installer/chm.ico" />
<Icon Id="icon.ico" SourceFile="renderdocui/Resources/icon.ico" />
<Icon Id="icon.ico" SourceFile="qrenderdoc/Resources/icon.ico" />
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
<Property Id="ARPHELPLINK" Value="http://renderdoc.org/" />