Set install folder to rocprof-sys rather than rocprofsys.

- For better consistency with file names.
- Differential between "PROJECT_NAME:(rocprofsys): and "PACKAGE_NAME:(rocprof-sys)"
- Fix install path the user-api header, they were still installing to `omnitrace`.

.github/workflows/release.yml

@@ -28,12 +28,12 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y cmake
-          cmake -D OUTPUT_DIR=${PWD} -P scripts/write-omnitrace-install.cmake
+          cmake -D OUTPUT_DIR=${PWD} -P scripts/write-rocprofsys-install.cmake
       - name: Generate Release
         uses: softprops/action-gh-release@v1
         with:
           draft: False
           generate_release_notes: True
           fail_on_unmatched_files: True
           files: |
-            omnitrace-install.py
+            rocprof-sys-install.py

CMakeLists.txt

@@ -27,6 +27,9 @@ project(
     DESCRIPTION "CPU/GPU Application tracing with static/dynamic binary instrumentation"
     HOMEPAGE_URL "https://github.com/ROCm/rocprofiler-systems")
 
+set(PACKAGE_NAME "rocprof-sys")
+set(PACKAGE_NAME_UNDERSCORE "rocprof_sys")
+
 find_package(Git)
 
 if(Git_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
@@ -371,28 +374,28 @@ endif()
 
 configure_file(
     ${PROJECT_SOURCE_DIR}/perfetto.cfg
-    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/perfetto.cfg
+    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}/perfetto.cfg
     COPYONLY)
 
 configure_file(
     ${PROJECT_SOURCE_DIR}/cmake/Templates/setup-env.sh.in
-    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/setup-env.sh @ONLY)
+    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}/setup-env.sh @ONLY)
 
 configure_file(
     ${PROJECT_SOURCE_DIR}/cmake/Templates/modulefile.in
-    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PROJECT_NAME}/${OMNITRACE_VERSION}
+    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PACKAGE_NAME}/${OMNITRACE_VERSION}
     @ONLY)
 
 install(
-    FILES ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/setup-env.sh
-          ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/perfetto.cfg
-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}
+    FILES ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}/setup-env.sh
+          ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}/perfetto.cfg
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}
     COMPONENT setup)
 
 install(
     FILES
-        ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PROJECT_NAME}/${OMNITRACE_VERSION}
-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PROJECT_NAME}
+        ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PACKAGE_NAME}/${OMNITRACE_VERSION}
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PACKAGE_NAME}
     COMPONENT setup)
 
 install(

cmake/ConfigInstall.cmake

@@ -9,7 +9,7 @@ install(
     EXPORT rocprofsys-library-targets
     FILE rocprofsys-library-targets.cmake
     NAMESPACE rocprofsys::
-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/rocprofsys)
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PACKAGE_NAME})
 
 # ------------------------------------------------------------------------------#
 # install tree
@@ -21,24 +21,24 @@ set(PROJECT_BUILD_TARGETS user)
 
 configure_package_config_file(
     ${PROJECT_SOURCE_DIR}/cmake/Templates/${PROJECT_NAME}-config.cmake.in
-    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake
-    INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/rocprofsys
+    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PACKAGE_NAME}/${PROJECT_NAME}-config.cmake
+    INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PACKAGE_NAME}
     INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}
     PATH_VARS PROJECT_INSTALL_DIR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR)
 
 write_basic_package_version_file(
-    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-version.cmake
+    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PACKAGE_NAME}/${PROJECT_NAME}-version.cmake
     VERSION ${PROJECT_VERSION}
     COMPATIBILITY SameMinorVersion)
 
 install(
     FILES
-        ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake
-        ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-version.cmake
-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}
+        ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PACKAGE_NAME}/${PROJECT_NAME}-config.cmake
+        ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PACKAGE_NAME}/${PROJECT_NAME}-version.cmake
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PACKAGE_NAME}
     OPTIONAL)
 
