Always use wgt when talking about widget 11/17311/1
authorRomain Forlot <romain.forlot@iot.bzh>
Fri, 19 Oct 2018 13:51:59 +0000 (15:51 +0200)
committerRomain Forlot <romain.forlot@iot.bzh>
Fri, 19 Oct 2018 13:51:59 +0000 (15:51 +0200)
We already have a wgt directory so this just make use the same for
the test widget directory.

Change-Id: I2eb5c7a4faf17adb8f011b7e37ac98389340d41b
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
cmake/cmake.d/03-macros.cmake
test-wgt/launcher.sh.in [moved from test-widget/launcher.sh.in with 100% similarity]
test-wgt/test-config.xml.in [moved from test-widget/test-config.xml.in with 100% similarity]

index d4fdf7d..f3abedf 100644 (file)
@@ -545,7 +545,7 @@ macro(wgt_package_build)
                COMMAND ${CMAKE_COMMAND} -DINFILE=${TEST_WIDGET_CONFIG_TEMPLATE} -DOUTFILE=${PROJECT_PKG_TEST_DIR}/config.xml -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake
                COMMAND mkdir -p ${PROJECT_PKG_TEST_DIR}/bin
                COMMAND cp ${ICON_PATH} ${PROJECT_PKG_TEST_DIR}/${PROJECT_ICON}
-               COMMAND cp ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/test-widget/launcher.sh.in ${PROJECT_PKG_TEST_DIR}/bin/launcher
+               COMMAND cp ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/test-wgt/launcher.sh.in ${PROJECT_PKG_TEST_DIR}/bin/launcher
        )
 
        add_custom_command(OUTPUT ${WGT_NAME}.wgt