mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-05 17:40:39 +00:00
Move scripts/ folder to util/
This commit is contained in:
baldurk
+2
-2
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12)
|
||||
# Configure some stuff that needs to be set really early
|
||||
if(BUILD_ANDROID)
|
||||
set(CMAKE_TOOLCHAIN_FILE
|
||||
"${CMAKE_SOURCE_DIR}/scripts/android.toolchain.cmake"
|
||||
"${CMAKE_SOURCE_DIR}/util/android.toolchain.cmake"
|
||||
CACHE STRING
|
||||
"The Android toolchain file")
|
||||
|
||||
@@ -264,5 +264,5 @@ if(ENABLE_QRENDERDOC OR ENABLE_PYRENDERDOC)
|
||||
endif()
|
||||
|
||||
# install documentation files
|
||||
install (FILES scripts/LINUX_DIST_README DESTINATION share/doc/renderdoc RENAME README)
|
||||
install (FILES util/LINUX_DIST_README DESTINATION share/doc/renderdoc RENAME README)
|
||||
install (FILES LICENSE.md DESTINATION share/doc/renderdoc)
|
||||
|
||||
+12
-13
@@ -90,7 +90,7 @@ To make things easier for everyone, I've adopted clang-format for keeping code c
|
||||
| :warning: | **I have fixed the version used for RenderDoc at [clang-format-3.8](http://releases.llvm.org/download.html#3.8.1).** | :warning: |
|
||||
| :warning: | **This formatting is enforced by CI checks that run on PRs, so if you aren't running the same version locally it will show up there.** | :warning: |
|
||||
|
||||
If you want to format a single file, run: `clang-format -i file.cpp`. If you want to format any changes you make before you commit them, you'll need python installed and then run: `git clang-format`. To clang-format the whole codebase, you can run the bash script `scripts/clang_format_all.sh` but be sure to squash any changes into the right commits.
|
||||
If you want to format a single file, run: `clang-format -i file.cpp`. If you want to format any changes you make before you commit them, you'll need python installed and then run: `git clang-format`. To clang-format the whole codebase, you can run the bash script `util/clang_format_all.sh` but be sure to squash any changes into the right commits.
|
||||
|
||||
There are instructions on how to set up git hooks or IDE integration [on the wiki](https://github.com/baldurk/renderdoc/wiki/Code-formatting-(using-clang-format)).
|
||||
|
||||
@@ -247,7 +247,7 @@ sudo apt-get install openjdk-8-jdk
|
||||
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
|
||||
```
|
||||
|
||||
The Android SDK and NDK can be set up with the following steps. They are also mirrored in our Travis-CI [setup script](scripts/travis/android_setup.sh) for Android. We are currently targeting build-tools 26.0.1 and NDK r14b.
|
||||
The Android SDK and NDK can be set up with the following steps. They are also mirrored in our Travis-CI [setup script](util/travis/android_setup.sh) for Android. We are currently targeting build-tools 26.0.1 and NDK r14b.
|
||||
|
||||
SDK links are pulled from [here](https://developer.android.com/studio/index.html).
|
||||
|
||||
@@ -308,18 +308,17 @@ If you have a change you'd like to see make it into mainline, create a fork of r
|
||||
There are [several pages](https://github.com/baldurk/renderdoc/wiki/Code-Dives) on the wiki explaining different aspects of how the code fits together - like how the capture-side works vs replay-side, how shader debugging works, etc.
|
||||
|
||||
renderdoc/
|
||||
CMakeLists.txt ; The cmake file, will recurse into subdirectories to build them
|
||||
renderdoc.sln ; VS2015 solution for windows building
|
||||
CMakeLists.txt ; The cmake file, will recurse into subdirectories to build them
|
||||
renderdoc.sln ; VS2015 solution for windows building
|
||||
renderdoc/
|
||||
3rdparty/ ; third party utilities & libraries included
|
||||
drivers/ ; API-specific back-ends, can be individually skipped/removed
|
||||
... ; everything else in here consists of the core renderdoc runtime
|
||||
renderdoccmd/ ; A small C++ utility program that runs to do various little tasks
|
||||
renderdocshim/ ; A tiny C DLL using only kernel32.dll that is used for global hooking
|
||||
qrenderdoc/ ; The Qt UI layer built on top of renderdoc/
|
||||
docs/ ; source documentation for the .chm file or http://docs.renderdoc.org/
|
||||
; in the Sandcastle help file builder
|
||||
scripts/ ; folder for small scripts - e.g. for CI, installers, distribution
|
||||
3rdparty/ ; third party utilities & libraries included
|
||||
drivers/ ; API-specific back-ends, can be individually skipped/removed
|
||||
... ; everything else in here consists of the core renderdoc runtime
|
||||
renderdoccmd/ ; A small C++ utility program that runs to do various little tasks
|
||||
renderdocshim/ ; A tiny C DLL using only kernel32.dll that is used for global hooking
|
||||
qrenderdoc/ ; The Qt UI layer built on top of renderdoc/
|
||||
docs/ ; source documentation for the .chm file or http://docs.renderdoc.org/
|
||||
util/ ; folder for utility/support files - e.g. build scripts, installers, CI config
|
||||
|
||||
# Testing
|
||||
|
||||
|
||||
@@ -136,7 +136,7 @@ win32 {
|
||||
ICON = $$OSX_ICONFILE
|
||||
|
||||
INFO_PLIST_PATH = $$shell_quote($$DESTDIR/$${TARGET}.app/Contents/Info.plist)
|
||||
QMAKE_POST_LINK += $$_PRO_FILE_PWD_/../scripts/set_plist_version.sh $${RENDERDOC_VERSION}.0 $${INFO_PLIST_PATH}
|
||||
QMAKE_POST_LINK += $$_PRO_FILE_PWD_/../util/set_plist_version.sh $${RENDERDOC_VERSION}.0 $${INFO_PLIST_PATH}
|
||||
} else {
|
||||
QT += x11extras
|
||||
DEFINES += RENDERDOC_PLATFORM_POSIX RENDERDOC_PLATFORM_LINUX RENDERDOC_WINDOWING_XLIB RENDERDOC_WINDOWING_XCB
|
||||
|
||||
@@ -4,7 +4,7 @@ AUTOBUILD=1
|
||||
|
||||
if [ ! -f LICENSE.md ]; then
|
||||
echo "This script should be run from the root of the checkout.";
|
||||
echo "e.g. ./scripts/dist.sh";
|
||||
echo "e.g. ./util/dist.sh";
|
||||
exit;
|
||||
fi
|
||||
|
||||
@@ -104,10 +104,10 @@ VERSION=`grep -E "#define RENDERDOC_VERSION_(MAJOR|MINOR)" renderdoc/api/replay/
|
||||
|
||||
export RENDERDOC_VERSION="${VERSION}"
|
||||
|
||||
"$WIX/bin/candle.exe" -o dist/Installer32.wixobj scripts/installer/Installer32.wxs
|
||||
"$WIX/bin/light.exe" -ext WixUIExtension -sw1076 -loc scripts/installer/customtext.wxl -o dist/Installer32.msi dist/Installer32.wixobj
|
||||
"$WIX/bin/candle.exe" -o dist/Installer32.wixobj util/installer/Installer32.wxs
|
||||
"$WIX/bin/light.exe" -ext WixUIExtension -sw1076 -loc util/installer/customtext.wxl -o dist/Installer32.msi dist/Installer32.wixobj
|
||||
|
||||
"$WIX/bin/candle.exe" -o dist/Installer64.wixobj scripts/installer/Installer64.wxs
|
||||
"$WIX/bin/light.exe" -ext WixUIExtension -sw1076 -loc scripts/installer/customtext.wxl -o dist/Installer64.msi dist/Installer64.wixobj
|
||||
"$WIX/bin/candle.exe" -o dist/Installer64.wixobj util/installer/Installer64.wxs
|
||||
"$WIX/bin/light.exe" -ext WixUIExtension -sw1076 -loc util/installer/customtext.wxl -o dist/Installer64.msi dist/Installer64.wixobj
|
||||
|
||||
rm dist/*.wixobj dist/*.wixpdb
|
||||
@@ -109,7 +109,7 @@
|
||||
</Component>
|
||||
|
||||
<Component Id='LICENSE' Guid='107AD4E6-D64F-4284-A1F6-D8AAAA6CFC42'>
|
||||
<File Id='LICENSE' Name='LICENSE.rtf' DiskId='1' Source='scripts/installer/LICENSE.rtf' KeyPath='yes' />
|
||||
<File Id='LICENSE' Name='LICENSE.rtf' DiskId='1' Source='util/installer/LICENSE.rtf' KeyPath='yes' />
|
||||
</Component>
|
||||
|
||||
<Component Id='RenderDocCMD' Guid='97338A5D-8FDB-4DF5-AEC7-14B36F234F29'>
|
||||
@@ -348,12 +348,12 @@
|
||||
<UIRef Id="WixUI_Mondo" />
|
||||
<UIRef Id="WixUI_ErrorProgressText" />
|
||||
|
||||
<WixVariable Id="WixUILicenseRtf" Value="scripts/installer/LICENSE.rtf" />
|
||||
<WixVariable Id="WixUILicenseRtf" Value="util/installer/LICENSE.rtf" />
|
||||
|
||||
<WixVariable Id="WixUIBannerBmp" Value="scripts/installer/bannrbmp.bmp" />
|
||||
<WixVariable Id="WixUIDialogBmp" Value="scripts/installer/dlgbmp.bmp" />
|
||||
<WixVariable Id="WixUIBannerBmp" Value="util/installer/bannrbmp.bmp" />
|
||||
<WixVariable Id="WixUIDialogBmp" Value="util/installer/dlgbmp.bmp" />
|
||||
|
||||
<Icon Id="chm.ico" SourceFile="scripts/installer/chm.ico" />
|
||||
<Icon Id="chm.ico" SourceFile="util/installer/chm.ico" />
|
||||
<Icon Id="icon.ico" SourceFile="qrenderdoc/Resources/icon.ico" />
|
||||
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
|
||||
<Property Id="ARPHELPLINK" Value="http://renderdoc.org/" />
|
||||
@@ -98,7 +98,7 @@
|
||||
</Component>
|
||||
|
||||
<Component Id='LICENSE' Win64="yes" Guid='71534ACB-DF6B-4956-A14C-566925D77AB0'>
|
||||
<File Id='LICENSE' Name='LICENSE.rtf' DiskId='1' Source='scripts/installer/LICENSE.rtf' KeyPath='yes' />
|
||||
<File Id='LICENSE' Name='LICENSE.rtf' DiskId='1' Source='util/installer/LICENSE.rtf' KeyPath='yes' />
|
||||
</Component>
|
||||
|
||||
<Component Id='RenderDocCMD' Win64="yes" Guid='3443061F-2B11-4661-8535-4319D97B375C'>
|
||||
@@ -373,12 +373,12 @@
|
||||
<UIRef Id="WixUI_Mondo" />
|
||||
<UIRef Id="WixUI_ErrorProgressText" />
|
||||
|
||||
<WixVariable Id="WixUILicenseRtf" Value="scripts/installer/LICENSE.rtf" />
|
||||
<WixVariable Id="WixUILicenseRtf" Value="util/installer/LICENSE.rtf" />
|
||||
|
||||
<WixVariable Id="WixUIBannerBmp" Value="scripts/installer/bannrbmp.bmp" />
|
||||
<WixVariable Id="WixUIDialogBmp" Value="scripts/installer/dlgbmp.bmp" />
|
||||
<WixVariable Id="WixUIBannerBmp" Value="util/installer/bannrbmp.bmp" />
|
||||
<WixVariable Id="WixUIDialogBmp" Value="util/installer/dlgbmp.bmp" />
|
||||
|
||||
<Icon Id="chm.ico" SourceFile="scripts/installer/chm.ico" />
|
||||
<Icon Id="chm.ico" SourceFile="util/installer/chm.ico" />
|
||||
<Icon Id="icon.ico" SourceFile="qrenderdoc/Resources/icon.ico" />
|
||||
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
|
||||
<Property Id="ARPHELPLINK" Value="http://renderdoc.org/" />
|
||||
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 7.1 KiB |
@@ -2,7 +2,7 @@ if [[ "$DOCS_BUILD" == "1" ]]; then
|
||||
|
||||
echo "== Compiling documentation build.";
|
||||
|
||||
. ./scripts/travis/docs_compile.sh;
|
||||
. ./util/travis/docs_compile.sh;
|
||||
|
||||
else
|
||||
|
||||
@@ -12,11 +12,11 @@ else
|
||||
|
||||
if [[ "$LINUX_BUILD" == "1" ]]; then
|
||||
|
||||
. ./scripts/travis/linux_compile.sh;
|
||||
. ./util/travis/linux_compile.sh;
|
||||
|
||||
elif [[ "$ANDROID_BUILD" == "1" ]]; then
|
||||
|
||||
. ./scripts/travis/android_compile.sh;
|
||||
. ./util/travis/android_compile.sh;
|
||||
|
||||
else
|
||||
|
||||
@@ -29,7 +29,7 @@ else
|
||||
|
||||
if [[ "$APPLE_BUILD" == "1" ]]; then
|
||||
|
||||
. ./scripts/travis/osx_compile.sh
|
||||
. ./util/travis/osx_compile.sh
|
||||
|
||||
else
|
||||
|
||||
@@ -32,7 +32,7 @@ fi
|
||||
# check formatting matches clang-format-3.8. Since newer versions can have
|
||||
# changes in formatting even without any rule changes, we have to fix on a
|
||||
# single version.
|
||||
. ./scripts/clang_format_all.sh
|
||||
. ./util/clang_format_all.sh
|
||||
|
||||
git clean -f
|
||||
|
||||
@@ -2,7 +2,7 @@ if [[ "$DOCS_BUILD" == "1" ]]; then
|
||||
|
||||
echo "== Setting up documentation build.";
|
||||
|
||||
. ./scripts/travis/docs_setup.sh;
|
||||
. ./util/travis/docs_setup.sh;
|
||||
|
||||
else
|
||||
|
||||
@@ -12,11 +12,11 @@ else
|
||||
|
||||
if [[ "$LINUX_BUILD" == "1" ]]; then
|
||||
|
||||
. ./scripts/travis/linux_setup.sh;
|
||||
. ./util/travis/linux_setup.sh;
|
||||
|
||||
elif [[ "$ANDROID_BUILD" == "1" ]]; then
|
||||
|
||||
. ./scripts/travis/android_setup.sh;
|
||||
. ./util/travis/android_setup.sh;
|
||||
|
||||
else
|
||||
|
||||
@@ -29,7 +29,7 @@ else
|
||||
|
||||
if [[ "$APPLE_BUILD" == "1" ]]; then
|
||||
|
||||
. ./scripts/travis/osx_setup.sh
|
||||
. ./util/travis/osx_setup.sh
|
||||
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user