-export(PACKAGE ${PROJECT_NAME})
+export(PACKAGE ${PACKAGE_NAME})
 
 # ------------------------------------------------------------------------------#
 # install the validate-causal-json python script as a utility
@@ -54,7 +54,7 @@ install(PROGRAMS ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/rocprof-sys-causa
 # build tree
 #
 set(_BUILDTREE_EXPORT_DIR
-    "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/rocprofsys")
+    "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PACKAGE_NAME}")
 
 if(NOT EXISTS "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
     file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")

cmake/PAPI.cmake

@@ -266,7 +266,7 @@ omnitrace_target_compile_definitions(
 
 install(
     DIRECTORY ${OMNITRACE_PAPI_INSTALL_DIR}/lib/
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofsys
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PACKAGE_NAME}
     COMPONENT papi
     FILES_MATCHING
     PATTERN "*.so*")
@@ -289,7 +289,7 @@ foreach(
     papi_version
     papi_xml_event_info)
 
-    string(REPLACE "_" "-" _UTIL_EXE_INSTALL_NAME "rocprofsys-${_UTIL_EXE}")
+    string(REPLACE "_" "-" _UTIL_EXE_INSTALL_NAME "rocprof-sys-${_UTIL_EXE}")
 
     # RPM installer on RedHat/RockyLinux throws error that #!/usr/bin/python should either
     # be #!/usr/bin/python2 or #!/usr/bin/python3

cmake/Packages.cmake

@@ -354,16 +354,16 @@ if(OMNITRACE_BUILD_DYNINST)
         if(TARGET ${_LIB})
             install(
                 TARGETS ${_LIB}
-                DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofsys
+                DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PACKAGE_NAME}
                 COMPONENT dyninst
-                PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofsys/dyninst)
+                PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_NAME}/dyninst)
         endif()
     endforeach()
 
     # for packaging
     install(
         DIRECTORY ${DYNINST_TPL_STAGING_PREFIX}/lib/
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofsys
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PACKAGE_NAME}
         COMPONENT dyninst
         FILES_MATCHING
         PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
@@ -673,12 +673,12 @@ add_subdirectory(external/timemory EXCLUDE_FROM_ALL)
 
 install(
     TARGETS gotcha
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofsys
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PACKAGE_NAME}
     COMPONENT gotcha)
 if(OMNITRACE_BUILD_LIBUNWIND)
     install(
         DIRECTORY ${PROJECT_BINARY_DIR}/external/timemory/external/libunwind/install/lib/
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofsys
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PACKAGE_NAME}
         COMPONENT libunwind
         FILES_MATCHING
         PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}*")

cmake/Perfetto.cmake

@@ -166,16 +166,16 @@ if(OMNITRACE_INSTALL_PERFETTO_TOOLS)
 
     install(
         DIRECTORY ${OMNITRACE_PERFETTO_INSTALL_DIR}/
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofsys
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PACKAGE_NAME}
         COMPONENT perfetto
         FILES_MATCHING
         PATTERN "*libperfetto.so*")
 
     foreach(_FILE perfetto traced tracebox traced_probes traced_perf trigger_perfetto)
         if("${_FILE}" STREQUAL "perfetto")
-            string(REPLACE "_" "-" _INSTALL_FILE "rocprofsys-${_FILE}")
+            string(REPLACE "_" "-" _INSTALL_FILE "rocprof-sys-${_FILE}")
         else()
