aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------afb-utilities0
m---------conf.d/app-templates0
-rwxr-xr-xconf.d/autobuild/agl/autobuild28
-rwxr-xr-xconf.d/autobuild/linux/autobuild28
-rw-r--r--conf.d/cmake/00-debian-specific.cmake3
-rw-r--r--conf.d/cmake/00-default-osconfig.cmake1
-rw-r--r--high-can-binding/CMakeLists.txt6
-rw-r--r--high-can-binding/high-viwi-binding-hat.cpp (renamed from high-can-binding/high-can-binding-hat.cpp)0
-rw-r--r--high-can-binding/high-viwi-binding-hat.hpp (renamed from high-can-binding/high-can-binding-hat.hpp)0
-rw-r--r--high-can-binding/high-viwi-binding.cpp (renamed from high-can-binding/high-can-binding.cpp)0
10 files changed, 48 insertions, 18 deletions
diff --git a/afb-utilities b/afb-utilities
new file mode 160000
+Subproject c98436f85a94d621ef7236b0f32360437fcf4ab
diff --git a/conf.d/app-templates b/conf.d/app-templates
-Subproject e9a682f1c694eec242c3cebccc09380f621ade0
+Subproject bb3c5413dd0e2ff098a99748a53be1c66186f23
diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild
index 31e29f7..3a1ba5f 100755
--- a/conf.d/autobuild/agl/autobuild
+++ b/conf.d/autobuild/agl/autobuild
@@ -16,10 +16,28 @@
THISFILE := $(lastword $(MAKEFILE_LIST))
BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build)
+DEST := ${BUILD_DIR}/target
-.PHONY: all clean distclean configure build package
+.PHONY: all clean distclean configure build package help update
-all: build
+all: help
+
+help:
+ @echo "List of targets available:"
+ @echo ""
+ @echo "- all"
+ @echo "- clean"
+ @echo "- distclean"
+ @echo "- configure"
+ @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
@@ -38,9 +56,11 @@ package: build
@mkdir -p ${BUILD_DIR}/$@/lib
@mkdir -p ${BUILD_DIR}/$@/htdocs
@mkdir -p ${BUILD_DIR}/$@/data
- @[ "${DEST}" ] && mkdir -p ${DEST}
@cmake --build ${BUILD_DIR} --target widget
- @[ "${DEST}" ] && cp ${BUILD_DIR}/*wgt ${DEST}
+ @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}
diff --git a/conf.d/autobuild/linux/autobuild b/conf.d/autobuild/linux/autobuild
index 31e29f7..3a1ba5f 100755
--- a/conf.d/autobuild/linux/autobuild
+++ b/conf.d/autobuild/linux/autobuild
@@ -16,10 +16,28 @@
THISFILE := $(lastword $(MAKEFILE_LIST))
BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build)
+DEST := ${BUILD_DIR}/target
-.PHONY: all clean distclean configure build package
+.PHONY: all clean distclean configure build package help update
-all: build
+all: help
+
+help:
+ @echo "List of targets available:"
+ @echo ""
+ @echo "- all"
+ @echo "- clean"
+ @echo "- distclean"
+ @echo "- configure"
+ @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
@@ -38,9 +56,11 @@ package: build
@mkdir -p ${BUILD_DIR}/$@/lib
@mkdir -p ${BUILD_DIR}/$@/htdocs
@mkdir -p ${BUILD_DIR}/$@/data
- @[ "${DEST}" ] && mkdir -p ${DEST}
@cmake --build ${BUILD_DIR} --target widget
- @[ "${DEST}" ] && cp ${BUILD_DIR}/*wgt ${DEST}
+ @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}
diff --git a/conf.d/cmake/00-debian-specific.cmake b/conf.d/cmake/00-debian-specific.cmake
deleted file mode 100644
index dbdcdca..0000000
--- a/conf.d/cmake/00-debian-specific.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-list(APPEND PKG_REQUIRED_LIST lua-5.3>=5.3)
-set (EXTRA_REQUIRED_LIST lua5.3)
-set(LUA_CHECKER "luac5.3" "-p" CACHE STRING "LUA compiler")
diff --git a/conf.d/cmake/00-default-osconfig.cmake b/conf.d/cmake/00-default-osconfig.cmake
deleted file mode 100644
index a2b9325..0000000
--- a/conf.d/cmake/00-default-osconfig.cmake
+++ /dev/null
@@ -1 +0,0 @@
-list(APPEND PKG_REQUIRED_LIST lua>=5.3)
diff --git a/high-can-binding/CMakeLists.txt b/high-can-binding/CMakeLists.txt
index f8f1dc3..127f461 100644
--- a/high-can-binding/CMakeLists.txt
+++ b/high-can-binding/CMakeLists.txt
@@ -35,9 +35,3 @@ PROJECT_TARGET_ADD(high-viwi)
TARGET_LINK_LIBRARIES(${TARGET_NAME}
${link_libraries}
)
-
- # installation directory
- INSTALL(TARGETS ${TARGET_NAME}
- LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR})
-
- #build_widget("BINDING")
diff --git a/high-can-binding/high-can-binding-hat.cpp b/high-can-binding/high-viwi-binding-hat.cpp
index 6376cf0..6376cf0 100644
--- a/high-can-binding/high-can-binding-hat.cpp
+++ b/high-can-binding/high-viwi-binding-hat.cpp
diff --git a/high-can-binding/high-can-binding-hat.hpp b/high-can-binding/high-viwi-binding-hat.hpp
index 28e8306..28e8306 100644
--- a/high-can-binding/high-can-binding-hat.hpp
+++ b/high-can-binding/high-viwi-binding-hat.hpp
diff --git a/high-can-binding/high-can-binding.cpp b/high-can-binding/high-viwi-binding.cpp
index 2ded902..2ded902 100644
--- a/high-can-binding/high-can-binding.cpp
+++ b/high-can-binding/high-viwi-binding.cpp