X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcmake.d%2F03-macros.cmake;h=e483a4a5baaff0da2f40d2e5660c757ad1af8448;hb=refs%2Fchanges%2F37%2F17237%2F3;hp=5595e634c6c662400bb8d321300bef365f42bf15;hpb=35f3af1c85bc2f77c41313a4754bed96856b6d8d;p=apps%2Fapp-templates.git

diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index 5595e63..e483a4a 100644
--- a/cmake/cmake.d/03-macros.cmake
+++ b/cmake/cmake.d/03-macros.cmake
@@ -258,13 +258,16 @@ endmacro()
 
 # To be call inside project_targets_populate macro
 macro(afb_genskel)
+	set (ARGSLIST ${ARGN})
+
 	if ("${PROJECT_LANGUAGES}" MATCHES "CXX")
-		list(APPEND GENSKEL_OPTS "--cpp")
+		list(APPEND ARGSLIST "--cpp")
 	endif()
+
 	if (OPENAPI_DEF)
 		add_custom_command(OUTPUT ${SD}/${OPENAPI_DEF}.h
 			DEPENDS ${SD}/${OPENAPI_DEF}.json
-			COMMAND afb-genskel ${GENSKEL_OPTS} ${SD}/${OPENAPI_DEF}.json > ${SD}/${OPENAPI_DEF}.h
+			COMMAND afb-genskel ${ARGSLIST} ${SD}/${OPENAPI_DEF}.json > ${SD}/${OPENAPI_DEF}.h
 		)
 		add_custom_target("${TARGET}_GENSKEL" DEPENDS ${SD}/${OPENAPI_DEF}.h
 			COMMENT "Generating OpenAPI header file ${OPENAPI_DEF}.h")
@@ -272,7 +275,7 @@ macro(afb_genskel)
 	else()
 		add_custom_command(OUTPUT ${SD}/${OUT}-apidef.h
 			DEPENDS ${SD}/${OUT}-apidef.json
-			COMMAND afb-genskel ${GENSKEL_OPTS} ${SD}/${OUT}-apidef.json > ${SD}/${OUT}-apidef.h
+			COMMAND afb-genskel ${ARGSLIST} ${SD}/${OUT}-apidef.json > ${SD}/${OUT}-apidef.h
 		)
 		add_custom_target("${TARGET}_GENSKEL" DEPENDS ${SD}/${OUT}-apidef.h
 			COMMENT "Generating OpenAPI header file ${OUT}-apidef.h")
@@ -288,10 +291,24 @@ macro(project_targets_populate)
 	set(PACKAGE_LIBDIR  ${PROJECT_PKG_BUILD_DIR}/${LIBDIR})
 	set(PACKAGE_HTTPDIR ${PROJECT_PKG_BUILD_DIR}/${HTTPDIR})
 	set(PACKAGE_DATADIR ${PROJECT_PKG_BUILD_DIR}/${DATADIR})
-
-	add_custom_command(OUTPUT ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR}
-		COMMAND mkdir -p ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR})
-	add_custom_target(populate DEPENDS ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR})
+	# Default test Widget default directory
+	string(REGEX REPLACE "/([^/]*)$" "/\\1-test" PROJECT_PKG_TEST_DIR "${PROJECT_PKG_BUILD_DIR}")
+	set(PACKAGE_TEST_BINDIR  ${PROJECT_PKG_TEST_DIR}/${BINDIR})
+	set(PACKAGE_TEST_ETCDIR  ${PROJECT_PKG_TEST_DIR}/${ETCDIR})
+	set(PACKAGE_TEST_LIBDIR  ${PROJECT_PKG_TEST_DIR}/${LIBDIR})
+	set(PACKAGE_TEST_HTTPDIR ${PROJECT_PKG_TEST_DIR}/${HTTPDIR})
+	set(PACKAGE_TEST_DATADIR ${PROJECT_PKG_TEST_DIR}/${DATADIR})
+
+	if(${BUILD_TEST_WGT})
+		add_custom_command(OUTPUT ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR} ${PACKAGE_TEST_BINDIR} ${PACKAGE_TEST_ETCDIR} ${PACKAGE_TEST_LIBDIR} ${PACKAGE_TEST_HTTPDIR} ${PACKAGE_TEST_DATADIR}
+			COMMAND mkdir -p ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR}
+			COMMAND mkdir -p ${PACKAGE_TEST_BINDIR} ${PACKAGE_TEST_ETCDIR} ${PACKAGE_TEST_LIBDIR} ${PACKAGE_TEST_HTTPDIR} ${PACKAGE_TEST_DATADIR})
+		add_custom_target(populate DEPENDS ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR} ${PACKAGE_TEST_BINDIR} ${PACKAGE_TEST_ETCDIR} ${PACKAGE_TEST_LIBDIR} ${PACKAGE_TEST_HTTPDIR} ${PACKAGE_TEST_DATADIR})
+	else()
+		add_custom_command(OUTPUT ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR}
+			COMMAND mkdir -p ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR})
+		add_custom_target(populate DEPENDS ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR})
+	endif()
 
 	# Dirty trick to define a default INSTALL command for app-templates handled
 	# targets
