Windows packaging - Added support to package additional drivers (Xilinx#4087)

Work done
---------
+ Added options -xclmgmt2 and -xocluser2 to support packaging version 2
of the drivers.
+ Updated help for these options
+ Updated CMake to package these additional drivers
+ Update WIX to create an unique entry for these driver

Co-authored-by: Stephen Rozum <[email protected]>

Author: rozumx

build/build.bat

@@ -66,6 +66,8 @@ ECHO   [-package]               - Packages the release build to a MSI archive.
 ECHO                              Note: Depends on the WIX application. 
 ECHO   [-xclmgmt arg]           - The directory to the xclmgmt drivers (used with packaging)
 ECHO   [-xocluser arg]          - The directory to the xocluser drivers (used with packaging)
+ECHO   [-xclmgmt2 arg]          - The directory to the xclmgmt2 drivers (used with packaging)
+ECHO   [-xocluser2 arg]         - The directory to the xocluser2 drivers (used with packaging)
 GOTO:EOF
 
 REM --------------------------------------------------------------------------
@@ -110,7 +112,9 @@ PUSHD WRelease
 ECHO MSVC Compile Parallel Jobs: %LOCAL_MSVC_PARALLEL_JOBS%
 
 SET XCLMGMT_DRIVER=""
+SET XCLMGMT2_DRIVER=""
 SET XOCLUSER_DRIVER=""
+SET XOCLUSER2_DRIVER=""
 SET CREATE_PACKAGE=false
 
 REM Evaluate the additional options
@@ -131,13 +135,28 @@ IF "%1" == "-xclmgmt" (
   GOTO:shift_loop_release
 )
 
+IF "%1" == "-xclmgmt2" (
+  SET XCLMGMT2_DRIVER="%2"
+  SHIFT
+  SHIFT
+  GOTO:shift_loop_release
+)
+
+
 IF "%1" == "-xocluser" (
   SET XOCLUSER_DRIVER="%2"
   SHIFT
   SHIFT
   GOTO:shift_loop_release
 )
 
+IF "%1" == "-xocluser2" (
+  SET XOCLUSER2_DRIVER="%2"
+  SHIFT
+  SHIFT
+  GOTO:shift_loop_release
+)
+
 REM Unknown option 
 IF NOT "%1" == "" (
   POPD
@@ -146,14 +165,22 @@ IF NOT "%1" == "" (
 )
 
 IF NOT "%XCLMGMT_DRIVER%" == "" (
-  ECHO XclMgmt  Driver Directory: %XCLMGMT_DRIVER%
+  ECHO Packaging xclbmgmt driver directory: %XCLMGMT_DRIVER%
+)
+
+IF NOT "%XCLMGMT2_DRIVER%" == "" (
+  ECHO Packaging xclbmgmt2 driver directory: %XCLMGMT2_DRIVER%
 )
 
 IF NOT "%XOCLUSER_DRIVER%" == "" (
-  ECHO XoclUser Driver Directory: %XOCLUSER_DRIVER%
+  ECHO Packaging xocluser directory: %XOCLUSER_DRIVER%
+)
+
+IF NOT "%XOCLUSER2_DRIVER%" == "" (
+  ECHO Packaging xocluser2 directory: %XOCLUSER2_DRIVER%
 )
 
-cmake -G "Visual Studio 15 2017 Win64"  -DXCL_MGMT=%XCLMGMT_DRIVER% -DXOCL_USER=%XOCLUSER_DRIVER% -DMSVC_PARALLEL_JOBS=%LOCAL_MSVC_PARALLEL_JOBS% -DKHRONOS=%KHRONOS% -DBOOST_ROOT=%BOOST% -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ../../src
+cmake -G "Visual Studio 15 2017 Win64"  -DXCL_MGMT=%XCLMGMT_DRIVER% -DXOCL_USER=%XOCLUSER_DRIVER% -DXCL_MGMT2=%XCLMGMT2_DRIVER% -DXOCL_USER2=%XOCLUSER2_DRIVER% -DMSVC_PARALLEL_JOBS=%LOCAL_MSVC_PARALLEL_JOBS% -DKHRONOS=%KHRONOS% -DBOOST_ROOT=%BOOST% -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ../../src
 IF errorlevel 1 (POPD & exit /B %errorlevel%)
 
 cmake --build . --verbose --config Release

src/CMake/cpackWin.cmake

@@ -103,14 +103,35 @@ if (DEFINED XCL_MGMT)
 
     cpack_add_component(xcl_mgmt_driver
       DISPLAY_NAME "XclMgmt Driver"
-      DESCRIPTION "XCL Managment driver"
+      DESCRIPTION "XCL Managment Driver"
       GROUP DRIVERS
       ENABLED
       REQUIRED
     )
   ENDIF(NOT XCL_MGMT STREQUAL "")
 ENDIF(DEFINED XCL_MGMT)
 
+# -- XCL Managment2 Driver --
+if (DEFINED XCL_MGMT2)
+  if (NOT XCL_MGMT2 STREQUAL "")
+    file(GLOB XCL_MGMT2_DRIVER 
+      "${XCL_MGMT2}/*"
+      )
+      install(FILES ${XCL_MGMT2_DRIVER}
+            DESTINATION xrt/drivers/xcl_mgmt2
+            COMPONENT xcl_mgmt2_driver)
+
+    cpack_add_component(xcl_mgmt2_driver
+      DISPLAY_NAME "XclMgmt2 Driver"
+      DESCRIPTION "XCL Managment2 Driver"
+      GROUP DRIVERS
+      ENABLED
+      REQUIRED
+    )
+  ENDIF(NOT XCL_MGMT2 STREQUAL "")
+ENDIF(DEFINED XCL_MGMT2)
+
+
 # -- Xocl User Driver --
 if (DEFINED XOCL_USER)
   if (NOT XOCL_USER STREQUAL "")
@@ -131,6 +152,26 @@ if (DEFINED XOCL_USER)
   ENDIF(NOT XOCL_USER STREQUAL "")
 ENDIF(DEFINED XOCL_USER)
 
+# -- Xocl User2 Driver --
+if (DEFINED XOCL_USER2)
+  if (NOT XOCL_USER2 STREQUAL "")
+    file(GLOB XOCL_USER2_DRIVER 
+      "${XOCL_USER2}/*"
+      )
+      install(FILES ${XOCL_USER2_DRIVER}
+            DESTINATION xrt/drivers/xocl_user2
+            COMPONENT xocl_user2_driver)
+
+    cpack_add_component(xocl_user2_driver
+      DISPLAY_NAME "XoclUser2 Driver"
+      DESCRIPTION "XoclUser2 Driver"
+      GROUP DRIVERS
+      ENABLED
+      REQUIRED
+    )
+  ENDIF(NOT XOCL_USER2 STREQUAL "")
+ENDIF(DEFINED XOCL_USER2)
+
 
 # -- Drivers group --
 cpack_add_component_group(DRIVERS