summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2015-12-21 10:45:58 +0100
committerJosé Bollo <jose.bollo@iot.bzh>2015-12-21 10:45:58 +0100
commiteab449dec6b13464db5277c54ac23fc30d896353 (patch)
tree045239ab0755a58f6b97f61dc702859fd4f32f37
parent2af512e7b590baa8754c643b60ae9dac8bcdc4b8 (diff)
Improves the packaging, adds comments
Change-Id: Ib9eb3bf010814ea043e838f2e97a692ecd12514b
-rw-r--r--.gitignore8
-rw-r--r--CMakeLists.txt13
-rw-r--r--INSTALL3
-rw-r--r--README14
-rw-r--r--TODO6
-rw-r--r--src/CMakeLists.txt2
6 files changed, 34 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index 95beedb..312f525 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,14 @@ wgtpkg-installer
wgtpkg-pack
wgtpkg-sign
wgtpkg-info
-*.o
*.a
-TODO
+CMakeCache.txt
+CMakeFiles/
+Makefile
+cmake_install.cmake
+install_manifest.txt
+
a.pem
b.pem
ca-certificates/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0244ace..b76abb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,20 +20,17 @@ cmake_minimum_required(VERSION 2.8)
project("afm-main" LANGUAGES "C")
+include(GNUInstallDirs)
+
macro(setc name value)
if(NOT DEFINED ${name})
set(${name} "${value}")
endif(NOT DEFINED ${name})
endmacro(setc)
-setc(rootdir "")
-setc(sysconfdir "${rootdir}/etc")
-setc(prefix "${rootdir}/usr")
-setc(datadir "${prefix}/share")
-
setc(afm_name "aglfwk")
-setc(afm_confdir "${sysconfdir}/${afm_name}")
-setc(afm_datadir "${datadir}/${afm_name}")
+setc(afm_confdir "${CMAKE_INSTALL_FULL_SYSCONFDIR}/${afm_name}")
+setc(afm_datadir "${CMAKE_INSTALL_FULL_DATADIR}/${afm_name}")
setc(afm_appdir "${afm_datadir}/applications")
setc(afm_icondir "${afm_datadir}/icons")
setc(afm_prefix "urn:agl:")
@@ -43,7 +40,7 @@ setc(afm_user_appdir "app-data")
setc(wgtpkg_trusted_cert_dir "${afm_confdir}/certs")
macro(defstr name value)
- add_definitions("-D${name}=\"${value}\"")
+ add_definitions(-D${name}="${value}")
endmacro(defstr)
defstr(FWK_CONFIG_DIR "${afm_confdir}")
diff --git a/INSTALL b/INSTALL
index 13c68d4..0296b7b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -3,8 +3,7 @@ Installation Instructions
In a shell, type the following commands:
-autoreconf -if
-./configure
+cmake -DCMAKE_INSTALL_PREFIX=/ .
make
sudo make install
diff --git a/README b/README
index e69de29..a763b27 100644
--- a/README
+++ b/README
@@ -0,0 +1,14 @@
+= Summary
+
+This is the package **afm-main**.
+It stands for **AGL Framework Master - Main**.
+
+This package is providing few less behaviour that
+the following Tizen packages:
+- platform/appfw/app-installers
+- platform/core/security/cert-svc
+- platform/core/appfw/ail
+- platform/core/appfw/aul-1
+- platform/core/appfw/libslp-db-util
+
+
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..136911e
--- /dev/null
+++ b/TODO
@@ -0,0 +1,6 @@
+List of things to do
+- Implement CRL and OCSP parts of x509
+- Implement permissions grant based on certificates
+- more documentation
+- more launchers
+- notifications
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8bd7863..807d30d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -102,4 +102,6 @@ target_link_libraries(wgtpkg-installer wgtpkg wgt secwrp utils)
add_executable(af-usrd af-usrd.c)
target_link_libraries(af-usrd afm secwrp wgt utils)
+install(TARGETS wgtpkg-sign wgtpkg-pack wgtpkg-info wgtpkg-installer DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
+install(TARGETS af-usrd DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})