@@ -331,23 +348,46 @@ macro(project_targets_populate)
 			if(${T} STREQUAL "LIBRARY")
 				unset(BD)
 				generate_one_populate_target(${IMPPATH} ${PACKAGE_LIBDIR})
+			elseif(${T} STREQUAL "TEST-LIBRARY")
+				unset(BD)
+				generate_one_populate_target(${IMPPATH} ${PACKAGE_TEST_LIBDIR})
 			elseif(${T} STREQUAL "PLUGIN")
 				if(NOT S)
 					set(S ".ctlso")
 				endif()
 				generate_one_populate_target(${P}${OUT}${S} "${PACKAGE_LIBDIR}/plugins")
+			elseif(${T} STREQUAL "TEST-PLUGIN")
+				if(NOT S)
+					set(S ".ctlso")
+				endif()
+				generate_one_populate_target(${P}${OUT}${S} "${PACKAGE_TEST_LIBDIR}/plugins")
 			elseif(${T} STREQUAL "BINDING")
 				if(NOT S)
 					set(S ".so")
 				endif()
 				list(APPEND BINDINGS_LIST "${P}${OUT}${S}")
 				generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_LIBDIR})
+				SET_TARGET_PROPERTIES(${T} PROPERTIES
+					LINK_FLAGS  ${BINDINGS_LINK_FLAG}
+				)
 			elseif(${T} STREQUAL "BINDINGV2")
 				if(NOT S)
 					set(S ".so")
 				endif()
-				afb_genskel()
+				afb_genskel("-2")
+				generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_LIBDIR})
+				SET_TARGET_PROPERTIES(${T} PROPERTIES
+					LINK_FLAGS  ${BINDINGS_LINK_FLAG}
+				)
+			elseif(${T} STREQUAL "BINDINGV3")
+				if(NOT S)
+					set(S ".so")
+				endif()
+				afb_genskel("-3")
 				generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_LIBDIR})
+				SET_TARGET_PROPERTIES(${T} PROPERTIES
+					LINK_FLAGS  ${BINDINGS_LINK_FLAG}
+				)
 			elseif(${T} STREQUAL "EXECUTABLE")
 				if(NOT S)
 					set(S "")
@@ -358,14 +398,30 @@ macro(project_targets_populate)
 				else()
 					generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_BINDIR})
 				endif()
+			elseif(${T} STREQUAL "TEST-EXECUTABLE")
+				if(NOT S)
+					set(S "")
+				endif()
+				if(NOT OUT AND IMPPATH)
+					unset(BD)
+					generate_one_populate_target(${IMPPATH} ${PACKAGE_TEST_BINDIR})
+				else()
+					generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_TEST_BINDIR})
+				endif()
 			elseif(${T} STREQUAL "HTDOCS")
 				generate_one_populate_target(${P}${OUT} ${PACKAGE_HTTPDIR})
