Skip to content

Commit

Permalink
Script updates for Documentation changes
Browse files Browse the repository at this point in the history
  • Loading branch information
bjelich committed May 31, 2018
1 parent fb41c12 commit 9885677
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
11 changes: 6 additions & 5 deletions Build/linux/copy_post_build_gui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@ if [ -n "$QT_LIB_DIR" ]; then
cp -d $QT_LIB_DIR/../plugins/platforms/libqxcb.so ../../output/bin/Qt/platforms
fi

pwd
# Copy the documentation files
if [ ! -d "$OUTPUT_DIR/Documentation" ]; then
mkdir $OUTPUT_DIR/Documentation
if [ ! -d "../../output/bin/Documentation" ]; then
mkdir ../../output/bin/Documentation
fi
if [ ! -d "$OUTPUT_DIR/Documentation/html" ]; then
mkdir $OUTPUT_DIR/Documentation/html
if [ ! -d "../../output/bin/Documentation/html" ]; then
mkdir ../../output/bin/Documentation/html
fi
cp -rf ../../../Documentation/build/html $OUTPUT_DIR/Documentation
cp -rf ../../Documentation/build/html ../../output/bin/Documentation

# Copy the GUI launch script.
cp ./RadeonGPUAnalyzerGUI ../../output/bin/
Expand Down
14 changes: 7 additions & 7 deletions Build/prebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,22 @@ fi

CURRENT_DIR=$(pwd)
SCRIPT_DIR=$(dirname "$0")
OUTPUT_CMAKE_DIR="$SCRIPT_DIR/CMake"
OUTPUT_LINUX_DIR="$OUTPUT_CMAKE_DIR/linux"
OUTPUT_DIR="$OUTPUT_LINUX_DIR/$BUILD_TYPE"
OUTPUT_LINUX_DIR="$SCRIPT_DIR/Linux"
OUTPUT_MAKE_DIR="$OUTPUT_LINUX_DIR/Make"
OUTPUT_DIR="$OUTPUT_MAKE_DIR/$BUILD_TYPE"

# Create output folder
if [ ! -d "$OUTPUT_CMAKE_DIR" ]; then
mkdir $OUTPUT_CMAKE_DIR
fi
if [ ! -d "$OUTPUT_LINUX_DIR" ]; then
mkdir $OUTPUT_LINUX_DIR
fi
if [ ! -d "$OUTPUT_MAKE_DIR" ]; then
mkdir $OUTPUT_MAKE_DIR
fi
if [ ! -d "$OUTPUT_DIR" ]; then
mkdir $OUTPUT_DIR
fi

# Call UpdateCommon.py
# Update Common
if [ "$NO_UPDATE" != "TRUE" ]; then
echo ""
echo "Updating Common..."
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ cd to the Build sub-folder, and run:
prebuild.bat --build release (or: debug)

Running the prebuild script will fetch all the dependencies, and generate the solution file for VS 2015.
After successfully running the preuild script, open RGA.sln from Build\CMake\VS2015, and build:
After successfully running the prebuild script, open RGA.sln from Build\windows\VS2015\Release (or Debug), and build:
* RadeonGPUAnalyzerCLI project for the command line exectuable
* RadeonGPUAnalyzerGUI project for the GUI app

Expand Down Expand Up @@ -103,7 +103,7 @@ named "x64" under the RGA executable's directory (for example, D3DCompiler_47.dl

This will fetch all the dependencies, and generate the makefiles.

Then, cd to the auto-generated subfolder Build/CMake/linux and run make.
Then, cd to the auto-generated subfolder Build/Linux/Make/Release (or Debug) and run make.

-=-

Expand Down Expand Up @@ -151,7 +151,7 @@ cd to the Build sub-folder, and run:

This will fetch all the dependencies, and generate the makefiles.

* cd to the auto-generated subfolder Build/CMake/linux and run make.
* cd to the auto-generated subfolder Build/Linux/Make/Release (or Debug) and run make.

-=-

Expand Down

0 comments on commit 9885677

Please sign in to comment.