diff options
Diffstat (limited to 'conf.d')
| m--------- | conf.d/app-templates | 0 | ||||
| -rwxr-xr-x | conf.d/autobuild/agl/autobuild | 13 | ||||
| -rwxr-xr-x | conf.d/autobuild/linux/autobuild | 13 | ||||
| -rw-r--r-- | conf.d/config.cmake | 4 | ||||
| -rw-r--r-- | conf.d/wgt/config.xml.in | 2 | ||||
| -rw-r--r-- | conf.d/xds/xds-config.env | 12 |
6 files changed, 35 insertions, 9 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates -Subproject aa763ddec685dc44bcb5d44718d78f3692d4f0d +Subproject 17456de19e50f63348d42c4ae26dda156ddec53 diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild index 759f6be..3a1ba5f 100755 --- a/conf.d/autobuild/agl/autobuild +++ b/conf.d/autobuild/agl/autobuild @@ -18,7 +18,7 @@ THISFILE := $(lastword $(MAKEFILE_LIST)) BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build) DEST := ${BUILD_DIR}/target -.PHONY: all clean distclean configure build package help +.PHONY: all clean distclean configure build package help update all: help @@ -29,12 +29,16 @@ help: @echo "- clean" @echo "- distclean" @echo "- configure" - @echo "- build" - @echo "- package" + @echo "- build: compilation, link and prepare files for package into a widget" + @echo "- package: output a widget file '*.wgt'" + @echo "- install: install in your ${CMAKE_INSTALL_DIR} directory" @echo "" @echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt" @echo "Don't use your build dir as DEST as wgt file is generated at this location" +update: configure + @cmake --build ${BUILD_DIR} --target autobuild + clean: @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean @@ -55,6 +59,9 @@ package: build @cmake --build ${BUILD_DIR} --target widget @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST} +install: build + @cmake --build ${BUILD_DIR} --target install + ${BUILD_DIR}/Makefile: @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR} @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..) diff --git a/conf.d/autobuild/linux/autobuild b/conf.d/autobuild/linux/autobuild index 759f6be..3a1ba5f 100755 --- a/conf.d/autobuild/linux/autobuild +++ b/conf.d/autobuild/linux/autobuild @@ -18,7 +18,7 @@ THISFILE := $(lastword $(MAKEFILE_LIST)) BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build) DEST := ${BUILD_DIR}/target -.PHONY: all clean distclean configure build package help +.PHONY: all clean distclean configure build package help update all: help @@ -29,12 +29,16 @@ help: @echo "- clean" @echo "- distclean" @echo "- configure" - @echo "- build" - @echo "- package" + @echo "- build: compilation, link and prepare files for package into a widget" + @echo "- package: output a widget file '*.wgt'" + @echo "- install: install in your ${CMAKE_INSTALL_DIR} directory" @echo "" @echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt" @echo "Don't use your build dir as DEST as wgt file is generated at this location" +update: configure + @cmake --build ${BUILD_DIR} --target autobuild + clean: @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean @@ -55,6 +59,9 @@ package: build @cmake --build ${BUILD_DIR} --target widget @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST} +install: build + @cmake --build ${BUILD_DIR} --target install + ${BUILD_DIR}/Makefile: @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR} @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..) diff --git a/conf.d/config.cmake b/conf.d/config.cmake index 5545656..70d847b 100644 --- a/conf.d/config.cmake +++ b/conf.d/config.cmake @@ -60,7 +60,7 @@ set (gcc_minimal_version 4.9) # PKG_CONFIG required packages # ----------------------------- set (PKG_REQUIRED_LIST - mxml + #mxml json-c libsystemd>=222 afb-daemon @@ -153,4 +153,4 @@ set(WIDGET_ENTRY_POINT lib/afb-ucs2.so) # This include is mandatory and MUST happens at the end # of this file, else you expose you to unexpected behavior # ----------------------------------------------------------- -include(${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake)
\ No newline at end of file +include(${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake) diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in index e8bd7fb..48a839a 100644 --- a/conf.d/wgt/config.xml.in +++ b/conf.d/wgt/config.xml.in @@ -2,7 +2,7 @@ <widget xmlns="http://www.w3.org/ns/widgets" id="@PROJECT_NAME@" version="@PROJECT_VERSION@"> <name>@PROJECT_NAME@</name> <icon src="icon.png"/> - <content src="lib/@PROJECT_NAME@" type="application/vnd.agl.service"/> + <content src="lib/afb-ucs2.so" type="application/vnd.agl.service"/> <description>@PROJECT_DESCRIPTION@</description> <author>@PROJECT_AUTHOR@ <@PROJECT_AUTHOR_MAIL@></author> <license>APL 2.0</license> diff --git a/conf.d/xds/xds-config.env b/conf.d/xds/xds-config.env new file mode 100644 index 0000000..a7d39cc --- /dev/null +++ b/conf.d/xds/xds-config.env @@ -0,0 +1,12 @@ +XDS_PROJECT_ID="e50357ed-a777-11e7-885d-90b11c6bb221_Project_unicens2-bin" +XDS_SDK_ID="poky-agl_aarch64_4.90.0+snapshot" + +XDS_SERVER_URL=localhost:8000 + +#DOCKER_TARGET=agl-xds-shamash-0-claneys +PATH=/opt/bin:/opt/AGL/bin:/usr/lib64/ccache:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/home/claneys/.local/bin:/home/claneys/bin + +RSYNC_TARGET=root@sataran.uruk.home +RSYNC_PREFIX=/tmp +PROJECT_DIR=/home/claneys/Workspace/Sources/IOTbzh/unicens2-binding + |