-            string(REPLACE "_" "-" _INSTALL_FILE "rocprofsys-perfetto-${_FILE}")
+            string(REPLACE "_" "-" _INSTALL_FILE "rocprof-sys-perfetto-${_FILE}")
         endif()
         install(
             PROGRAMS ${OMNITRACE_PERFETTO_INSTALL_DIR}/${_FILE}

cmake/Templates/args.gn.in

@@ -25,4 +25,4 @@ enable_perfetto_ui = false
 
 extra_cflags = "@OMNITRACE_PERFETTO_C_FLAGS@"
 extra_cxxflags = "@OMNITRACE_PERFETTO_CXX_FLAGS@"
-extra_ldflags = "@OMNITRACE_PERFETTO_LINK_FLAGS@ -Wl,-rpath=\\\$ORIGIN:\\\$ORIGIN/../lib:\\\$ORIGIN/../lib/rocprofsys"
+extra_ldflags = "@OMNITRACE_PERFETTO_LINK_FLAGS@ -Wl,-rpath=\\\$ORIGIN:\\\$ORIGIN/../lib:\\\$ORIGIN/../lib/rocprof-sys"

cmake/Templates/modulefile.in

@@ -1,19 +1,19 @@
 #%Module1.0
 
-module-whatis "@PROJECT_NAME@ (version @PROJECT_VERSION@)"
+module-whatis "@PACKAGE_NAME@ (version @PROJECT_VERSION@)"
 
 proc ModulesHelp { } {
-puts stderr "Loads @PROJECT_NAME@ v@PROJECT_VERSION@"
+puts stderr "Loads @PACKAGE_NAME@ v@PROJECT_VERSION@"
 }
 
 set ROOT [file normalize [file dirname [file normalize ${ModulesCurrentModulefile}]]/../../..]
 
-setenv @PROJECT_NAME@_ROOT "${ROOT}"
+setenv @PACKAGE_NAME_UNDERSCORE@_ROOT "${ROOT}"
 prepend-path CMAKE_PREFIX_PATH "${ROOT}"
 prepend-path PATH "${ROOT}/bin"
 prepend-path LD_LIBRARY_PATH "${ROOT}/@CMAKE_INSTALL_LIBDIR@"
 prepend-path PYTHONPATH "${ROOT}/@CMAKE_INSTALL_PYTHONDIR@"
-setenv @PROJECT_NAME@_DIR "${ROOT}/@CMAKE_INSTALL_DATAROOTDIR@/cmake/@PROJECT_NAME@"
+setenv @PACKAGE_NAME_UNDERSCORE@_DIR "${ROOT}/@CMAKE_INSTALL_DATAROOTDIR@/cmake/@PACKAGE_NAME@"
 
 # @OMNITRACE_HSA_ENV@setenv HSA_TOOLS_LIB "${ROOT}/@CMAKE_INSTALL_LIBDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@rocprof-sys@CMAKE_SHARED_LIBRARY_SUFFIX@"
 # @OMNITRACE_HSA_ENV@setenv HSA_TOOLS_REPORT_LOAD_FAILURE 1

cmake/Templates/setup-env.sh.in

@@ -13,24 +13,24 @@ if [ ! -d "${BASEDIR}" ]; then
     return 1
 fi
 
-@PROJECT_NAME@_ROOT=${BASEDIR}
+@PACKAGE_NAME_UNDERSCORE@_ROOT=${BASEDIR}
 PATH=${BASEDIR}/bin:${PATH}
 LD_LIBRARY_PATH=${BASEDIR}/@CMAKE_INSTALL_LIBDIR@:${LD_LIBRARY_PATH}
 PYTHONPATH=${BASEDIR}/@CMAKE_INSTALL_PYTHONDIR@:${PYTHONPATH}
 CMAKE_PREFIX_PATH=${BASEDIR}:${CMAKE_PREFIX_PATH}
-@PROJECT_NAME@_DIR=${BASEDIR}/@CMAKE_INSTALL_DATAROOTDIR@/cmake/@PROJECT_NAME@
+@PACKAGE_NAME_UNDERSCORE@_DIR=${BASEDIR}/@CMAKE_INSTALL_DATAROOTDIR@/cmake/@PACKAGE_NAME@
 
-export @PROJECT_NAME@_ROOT
+export @PACKAGE_NAME_UNDERSCORE@_ROOT
 export PATH
 export LD_LIBRARY_PATH
 export PYTHONPATH
 export CMAKE_PREFIX_PATH
-export @PROJECT_NAME@_DIR
+export @PACKAGE_NAME_UNDERSCORE@_DIR
 
 # ROCm environment variables
-# @OMNITRACE_HSA_ENV@HSA_TOOLS_LIB="${BASEDIR}/@CMAKE_INSTALL_LIBDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@omnitrace-dl@CMAKE_SHARED_LIBRARY_SUFFIX@"
+# @OMNITRACE_HSA_ENV@HSA_TOOLS_LIB="${BASEDIR}/@CMAKE_INSTALL_LIBDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@rocprof-sys-dl@CMAKE_SHARED_LIBRARY_SUFFIX@"
 # @OMNITRACE_HSA_ENV@HSA_TOOLS_REPORT_LOAD_FAILURE=1
-# @OMNITRACE_ROCP_ENV@ROCP_TOOL_LIB="${BASEDIR}/@CMAKE_INSTALL_LIBDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@omnitrace@CMAKE_SHARED_LIBRARY_SUFFIX@"
+# @OMNITRACE_ROCP_ENV@ROCP_TOOL_LIB="${BASEDIR}/@CMAKE_INSTALL_LIBDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@rocprof-sys@CMAKE_SHARED_LIBRARY_SUFFIX@"
 
 # @OMNITRACE_HSA_ENV@export HSA_TOOLS_LIB
 # @OMNITRACE_HSA_ENV@export HSA_TOOLS_REPORT_LOAD_FAILURE

scripts/test-release.sh

@@ -99,7 +99,7 @@ test-install()
     verbose-run rocprof-sys-instrument --help
     verbose-run rocprof-sys-avail --help
     verbose-run rocprof-sys-avail --all
-    if [ -d "${1}/lib/python/site-packages/omnitrace" ]; then
+    if [ -d "${1}/lib/python/site-packages/rocprofsys" ]; then
         verbose-run omnitrace-python --help
     fi
 }