-			elseif(${T} STREQUAL "DATA")
+			elseif(${T} STREQUAL "TEST-HTDOCS")
+				generate_one_populate_target(${P}${OUT} ${PACKAGE_HTTPDIR})
+			elseif(${T} STREQUAL "DATA" )
 				generate_one_populate_target(${TARGET} ${PACKAGE_DATADIR})
-			elseif(${T} STREQUAL "BINDING-CONFIG")
+			elseif(${T} STREQUAL "TEST-DATA")
+				generate_one_populate_target(${TARGET} ${PACKAGE_TEST_DATADIR})
+			elseif(${T} STREQUAL "BINDING-CONFIG" )
 				generate_one_populate_target(${TARGET} ${PACKAGE_ETCDIR})
+			elseif(${T} STREQUAL "TEST-CONFIG")
+				generate_one_populate_target(${TARGET} ${PACKAGE_TEST_ETCDIR})
 			endif()
-			elseif(${CMAKE_BUILD_TYPE} MATCHES "[Dd][Ee][Bb][Uu][Gg]")
+			elseif("${CMAKE_BUILD_TYPE}" MATCHES "[Dd][Ee][Bb][Uu][Gg]")
 				MESSAGE("${Yellow}.. Warning: ${TARGET} ignored when packaging.${ColourReset}")
 		endif()
 	endforeach()
@@ -423,6 +479,10 @@ macro(remote_targets_populate)
 endmacro(remote_targets_populate)
 
 macro(wgt_package_build)
+	if(NOT EXISTS ${TEST_WIDGET_CONFIG_TEMPLATE})
+		MESSAGE(STATUS "${BoldBlue}Notice!:Using default test widget configuration's file.\n-- If you want to use a customized test-config.xml template then specify TEST_WIDGET_CONFIG_TEMPLATE in your config.cmake file.${ColourReset}")
+		set(TEST_WIDGET_CONFIG_TEMPLATE "${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/test-wgt/test-config.xml.in" CACHE PATH "Path to the test widget config file template (test-config.xml.in)")
+	endif()
 	if(NOT EXISTS ${WIDGET_CONFIG_TEMPLATE})
 		MESSAGE(FATAL_ERROR "${Red}WARNING ! Missing mandatory files to build widget file.\nYou need a config.xml template: please specify WIDGET_CONFIG_TEMPLATE correctly.${ColourReset}")
 	endif()
@@ -457,13 +517,6 @@ macro(wgt_package_build)
 		string(TOLOWER "${PROJECT_NAME}" WGT_NAME)
 	endif()
 
-	add_custom_command(OUTPUT ${PROJECT_PKG_BUILD_DIR}/config.xml
-		COMMAND ${CMAKE_COMMAND} -DINFILE=${WIDGET_CONFIG_TEMPLATE} -DOUTFILE=${PROJECT_PKG_BUILD_DIR}/config.xml -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake
-		COMMAND cp ${ICON_PATH} ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON}
-
-	)
-	add_custom_target(packaging_wgt DEPENDS ${PROJECT_PKG_BUILD_DIR}/config.xml)
-
 	# Fulup ??? copy any extra file in wgt/etc into populate package before building the widget
 	file(GLOB PROJECT_CONF_FILES "${TEMPLATE_DIR}/etc/*")
 	if(${PROJECT_CONF_FILES})
@@ -473,16 +526,47 @@ macro(wgt_package_build)
 	find_program(wgtpkgCMD "wgtpkg-pack")
 	if(wgtpkgCMD)
 		set(packCMD ${wgtpkgCMD} "-f" "-o" "${WGT_NAME}.wgt" ${PROJECT_PKG_BUILD_DIR})
+		set(packCMDTest ${wgtpkgCMD} "-f" "-o" "${WGT_NAME}-test.wgt" ${PROJECT_PKG_TEST_DIR})
 	else()
