common.cmake: fix icon copy and final name in package

[staging/xdg-launcher.git] / cmake / common.cmake

diff --git a/cmake/common.cmake b/cmake/common.cmake
index fa7b369..63396f6 100644 (file)
--- a/cmake/common.cmake
+++ b/cmake/common.cmake
@@ -79,15 +79,15 @@ endmacro(defstr)
 # Pre-packaging
 macro(project_targets_populate)
 
-        # Default Widget default directory
-        set(PACKAGE_BINDIR  ${PROJECT_PKG_BUILD_DIR}/bin)
-        set(PACKAGE_ETCDIR  ${PROJECT_PKG_BUILD_DIR}/etc)
-        set(PACKAGE_LIBDIR  ${PROJECT_PKG_BUILD_DIR}/lib)
-        set(PACKAGE_HTTPDIR ${PROJECT_PKG_BUILD_DIR}/htdocs)
-        set(PACKAGE_DATADIR ${PROJECT_PKG_BUILD_DIR}/data)
+       # Default Widget default directory
+       set(PACKAGE_BINDIR  ${PROJECT_PKG_BUILD_DIR}/bin)
+       set(PACKAGE_ETCDIR  ${PROJECT_PKG_BUILD_DIR}/etc)
+       set(PACKAGE_LIBDIR  ${PROJECT_PKG_BUILD_DIR}/lib)
+       set(PACKAGE_HTTPDIR ${PROJECT_PKG_BUILD_DIR}/htdocs)
+       set(PACKAGE_DATADIR ${PROJECT_PKG_BUILD_DIR}/data)
 
        add_custom_target(populate)
-        get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
+               get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
        foreach(TARGET ${PROJECT_TARGETS})
                get_target_property(T ${TARGET} LABELS)
                if(T)
@@ -123,20 +123,22 @@ macro(project_targets_populate)
                                add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_BINDIR}/${P}${TARGET})
                                add_dependencies(populate ${POPULE_PACKAGE_TARGET}) 
                        elseif(${T} STREQUAL "HTDOCS")
-                               add_custom_command(OUTPUT ${PACKAGE_HTTPDIR}
+                               add_custom_command(OUTPUT ${PACKAGE_HTTPDIR}-xx
                                        DEPENDS ${TARGET}
                                        COMMAND mkdir -p ${PACKAGE_HTTPDIR}
+                                       COMMAND touch ${PACKAGE_HTTPDIR}
                                        COMMAND cp -r ${BD}/${P}${OUT}/* ${PACKAGE_HTTPDIR}
                                )
-                                       add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_HTTPDIR})
+                                       add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_HTTPDIR}-xx)
                                        add_dependencies(populate ${POPULE_PACKAGE_TARGET}) 
                        elseif(${T} STREQUAL "DATA")
-                               add_custom_command(OUTPUT ${PACKAGE_DATADIR}
+                               add_custom_command(OUTPUT ${PACKAGE_DATADIR}-xx
                                        DEPENDS ${TARGET}
                                        COMMAND mkdir -p ${PACKAGE_DATADIR}
+                                       COMMAND touch ${PACKAGE_DATADIR}
                                        COMMAND cp -r ${BD}/${P}${OUT} ${PACKAGE_DATADIR}
                                )
-                                       add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_DATADIR})
+                                       add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_DATADIR}-xx)
                                        add_dependencies(populate ${POPULE_PACKAGE_TARGET}) 
                        endif(${T} STREQUAL "BINDING")
                elseif(${CMAKE_BUILD_TYPE} MATCHES "[Dd][Ee][Bb][Uu][Gg]")
@@ -185,7 +187,8 @@ macro(wgt_package_build)
 
        configure_file(${WGT_TEMPLATE_DIR}/config.xml.in ${PROJECT_PKG_BUILD_DIR}/config.xml)
        configure_file(${WGT_TEMPLATE_DIR}/config.xml.in ${PROJECT_PKG_ENTRY_POINT}/config.xml)
-       file(COPY ${WGT_TEMPLATE_DIR}/icon-default.png DESTINATION ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON})
+       file(COPY ${WGT_TEMPLATE_DIR}/icon-default.png DESTINATION ${PROJECT_PKG_BUILD_DIR})
+       file(RENAME ${PROJECT_PKG_BUILD_DIR}/icon-default.png ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON})
 
        # Fulup ??? copy any extra file in wgt/etc into populate package before building the widget
        file(GLOB PROJECT_CONF_FILES "${WGT_TEMPLATE_DIR}/etc/*")
@@ -226,7 +229,8 @@ macro(rpm_package_build)
 
        add_custom_command(OUTPUT ${PROJECT_NAME}.spec
                DEPENDS ${PROJECT_TARGETS}
-               COMMAND rpmbuild -ba  ${PROJECT_PKG_BUILD_DIR}/${PROJECT_NAME}.spec
+               COMMAND git --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git  archive --format=tar.gz --prefix=${PROJECT_NAME}-${PROJECT_VERSION}/ HEAD -o ${PROJECT_PKG_BUILD_DIR}/${PROJECT_NAME}_${PROJECT_VERSION}.orig.tar.gz
+               COMMAND rpmbuild --define=\"%_sourcedir ${PROJECT_PKG_BUILD_DIR}\" -ba  ${PROJECT_PKG_BUILD_DIR}/${PROJECT_NAME}.spec
        )
 
        add_custom_target(rpm DEPENDS ${PROJECT_NAME}.spec)
@@ -353,9 +357,9 @@ endif()
 
 # Define a default package directory
 if(PACKAGE_PREFIX)
-       set(PROJECT_PKG_BUILD_DIR ${PKG_PREFIX}/package CACHE PATH "Where the package will be built.")
+       set(PROJECT_PKG_BUILD_DIR ${PKG_PREFIX}/package CACHE PATH "Application contents to be packaged")
 else()
-       set(PROJECT_PKG_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/package CACHE PATH "Where the package will be built")
+       set(PROJECT_PKG_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/package CACHE PATH "Application contents to be packaged")
 endif()
 
 set (PKG_TEMPLATE_PREFIX ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR} CACHE PATH "Default Package Templates Directory")