X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcmake.d%2F02-variables.cmake;h=54a362d8b8ad6c72fbfda879e5431d7320fd8c94;hb=08aec90d5db29a723d7b083910ba8b0be6faeb07;hp=6d20b2f7df5efb67900fa21a119a3fa92c385521;hpb=421f62833dc53ab95648951e75827deb2d9d20b2;p=apps%2Fapp-templates.git

diff --git a/cmake/cmake.d/02-variables.cmake b/cmake/cmake.d/02-variables.cmake
index 6d20b2f..54a362d 100644
--- a/cmake/cmake.d/02-variables.cmake
+++ b/cmake/cmake.d/02-variables.cmake
@@ -48,28 +48,15 @@ endif()
 # Native packaging name
 set(NPKG_PROJECT_NAME agl-${PROJECT_NAME})
 
-# Get the os type
-# Used to package .deb
-if(EXISTS "/etc/os-release")
-	execute_process(COMMAND grep -E "^ID(=|_LIKE=)" /etc/os-release
-		OUTPUT_VARIABLE TMP_OSRELEASE
-	)
-	if (NOT TMP_OSRELEASE STREQUAL "")
-		string(REGEX REPLACE ".*=" "" OSRELEASE ${TMP_OSRELEASE})
-	else()
-		set(OSRELEASE "NOT DEBIAN OS")
-	endif()
-	message(STATUS "OSRELEASE = ${OSRELEASE}")
-else()
-	set(OSRELEASE "NOT DEBIAN OS")
-endif()
-
 if(DEFINED ENV{SDKTARGETSYSROOT})
-	file(STRINGS $ENV{SDKTARGETSYSROOT}/usr/include/linux/version.h LINUX_VERSION_CODE_LINE REGEX "LINUX_VERSION_CODE")
+file(STRINGS $ENV{SDKTARGETSYSROOT}/usr/include/linux/version.h LINUX_VERSION_CODE_LINE REGEX "LINUX_VERSION_CODE")
+set(BUILD_ENV_SYSROOT $ENV{SDKTARGETSYSROOT})
 elseif(DEFINED ENV{PKG_CONFIG_SYSROOT_DIR})
-	file(STRINGS $ENV{PKG_CONFIG_SYSROOT_DIR}/usr/include/linux/version.h LINUX_VERSION_CODE_LINE REGEX "LINUX_VERSION_CODE")
+file(STRINGS $ENV{PKG_CONFIG_SYSROOT_DIR}/usr/include/linux/version.h LINUX_VERSION_CODE_LINE REGEX "LINUX_VERSION_CODE")
+set(BUILD_ENV_SYSROOT $ENV{PKG_CONFIG_SYSROOT_DIR})
 else()
-	file(STRINGS /usr/include/linux/version.h LINUX_VERSION_CODE_LINE REGEX "LINUX_VERSION_CODE")
+file(STRINGS /usr/include/linux/version.h LINUX_VERSION_CODE_LINE REGEX "LINUX_VERSION_CODE")
+set(BUILD_ENV_SYSROOT "")
 endif()
 
 string(REGEX MATCH "[0-9]+" LINUX_VERSION_CODE ${LINUX_VERSION_CODE_LINE})
@@ -79,6 +66,25 @@ math(EXPR c "(${LINUX_VERSION_CODE} & 255)")
 
 set(KERNEL_VERSION "${a}.${b}.${c}")
 
+# Get the os type
+# Used to package .deb
+set(OS_RELEASE_PATH "${BUILD_ENV_SYSROOT}/etc/os-release")
+if(EXISTS ${OS_RELEASE_PATH})
+	execute_process(COMMAND bash "-c" "grep -E '^ID(_LIKE)?=' ${OS_RELEASE_PATH} | tail -n 1"
+		OUTPUT_VARIABLE TMP_OSRELEASE
+	)
+
+	if (NOT TMP_OSRELEASE STREQUAL "")
+		string(REGEX REPLACE ".*=\"?([0-9a-z\._-]*)\"?\n" "\\1" OSRELEASE ${TMP_OSRELEASE})
+	else()
+		set(OSRELEASE "NOT COMPATIBLE !")
+	endif()
+
+else()
+	set(OSRELEASE "NOT COMPATIBLE ! Missing ${OS_RELEASE_PATH} file.")
+endif()
+message(STATUS "Distribution used ${OSRELEASE}")
+
 # Include project configuration
 # ------------------------------
 project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES})
@@ -119,14 +125,6 @@ endif(kernel_minimal_version)
 
 # Project path variables
 # ----------------------
-
-# If no install dir try to guess some smart default
-if(BINDINGS_INSTALL_PREFIX)
-	set(BINDINGS_INSTALL_DIR ${BINDINGS_INSTALL_PREFIX}/${PROJECT_NAME} CACHE PATH "Where the binding will be installed in your system")
-else()
-	set(BINDINGS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME} CACHE PATH "Where the binding will be installed in your system")
-endif()
-
 set(PKGOUT_DIR package CACHE PATH "Output directory for packages")
 
 # Define a default package directory
@@ -139,13 +137,12 @@ endif()
 # Paths to templates files
 set(TEMPLATE_DIR "${PKG_TEMPLATE_PREFIX}/template.d" CACHE PATH "Subpath to a directory where are stored needed files to launch on remote target to debuging purposes")
 
-if(NOT WIDGET_CONFIG_TEMPLATE)
-	set(WIDGET_CONFIG_TEMPLATE ${TEMPLATE_DIR}/config.xml.in CACHE PATH "Path to widget config file template (config.xml.in)")
-endif()
-
 string(REGEX REPLACE "^(.*)/.*$" "\\1" ENTRY_POINT "${PKG_TEMPLATE_PREFIX}")
 set(PROJECT_PKG_ENTRY_POINT ${ENTRY_POINT}/packaging CACHE PATH "Where package build files, like rpm.spec file or config.xml, are write.")
 
+set(WIDGET_ICON "${ENTRY_POINT}/wgt/${PROJECT_ICON}" CACHE PATH "Path to the widget icon")
+set(WIDGET_CONFIG_TEMPLATE ${TEMPLATE_DIR}/config.xml.in CACHE PATH "Path to widget config file template (config.xml.in)")
+
 # Path to autobuild template
 set(PROJECT_TEMPLATE_AGL_AUTOBUILD_DIR ${CMAKE_SOURCE_DIR}/conf.d/autobuild/agl CACHE PATH "Subpath to a directory where are stored autobuild script")
 set(PROJECT_TEMPLATE_LINUX_AUTOBUILD_DIR ${CMAKE_SOURCE_DIR}/conf.d/autobuild/linux CACHE PATH "Subpath to a directory where are stored autobuild script")
@@ -172,6 +169,6 @@ set(GDB_INITIAL_BREAK "personality" CACHE STRING "Initial Break Point for GDB re
 # Define some checker binaries to verify input DATA files
 # to be included in package. Schema aren't checked for now.
 # Dummy checker about JSON.
-set(LUA_CHECKER "luac" CACHE STRING "LUA compiler")
+set(LUA_CHECKER "luac -o /dev/null" CACHE STRING "LUA compiler")
 set(XML_CHECKER "xmllint" CACHE STRING "XML linter")
 set(JSON_CHECKER "echo" CACHE STRING "JSON linter")