Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit e8785db9 authored by Johan Ouwerkerk's avatar Johan Ouwerkerk

Rename AndroidManifest.xml to avoid spurious diffs

The KDE Android SDK will overwrite the version number in the Android
manifest when building the app. When building against a clone this results
in 'spurious' git diffs that should never be committed. Work-around this by
renaming the AndroidManifest.xml and copying it in place at build time.
parent db41697d
Pipeline #20332 passed with stage
in 6 minutes and 24 seconds
AndroidManifest.xml
......@@ -10,3 +10,12 @@ file (
DESTINATION "${CMAKE_CURRENT_BINARY_DIR}"
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
#
# The KDE Android SDK overwrites the AndroidManifest to set an auto-generated versionCode.
# When building against a local clone, this results in annoying git diffs that must be manually reset.
#
# As a work-around, the AndroidManifest.xml is gitignore'd and generated (copied) from another file, taking care to
# preserve a file-level dependency between the 'real' source and the generated file.
#
configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.in" "${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml" COPYONLY)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment