summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-05-28 17:20:49 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-05-29 11:10:01 +0200
commit1e87365b113eb79bc12dbea4e9291050492b5a29 (patch)
treee84b3451f662162f7fc2d42984c0a0a0b39a6937
parentcd5b0a485a6de3e8c89c375901978f092cb2dea2 (diff)
Clean unused project files and update build script
Change-Id: I4f606005ee781716da52f2ef68e55eeb69026ce3 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rwxr-xr-xCAN-binder/build.mk16
-rw-r--r--CAN-binder/packaging/wgt/config.xml.in11
-rw-r--r--CAN-binder/packaging/wgt/etc/can_buses.json3
-rw-r--r--CAN-binder/packaging/wgt/icon.png.inbin4035 -> 0 bytes
-rwxr-xr-xbuild.sh2
5 files changed, 13 insertions, 19 deletions
diff --git a/CAN-binder/build.mk b/CAN-binder/build.mk
index 5f8f595..24244cf 100755
--- a/CAN-binder/build.mk
+++ b/CAN-binder/build.mk
@@ -15,7 +15,7 @@
# limitations under the License.
BUILD_DIR := build
-PACKAGING_DIR := packaging/wgt
+PACKAGING_DIR := conf.d/default/wgt
VPATH = etc:$(PACKAGING_DIR):$(PACKAGING_DIR)/etc:$(BUILD_DIR)
@@ -27,12 +27,12 @@ clean:
@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
mrproper:
- @rm -rf ${BUILD_DIR}
+ @rm -rf ${BUILD_DIR} package packaging
-build: ${BUILD_DIR}/Makefile
+build: conf.d/default/cmake config.xml.in icon-default.png ${BUILD_DIR}/Makefile
@cmake --build ${BUILD_DIR} --target all
-package: config.xml.in icon.png.in build | $(PKG_FILELIST)
+package: build | $(PKG_FILELIST)
@mkdir -p ${BUILD_DIR}/$@/bin
@mkdir -p ${BUILD_DIR}/$@/etc
@mkdir -p ${BUILD_DIR}/$@/lib
@@ -45,3 +45,11 @@ package: config.xml.in icon.png.in build | $(PKG_FILELIST)
${BUILD_DIR}/Makefile:
@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CMAKE_OPTS} ..)
+
+submodule:
+ @[ -d conf.d/default/cmake ] || git submodule init
+ @[ -d conf.d/default/cmake ] || git submodule update
+
+conf.d/default/cmake: submodule
+config.xml.in: submodule
+icon-default.png: submodule
diff --git a/CAN-binder/packaging/wgt/config.xml.in b/CAN-binder/packaging/wgt/config.xml.in
deleted file mode 100644
index 99c0168..0000000
--- a/CAN-binder/packaging/wgt/config.xml.in
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" id="@PROJECT_NAME@" version="@PROJECT_VERSION@">
- <name>@PROJECT_NAME@</name>
- <icon src="icon.png"/>
- <content src="htdocs/index.html" type="application/vnd.agl.html.hybrid"/>
- <description>@PROJECT_DESCRIPTION@</description>
- <author>Romain Forlot &lt;romain.forlot@iot.bzh&gt;</author>
- <license>APL 2.0</license>
-</widget>
-
-
diff --git a/CAN-binder/packaging/wgt/etc/can_buses.json b/CAN-binder/packaging/wgt/etc/can_buses.json
deleted file mode 100644
index c4292df..0000000
--- a/CAN-binder/packaging/wgt/etc/can_buses.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "canbus": "can0"
-}
diff --git a/CAN-binder/packaging/wgt/icon.png.in b/CAN-binder/packaging/wgt/icon.png.in
deleted file mode 100644
index 9bd6a6e..0000000
--- a/CAN-binder/packaging/wgt/icon.png.in
+++ /dev/null
Binary files differ
diff --git a/build.sh b/build.sh
index 64bd7f5..393677a 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
#!/bin/bash
cd CAN-config-generator && make build && cd -
-cd CAN-binder && make build && cd -
+cd CAN-binder && ./build.mk mrproper && ./build.mk build && cd -