Update public version of DevDriverTools to V1.3

Change-Id: If13c8364c86a6aa4d874f9e982a4978b64e25fc7

CMakeLists.txt

@@ -35,8 +35,16 @@ IF (INTERNAL_BUILD)
   add_compile_options(-DRADEON_DRIVER_TOOLS_INTERNAL)
  ENDIF(WIN32)
 ENDIF(INTERNAL_BUILD)
-
-add_definitions(-DGPUOPEN_CLIENT_INTERFACE_MAJOR_VERSION=30)
+
+# Define the switch that RDS/RDP can use if unified driver settings are enabled.
+IF (ENABLE_UNIFIED_DRIVER_SETTINGS)
+  add_definitions(-DENABLE_RADEON_UNIFIED_DRIVER_SETTINGS)
+ENDIF(ENABLE_UNIFIED_DRIVER_SETTINGS)
+
+add_definitions(-DGPUOPEN_CLIENT_INTERFACE_MAJOR_VERSION=35)
+IF (ENABLE_DRIVER_LOGGING)
+  add_definitions(-DENABLE_RADEON_DRIVER_LOGGING)
+ENDIF(ENABLE_DRIVER_LOGGING)
 
 # Add .pdb files to Windows release build
 IF(WIN32)
@@ -47,13 +55,16 @@ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OP
 ENDIF(WIN32)
 
 include_directories(source/DevDriverComponents/inc)
+include_directories(source/DevDriverComponents/inc/imported/rapidjson/include)
 include_directories(source/DevDriverComponents/message/inc)
+include_directories(source/DevDriverComponents/src/imported/metrohash/src)
 IF(WIN32)
 include_directories(source/DevDriverComponents/listener)
 ELSE(WIN32)
 add_subdirectory(source/DevDriverComponents/listener)
 ENDIF(WIN32)
 
+if(CMAKE_CL_64)
 # Add the QtCommon Scaling project to the solution.
 include_directories("${PROJECT_SOURCE_DIR}/../QtCommon/Scaling/")
 add_subdirectory (${PROJECT_SOURCE_DIR}/../QtCommon/Scaling obj/QtCommon/Scaling)
