summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf.d/packaging/deb/agl-app-afb-test.dsc3
-rw-r--r--conf.d/packaging/deb/debian.control11
-rw-r--r--conf.d/packaging/deb/debian.rules89
-rw-r--r--conf.d/packaging/project_version.patch13
-rw-r--r--conf.d/packaging/rpm/agl-app-afb-test.spec9
5 files changed, 25 insertions, 100 deletions
diff --git a/conf.d/packaging/deb/agl-app-afb-test.dsc b/conf.d/packaging/deb/agl-app-afb-test.dsc
index 2ae81ca..61c5ed1 100644
--- a/conf.d/packaging/deb/agl-app-afb-test.dsc
+++ b/conf.d/packaging/deb/agl-app-afb-test.dsc
@@ -3,13 +3,14 @@ Source: agl-app-afb-test
Binary: agl-app-afb-test-bin, agl-app-afb-test-dev
Architecture: any
Version: 2.0-0
-Maintainer: unknown <unknown@debian.org>
+Maintainer: romain.forlot <romain.forlot@iot.bzh>
Standards-Version: 3.8.2
Homepage: https://gerrit.automotivelinux.org/gerrit/apps/app-afb-test
Build-Depends: debhelper (>= 5),
pkg-config,
dpkg-dev,
cmake,
+ agl-cmake-apps-module-bin,
agl-app-framework-binder-bin,
agl-app-framework-binder-dev,
lua5.3,
diff --git a/conf.d/packaging/deb/debian.control b/conf.d/packaging/deb/debian.control
index feffc1b..ee59c9b 100644
--- a/conf.d/packaging/deb/debian.control
+++ b/conf.d/packaging/deb/debian.control
@@ -1,17 +1,24 @@
Priority: optional
-Maintainer: unknown <unknown@debian.org>
+Maintainer: romain.forlot <romain.forlot@iot.bzh>
Source: agl-app-afb-test
Build-Depends:
debhelper (>= 5),
pkg-config,
cmake,
+ agl-cmake-apps-module-bin,
+ agl-app-framework-binder-bin,
+ agl-app-framework-binder-dev,
+ lua5.3,
+ liblua5.3-dev,
+ libjson-c-dev,
+ libsystemd-dev,
Standards-Version: 3.8.2
Homepage: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/app-afb-test
Package: agl-app-afb-test-bin
Section: libs
Architecture: any
-Description: agl-app-afb-test
+Description: afb-test is a test framework made to test other binding.
Package: agl-app-afb-test-dev
Section: libs
diff --git a/conf.d/packaging/deb/debian.rules b/conf.d/packaging/deb/debian.rules
index d159744..4637103 100644
--- a/conf.d/packaging/deb/debian.rules
+++ b/conf.d/packaging/deb/debian.rules
@@ -1,85 +1,18 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+%:
+ bash /etc/profile.d/AGL-app-framework-binder.sh
+ dh $@
+override_dh_auto_configure:
+ dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/opt/AGL -DCMAKE_INSTALL_LIBDIR:PATH=lib/${DEB_HOST_MULTIARCH}
-CFLAGS = -Wall -g
+override_dh_auto_install:
+ dh_auto_install --destdir=/usr/src/packages/BUILD/debian/tmp
+ mkdir -p debian/tmp/opt/AGL/afm/applications/
+ mv debian/tmp/opt/AGL/afTest/ debian/tmp/opt/AGL/afm/applications/
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- #
- touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- patch -p1 < ../SOURCES/project_version.patch
- mkdir -p build
- export PKG_CONFIG_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
- cd build && \
- cmake -DCMAKE_INSTALL_PREFIX:PATH=/opt/AGL -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_INSTALL_LIBDIR:PATH=lib/$(DEB_HOST_MULTIARCH) .. && \
- $(MAKE)
- touch build-stamp
-
-clean:
- #dh_testdir
- dh_testroot
- rm -f configure-stamp build-stamp
- [ ! -f Makefile ] || $(MAKE) distclean
- #dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- # Add here commands to install the package into debian/tmp
- cd build && \
- make install DESTDIR=/usr/src/packages/BUILD/debian/tmp
- mkdir -p /usr/src/packages/BUILD/debian/tmp/opt/AGL/afm/applications/
- mv /usr/src/packages/BUILD/debian/tmp/opt/AGL/afTest /usr/src/packages/BUILD/debian/tmp/opt/AGL/afm/applications/
- # Move all files in their corresponding package
- dh_install --list-missing -a --sourcedir=debian/tmp
- # empty dependency_libs in .la files
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs -V
- dh_installdeb
- #dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_test:
diff --git a/conf.d/packaging/project_version.patch b/conf.d/packaging/project_version.patch
deleted file mode 100644
index 0e9ab8f..0000000
--- a/conf.d/packaging/project_version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/conf.d/app-templates/cmake/common.cmake b/conf.d/app-templates/cmake/common.cmake
-index 77ecd3f..f17a567 100644
---- a/conf.d/app-templates/cmake/common.cmake
-+++ b/conf.d/app-templates/cmake/common.cmake
-@@ -100,7 +100,7 @@ configure_files_in_dir(${PROJECT_APP_TEMPLATES_DIR}/${ENTRY_POINT}/template.d)
- configure_files_in_dir($ENV{HOME}/.config/app-templates/scripts)
- configure_files_in_dir(/etc/app-templates/scripts)
-
--check_version()
-+#check_version()
- project_targets_populate()
- remote_targets_populate()
- project_package_build()
diff --git a/conf.d/packaging/rpm/agl-app-afb-test.spec b/conf.d/packaging/rpm/agl-app-afb-test.spec
index bf02a07..c1df845 100644
--- a/conf.d/packaging/rpm/agl-app-afb-test.spec
+++ b/conf.d/packaging/rpm/agl-app-afb-test.spec
@@ -19,9 +19,9 @@ Summary: AGL app-afb-test
Group: Development/Libraries/C and C++
Url: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/app-afb-test
Source: app-afb-test-%{version}.tar.gz
-Patch0: project_version.patch
BuildRequires: pkgconfig(lua) >= 5.3
BuildRequires: cmake
+BuildRequires: agl-cmake-apps-module
BuildRequires: gcc-c++
BuildRequires: pkgconfig(json-c)
BuildRequires: pkgconfig(afb-daemon)
@@ -30,8 +30,7 @@ BuildRequires: pkgconfig(libsystemd) >= 222
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-This is a migration of former app-templates git submodule which let you ease the
-development of apps and widget building.
+afb-test is a test framework made to test other binding.
%package devel
Group: Development/Libraries/C and C++
@@ -39,12 +38,10 @@ Requires: %{name} = %{version}
Provides: pkgconfig(%{name}) = %{version}
Summary: AGL app-afb-test-devel
%description devel
-This is a migration of former app-templates git submodule which let you ease the
-development of apps and widget building.
+afb-test is a test framework made to test other binding.
%prep
%setup -q -n app-afb-test-%{version}
-%patch0 -p1
%build
export PKG_CONFIG_PATH=%{_libdir}/pkgconfig