-		set(packCMD cd ${PROJECT_PKG_BUILD_DIR} && ${CMAKE_COMMAND} "-E" "tar" "cf" "../${WGT_NAME}.wgt" "--format=zip" "*")
+		find_program(wgtpkgCMD "zip")
+		if(wgtpkgCMD)
+			set(packCMD ${CMAKE_COMMAND} -E cmake_echo_color --yellow "Warning: Widget will be built using Zip, NOT using the Application Framework widget pack command." && cd ${PROJECT_PKG_BUILD_DIR} && ${wgtpkgCMD} "../${WGT_NAME}.wgt" "*")
+			set(packCMDTest ${CMAKE_COMMAND} -E cmake_echo_color --yellow "Warning: Test widget will be built using Zip, NOT using the Application Framework widget pack command." && cd ${PROJECT_PKG_TEST_DIR} && ${wgtpkgCMD} "../${WGT_NAME}-test.wgt" "*")
+		else()
+			set(packCMD ${CMAKE_COMMAND} -E cmake_echo_color --red "Error: No utility found to build a widget. Either install wgtpkg-pack from App Framework or zip command")
+		endif()
 	endif()
 
+	add_custom_command(OUTPUT ${PROJECT_PKG_BUILD_DIR}/config.xml
+		COMMAND ${CMAKE_COMMAND} -DINFILE=${WIDGET_CONFIG_TEMPLATE} -DOUTFILE=${PROJECT_PKG_BUILD_DIR}/config.xml -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/cmake/configure_file.cmake
+		COMMAND cp ${ICON_PATH} ${PROJECT_PKG_BUILD_DIR}/${PROJECT_ICON}
+	)
+	add_custom_command(OUTPUT ${PROJECT_PKG_TEST_DIR}/config.xml ${PROJECT_PKG_TEST_DIR}/bin/launcher
+		COMMAND ${CMAKE_COMMAND} -DINFILE=${TEST_WIDGET_CONFIG_TEMPLATE} -DOUTFILE=${PROJECT_PKG_TEST_DIR}/config.xml -DPROJECT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${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
+	)
+
 	add_custom_command(OUTPUT ${WGT_NAME}.wgt
 		DEPENDS ${PROJECT_TARGETS}
 		COMMAND ${packCMD}
 	)
 
-	add_custom_target(widget DEPENDS ${WGT_NAME}.wgt)
+	add_custom_command(OUTPUT ${WGT_NAME}-test.wgt
+		DEPENDS ${PROJECT_TARGETS}
+		COMMAND ${packCMDTest}
+	)
+
+	if(${BUILD_TEST_WGT})
+		add_custom_target(packaging_wgt DEPENDS ${PROJECT_PKG_BUILD_DIR}/config.xml ${PROJECT_PKG_TEST_DIR}/config.xml ${PROJECT_PKG_TEST_DIR}/bin/launcher)
+		add_custom_target(widget DEPENDS ${WGT_NAME}.wgt ${WGT_NAME}-test.wgt)
+		set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${WGT_NAME}-test.wgt")
+	else()
+		add_custom_target(packaging_wgt DEPENDS ${PROJECT_PKG_BUILD_DIR}/config.xml)
+		add_custom_target(widget DEPENDS ${WGT_NAME}.wgt)
+	endif()
+
 	add_dependencies(widget populate packaging_wgt)
 	set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${WGT_NAME}.wgt")
 
@@ -493,13 +577,13 @@ macro(wgt_package_build)
 			COMMAND exit -1
 		)
 	else()
-	configure_files_in_dir(${TEMPLATE_DIR})
-	add_custom_target(widget-target-install
-	DEPENDS widget
-	COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/target/install-wgt-on-${RSYNC_TARGET}.sh
-	COMMAND ${CMAKE_CURRENT_BINARY_DIR}/target/install-wgt-on-${RSYNC_TARGET}.sh
-	)
-endif()
+		configure_files_in_dir(${TEMPLATE_DIR})
+		add_custom_target(widget-target-install
+			DEPENDS widget
+			COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/target/install-wgt-on-${RSYNC_TARGET}.sh
+			COMMAND ${CMAKE_CURRENT_BINARY_DIR}/target/install-wgt-on-${RSYNC_TARGET}.sh
+		)
+	endif()
 
 	if(PACKAGE_MESSAGE)
 	add_custom_command(TARGET widget