Merge branch 'amd-develop' into amd-master

Change-Id: I53d5a8916d769c4f0fe60d2ee3b240551da80b4f
(cherry picked from commit 01c523f6c9)

hipamd/packaging/create_hip_samples_installer.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-function die {
-    echo "${1-Died}." >&2
-    exit 1
-}
-
-payload=$1
-script=$2
-[ "$payload" != "" ] || [ "$script" != "" ] || die "Invalid arguments!"
-tmp=__extract__$RANDOM
-
-printf "#!/bin/bash
-samples_dir=\$1
-[ \"\$samples_dir\" != \"\" ] || read -e -p \"Enter the path to extract the HIP samples: \" samples_dir
-mkdir -p \$samples_dir
-PAYLOAD=\`awk '/^__PAYLOAD_BELOW__/ {print NR + 1; exit 0; }' \$0\`
-tail -n+\$PAYLOAD \$0 | tar -xz -C \$samples_dir
-echo \"HIP samples installed in \$samples_dir\"
-exit 0
-__PAYLOAD_BELOW__\n" > "$tmp"
-
-cat "$tmp" "$payload" > "$script" && rm "$tmp"
-chmod +x "$script"

hipamd/packaging/hip_doc.txt

@@ -1,12 +1,19 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(hip_doc)
 
-add_custom_target(build_doxygen ALL
+find_program(DOXYGEN_EXE doxygen)
+if(DOXYGEN_EXE)
+    add_custom_target(build_doxygen ALL
                   COMMAND HIP_PATH=@hip_SOURCE_DIR@ doxygen @hip_SOURCE_DIR@/docs/doxygen-input/doxy.cfg)
-add_custom_target(convert_md_to_html ALL
+    install(DIRECTORY RuntimeAPI/html DESTINATION docs/docs/RuntimeAPI)
+endif()
+
+find_program(GRIP_EXE grip)
+if(GRIP_EXE)
+    add_custom_target(convert_md_to_html ALL
                   COMMAND @hip_SOURCE_DIR@/packaging/convert_md_to_html.sh @hip_SOURCE_DIR@ ${PROJECT_BINARY_DIR}/md2html)
-install(DIRECTORY RuntimeAPI/html DESTINATION docs/docs/RuntimeAPI)
-install(DIRECTORY md2html/ DESTINATION docs)
+    install(DIRECTORY md2html/ DESTINATION docs)
+endif()
 
 #############################
 # Packaging steps