diff options
| author | Harald Sitter <sitter@kde.org> | 2020-10-01 14:32:53 +0200 |
|---|---|---|
| committer | Harald Sitter <sitter@kde.org> | 2020-10-01 14:34:06 +0200 |
| commit | 693781d22e98057d83eac2b2c85d04063202f26f (patch) | |
| tree | f16fe4cc22f538a5ae5f81e37a0b989bb8c72137 | |
| parent | 523e95465a814e7538f78fc1e5a19af8977d9ae1 (diff) | |
| download | extra-cmake-modules-5.75.0-rc1.tar.gz extra-cmake-modules-5.75.0-rc1.tar.bz2 | |
fix fetch-translations for invent urlsv5.75.0-rc1v5.75.0
regex gets slightly adjusted to only run on kde.org urls, the actual
repo name may now contain slash as well since
a) basenames aren't necessarily unique anymore
b) by extension we need to give fetchpo an actually unique repo path so
it can resolve the underlying project and its translations
| -rw-r--r-- | kde-modules/KDECMakeSettings.cmake | 4 | ||||
| -rw-r--r-- | tests/KDEFetchTranslations/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake index 0690a2ed..126b0a04 100644 --- a/kde-modules/KDECMakeSettings.cmake +++ b/kde-modules/KDECMakeSettings.cmake @@ -300,7 +300,7 @@ function(_repository_name reponame dir) WORKING_DIRECTORY "${dir}") if(exitCode EQUAL 0) - string(REGEX MATCHALL ".+[:\\/]([-A-Za-z0-9]+)(.git)?\\s*" "" ${giturl}) + string(REGEX MATCHALL ".+kde\\.org[:\\/]([-A-Za-z0-9\\/]+)(.git)?\\s*" "" ${giturl}) set(${reponame} ${CMAKE_MATCH_1}) endif() @@ -325,7 +325,7 @@ if(NOT EXISTS ${CMAKE_SOURCE_DIR}/po AND NOT TARGET fetch-translations) _repository_name(_reponame "${CMAKE_SOURCE_DIR}") set(releaseme_clone_commands - COMMAND git clone --depth 1 https://anongit.kde.org/releaseme.git + COMMAND git clone --depth 1 https://invent.kde.org/sdk/releaseme.git ) add_custom_command( OUTPUT "${CMAKE_BINARY_DIR}/releaseme" diff --git a/tests/KDEFetchTranslations/CMakeLists.txt b/tests/KDEFetchTranslations/CMakeLists.txt index e68c7966..8b07c30d 100644 --- a/tests/KDEFetchTranslations/CMakeLists.txt +++ b/tests/KDEFetchTranslations/CMakeLists.txt @@ -18,8 +18,8 @@ foreach(module ${all_kde_modules}) endforeach() _repository_name(name "${CMAKE_CURRENT_SOURCE_DIR}/../../") -if (NOT ${name} STREQUAL "extra-cmake-modules") - message(FATAL_ERROR "Wrong repository name: ${name}, should be 'extra-cmake-modules'") +if (NOT ${name} STREQUAL "frameworks/extra-cmake-modules") + message(FATAL_ERROR "Wrong repository name: ${name}, should be 'frameworks/extra-cmake-modules'") endif() add_executable(dummy ../ExecuteKDEModules/main.c) ecm_mark_nongui_executable(dummy) |