scripts/write-omnitrace-install.cmake → scripts/write-rocprofsys-install.cmake

@@ -13,8 +13,8 @@ endif()
 
 message(
     STATUS
-        "Writing ${OUTPUT_DIR}/rocprofsys-install.py for rocprofsys v${OMNITRACE_VERSION}"
+        "Writing ${OUTPUT_DIR}/rocprof-sys-install.py for rocprof-sys v${OMNITRACE_VERSION}"
     )
 
 configure_file(${CMAKE_CURRENT_LIST_DIR}/../cmake/Templates/rocprofsys-install.py.in
-               ${OUTPUT_DIR}/rocprofsys-install.py @ONLY)
+               ${OUTPUT_DIR}/rocprof-sys-install.py @ONLY)

source/lib/omnitrace-dl/CMakeLists.txt

@@ -45,6 +45,6 @@ set_target_properties(
 omnitrace_strip_target(rocprofsys-dl-library)
 
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dl/dl.hpp
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofsys/dl)
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_NAME}/dl)
 
 install(TARGETS rocprofsys-dl-library DESTINATION ${CMAKE_INSTALL_LIBDIR})

source/lib/omnitrace-rt/CMakeLists.txt

@@ -135,4 +135,4 @@ add_custom_target(
 install(
     FILES
         ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/${CMAKE_SHARED_LIBRARY_PREFIX}dyninstAPI_RT${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PACKAGE_NAME})

source/lib/omnitrace-user/CMakeLists.txt

@@ -41,13 +41,17 @@ set_target_properties(
 omnitrace_strip_target(rocprofsys-user-library)
 
 foreach(_HEADER ${_user_headers})
+    string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/omnitrace/"
+                   "${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}/"
+                   _DEST ${_HEADER})
     string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/"
-                   "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/" _DEST
-                   "${_HEADER}")
+                   "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/"
+                   _DEST "${_DEST}")
+    message(STATUS "Copying ${_HEADER} to ${_DEST}")
     configure_file(${_HEADER} ${_DEST} COPYONLY)
 endforeach()
 
-install(FILES ${_user_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofsys)
+install(FILES ${_user_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_NAME})
 
 install(
     TARGETS rocprofsys-user-library