[CMake] Proposal: Prefer LLDB_VERSION over plist value in EmbedAppleVersion.cmake

[sgraenitz]

Summary

LLDB_VERSION works analogous to CLANG_VERSION, with the exception that it includes the optional LLDB_VERSION_SUFFIX. Thus it should be equal to LLDB_VERSION_STRING and we could use it instead of extracting the plist value.

My preference would be to streamline version handling completely, including the code using it:

if(APPLE)
  set(apple_version_inc "${CMAKE_CURRENT_BINARY_DIR}/AppleVersion.inc")
  set(apple_version_script "${LLDB_SOURCE_DIR}/cmake/modules/EmbedAppleVersion.cmake")
  set(info_plist ${LLDB_SOURCE_DIR}/resources/LLDB-Info.plist)

  # Create custom target to generate the VC revision include.
  add_custom_command(OUTPUT "${apple_version_inc}"
    DEPENDS "${apple_version_script}" "${info_plist}"
    COMMAND
    ${CMAKE_COMMAND} "-DLLDB_INFO_PLIST=${info_plist}"
                     "-DHEADER_FILE=${apple_version_inc}"
                     -P "${apple_version_script}")

  # Mark the generated header as being generated.
  set_source_files_properties("${apple_version_inc}"
    PROPERTIES GENERATED TRUE
               HEADER_FILE_ONLY TRUE)

  # Tell Version.cpp that it needs to build with -DHAVE_SVN_VERSION_INC.
  set_property(SOURCE lldb.cpp APPEND PROPERTY 
               COMPILE_DEFINITIONS "HAVE_APPLE_VERSION_INC")
  list(APPEND lldbBase_SOURCES ${apple_version_inc})
else()

What do you think?

[friss]

Wouldn't it make even more sense to to inject LLDB_VERSION into the Info.plist? We will use the Info.plist afterwards, right?

[sgraenitz]

In order to reduce the risk of breaking the Xcode build, I use a separate resources/LLDB-Info.plist.in (https://reviews.llvm.org/D55328#change-SBZDFQxftWtU) for the framework. I did not yet change which plist is used here, but yes writing the correct version would be ideal I belief.

[sgraenitz]

This was fixed quite some time ago.

cmake/modules/EmbedAppleVersion.cmake

+if(LLDB_VERSION)
+  set(LLDB_VERSION_STRING ${LLDB_VERSION})
+else()
   execute_process(COMMAND /usr/libexec/PlistBuddy -c "Print:CFBundleVersion" ${LLDB_INFO_PLIST}
                   OUTPUT_VARIABLE BundleVersion
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
 
 file(APPEND "${HEADER_FILE}.tmp"
     "#define LLDB_VERSION_STRING lldb-${BundleVersion}\n")
 
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
   "${HEADER_FILE}.tmp" "${HEADER_FILE}")
 
 file(REMOVE "${HEADER_FILE}.tmp")