[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-release-team
Subject:    [kpackage/v5.28.0-rc2] /: Fix generating the metadata.json file
From:       l10n daemon script <scripty () kde ! org>
Date:       2016-11-07 12:14:49
Message-ID: E1c3ip7-0006nQ-9X () code ! kde ! org
[Download RAW message or body]

Git commit b4d1a8bae8a37cd5d77d2bce3c18dabbe2406edf by l10n daemon script, =
on behalf of Bhushan Shah.
Committed on 07/11/2016 at 12:14.
Pushed by dfaure into tag 'v5.28.0-rc2'.

Fix generating the metadata.json file

kpackage_install_package macro takes dir as argument, some usage of it
passes it directory path instead of directory itself, as in foo/bar
instead of bar. 5ce8fe3462c2d40dcf8 commit broke this behavior.

This fixes it by replacing name of temporary json file to
$component-metadata.json instead of $dir/metadata.json.

CCMAIL: aleixpol@kde.org
CCMAIL: release-team@kde.org
CCMAIL: faure@kde.org

Reviewed-by: Marco Martin <notmart@gmail.com>

David, can you please re-do 5.28 kpackage tarball with this commit?

(cherry picked from commit 22c471f9b2546395bea356bc02faa0803b1dcd14)

M  +2    -2    KF5PackageMacros.cmake

http://commits.kde.org/kpackage/b4d1a8bae8a37cd5d77d2bce3c18dabbe2406edf

diff --git a/KF5PackageMacros.cmake b/KF5PackageMacros.cmake
index f544cf5..c8f22dd 100644
--- a/KF5PackageMacros.cmake
+++ b/KF5PackageMacros.cmake
@@ -37,8 +37,8 @@ function(kpackage_install_package dir component)
            PATTERN Messages.sh EXCLUDE
            PATTERN dummydata EXCLUDE)
 =

-   if(NOT EXISTS ${dir}/metadata.json)
-        set(GENERATED_METADATA "${CMAKE_CURRENT_BINARY_DIR}/${dir}-metadat=
a.json")
+   if(NOT EXISTS ${component}-metadata.json)
+        set(GENERATED_METADATA "${CMAKE_CURRENT_BINARY_DIR}/${component}-m=
etadata.json")
         add_custom_command(OUTPUT ${GENERATED_METADATA}
                            COMMAND KF5::desktoptojson -i ${CMAKE_CURRENT_S=
OURCE_DIR}/${dir}/metadata.desktop -o ${GENERATED_METADATA})
         add_custom_target(${component}-metadata-json ALL DEPENDS ${GENERAT=
ED_METADATA})
[prev in list] [next in list] [prev in thread] [next in thread]