@@ -62,8 +73,13 @@ add_subdirectory (${PROJECT_SOURCE_DIR}/../QtCommon/Scaling obj/QtCommon/Scaling
 include_directories("${PROJECT_SOURCE_DIR}/../QtCommon/Util/")
 add_subdirectory (${PROJECT_SOURCE_DIR}/../QtCommon/Util obj/QtCommon/Util)
 
+# Add the QtCommon QtCustomWidgets project to the solution.
+include_directories("${PROJECT_SOURCE_DIR}/../QtCommon/CustomWidgets/")
+add_subdirectory (${PROJECT_SOURCE_DIR}/../QtCommon/CustomWidgets obj/QtCommon/CustomWidgets)
+
 # Add RDS and RDP projects to solution.
-add_subdirectory(source/DevDriverComponents/src         obj/DevDriverComponents)
 add_subdirectory(source/RDS                             obj/RDS)
 add_subdirectory(source/RDP                             obj/RDP)
+ENDIF(CMAKE_CL_64)
+add_subdirectory(source/DevDriverComponents/src         obj/DevDriverComponents)
 add_subdirectory(source/DevDriverAPI                    obj/DevDriverAPI)

Jenkins/linux/JenkinsConfiguration.sh

@@ -0,0 +1,27 @@
+#!/bin/bash -xl
+
+# create the makefiles and build everything
+cd ../../build/linux
+./prebuild.sh
+./build_release.sh
+
+if [[ `uname` != "Darwin" ]]; then
+    # build the help files
+    sphinxDir="../../docs"
+    pushd $sphinxDir
+    ./make.sh html
+    popd
+
+    # make the destination help directory and move the help files
+    dir="Release/docs/help/rdp"
+    if [ ! -d $dir ]; then
+        mkdir -p $dir
+    fi
+    mv  ../../docs/build/html Release/docs/help/rdp
+fi
+
+mv Release DevDriverTools.$1
+
+# archive it all
+tar cfz DevDriverTools.$1.tgz DevDriverTools.$1
+tar cfz DevDriverAPI.$1.tgz DevDriverTools.$1/DevDriverAPI

Jenkins/win/JenkinsConfigPostBuild.txt

@@ -0,0 +1,21 @@
+// DevDriverTools
+
+// "WORKSPACE" is passed in by the build script from Jenkins
+Define "DEVDRIVERTOOLSPATH" "[WORKSPACE]"
+Define "DEVDRIVERTOOLSBUILD" "[DEVDRIVERTOOLSPATH]\build\win\VS2017"
+
+Always
+   Log "[WORKSPACE]\DevDriverTools_Build.log"
+
+   // Generate zip files
+   Define "ZIPDIR" "[WORKSPACE]\DevDriverTools.[BUILD]"
+   XCopy "[DEVDRIVERTOOLSPATH]\build\win\Release" "[ZIPDIR]\"
+   mkdir "[ZIPDIR]\docs\help"
+   mkdir "[ZIPDIR]\docs\help\rdp"
+   mkdir "[ZIPDIR]\docs\help\rdp\html"
+   XCopy "[WORKSPACE]\docs\build\html" "[ZIPDIR]\docs\help\rdp\html"
+   Zip "[ZIPDIR].zip" "[ZIPDIR]"
+
+   Define "APIZIPDIR" "[WORKSPACE]\DevDriverAPI.[BUILD]"
+   XCopy "[DEVDRIVERTOOLSPATH]\build\win\Release\DevDriverAPI" "[APIZIPDIR]\"
+   Zip "[APIZIPDIR].zip" "[APIZIPDIR]"

Jenkins/win/JenkinsConfiguration.txt

@@ -0,0 +1,21 @@
+// DevDriverTools
+
+// "P4ROOT" is passed in by the build script from Jenkins
+Define "DEVDRIVERTOOLSPATH" "[P4ROOT]"
+Define "DEVDRIVERTOOLSBUILD" "[DEVDRIVERTOOLSPATH]\build\win\VS2017"
+
+Always
+   Log "[P4ROOT]\DevDriverTools_Build.log"
+
+// Build Debug & Release 
+   BuildSln "[DEVDRIVERTOOLSBUILD]\DevDriverTools.sln" "" "Build" "Debug|x64"
+   BuildSln "[DEVDRIVERTOOLSBUILD]\DevDriverTools.sln" "" "Build" "Release|x64"
+
+// SendBuildErrors doesn't actually send an email now - Jenkins does that
+// however we still need to call this to detect if an error condition occured
+   SendBuildErrors "[EMAIL]" "DevDriverTools Build Failed"
+
+// Generate zip files
+   Define "ZIPDIR" "[P4ROOT]\DevDriverTools.[BUILD]"
+   XCopy "[DEVDRIVERTOOLSPATH]\build\win\Release" "[ZIPDIR]\"
+   Zip "[ZIPDIR].zip" "[ZIPDIR]"

Jenkins/win/JenkinsMSBuild.bat

@@ -0,0 +1,21 @@
+set DEVDRIVERTOOLSPATH=%WORKSPACE%
+set DEVDRIVERTOOLSBUILD=%DEVDRIVERTOOLSPATH%\build\win\VS2017
+
+cd %DEVDRIVERTOOLSBUILD%
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsDevCmd.bat"
+REM set the build folder again as VsDevCmd.bat seems to set it to something else
+cd /D %DEVDRIVERTOOLSBUILD%
+
+REM Build Debug|x64 configuration
+msbuild /m:3 /t:Build /p:Configuration=Debug /p:Platform=x64 /p:OutputPath=%DEVDRIVERTOOLSBUILD% /verbosity:minimal DevDriverTools.sln
+if not %ERRORLEVEL%==0 (
+    echo "Build Failed for file DevDriverTools.sln, configuration Debug|x64"
+    exit 1
+)
+
+REM Build Release|x64 configuration
+msbuild /m:3 /t:Build /p:Configuration=Release /p:Platform=x64 /p:OutputPath=%DEVDRIVERTOOLSBUILD% /verbosity:minimal DevDriverTools.sln
+if not %ERRORLEVEL%==0 (
+    echo "Build Failed for file DevDriverTools.sln, configuration Release|x64"
+    exit 1
+)

README.md

@@ -46,12 +46,19 @@ Install cmake using:
 Install chrpath using:
  sudo apt-get install chrpath
 
-Run the configure.sh script (in the build/linux directory).
+Install git:
+ sudo apt-get install git
+
+Run the prebuild.sh script (in the build/linux directory).
 
 $ ./prebuild.sh
 
-This will construct the output folder and build the necessary makefiles. To
-build the release build, use:
+This will construct the output folder and build the necessary makefiles. If you run into errors here,
+other packages may need to be installed:
+ - Python may also need to be installed if it is not already installed with the Linux distribution
+ - mesa-common-dev may be needed for OpenGL headers needed by the Qt installation
+
+To build the release build, use:
 
 $ ./build_release.sh
 

ThirdPartyLicenses.txt

@@ -3,6 +3,33 @@ Third-party licenses, acknowledgements
 
 This software uses the following third-party software:
 
+Qt (under LGPL3):
+--
+Copyright(C) 2016-2017 The Qt Company Ltd.
+
+The LGPL3 license can be found here: https://www.gnu.org/licenses/lgpl-3.0.en.html
+
+The tools in this distribution use Qt components as dynamically linked libraries and
+are not modified in any way. The source code can be provided upon request or by
+visiting the Qt website. Instructions on downloading and building from source can be
+found here: http://wiki.qt.io/Get_the_Source
+
+BSD license:
+------------
+Some code is based on sample code provided in the Qt documentation. This code is covered under the BSD license:
+
+Copyright 2017 The Qt Company Ltd.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 IonIcons:
 ---------
 The MIT License (MIT)
@@ -44,3 +71,90 @@ Copyright (c) 2004-2006 Intel Corporation - All Rights Reserved
 
 This software program is licensed subject to the BSD License,
 available at http://www.opensource.org/licenses/bsd-license.html.
+
+MetroHash:
+----------
+MetroHash is a set of state-of-the-art hash functions for non-cryptographic use cases.
+
+The MIT License (MIT)
+
+Copyright (c) 2015 J. Andrew Rogers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+rapidJSON:
+----------
+Tencent is pleased to support the open source community by making RapidJSON available. 
+
+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All rights reserved.
+
+If you have downloaded a copy of the RapidJSON binary from Tencent, please note that the RapidJSON binary is licensed under the MIT License.
+If you have downloaded a copy of the RapidJSON source code from Tencent, please note that RapidJSON source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms.  Your integration of RapidJSON into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within RapidJSON. To avoid the problematic JSON license in your own projects, it's sufficient to exclude the bin/jsonchecker/ directory, as it's the only code under the JSON license.
+A copy of the MIT License is included in this file.
+
+Other dependencies and licenses:
+
+Open Source Software Licensed Under the BSD License:
+--------------------------------------------------------------------
+
+The msinttypes r29 
+Copyright (c) 2006-2013 Alexander Chemeris 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the name of  copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Open Source Software Licensed Under the JSON License:
+--------------------------------------------------------------------
+
+json.org 
+Copyright (c) 2002 JSON.org
+All Rights Reserved.
+
+JSON_checker
+Copyright (c) 2002 JSON.org
+All Rights Reserved.
+
+
+Terms of the JSON License:
+---------------------------------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Terms of the MIT License:
+--------------------------------------------------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+