From 62d01fc8749606d8fc4614d897044462a6d703fc Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Fri, 18 Oct 2013 14:22:54 -0500
Subject: replace autotools with cmake

---
 data/CMakeLists.txt | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 data/CMakeLists.txt

(limited to 'data/CMakeLists.txt')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
new file mode 100644
index 0000000..f0738b3
--- /dev/null
+++ b/data/CMakeLists.txt
@@ -0,0 +1,74 @@
+##
+##  GSettings schema
+##
+
+include (UseGSettings)
+set (SCHEMA_NAME "com.canonical.indicator.datetime.gschema.xml")
+set (SCHEMA_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}")
+add_schema (${SCHEMA_FILE})
+
+
+##
+##  DBus Service File
+##
+
+# where to install
+set (DBUS_SERVICE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/services")
+message (STATUS "${DBUS_SERVICE_DIR} is the DBus Service File install dir")
+
+set (SERVICE_NAME "${CMAKE_PROJECT_NAME}.service")
+set (SERVICE_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NAME}")
+set (SERVICE_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_NAME}.in")
+
+# build it
+set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
+configure_file ("${SERVICE_FILE_IN}" "${SERVICE_FILE}")
+
+# install it
+install (FILES "${SERVICE_FILE}"
+         DESTINATION "${DBUS_SERVICE_DIR}")
+
+
+##
+##  Unity Indicator File
+##
+
+# where to install
+set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/unity/indicators")
+message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir")
+
+set (UNITY_INDICATOR_NAME "com.canonical.indicator.datetime")
+set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}")
+
+install (FILES "${UNITY_INDICATOR_FILE}"
+         DESTINATION "${UNITY_INDICATOR_DIR}")
+
+
+##
+##  FIXME: gnome-control-center panel
+##
+
+if (BUILD_PANEL)
+
+  install (FILES "datetime-dialog.ui"
+           DESTINATION "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}")
+
+  # generate the desktop file using intltool
+  set (DESKTOP_NAME "gnome-indicator-datetime-panel.desktop")
+  set (DESKTOP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_NAME}")
+  set (DESKTOP_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${DESKTOP_NAME}.in")
+  set (ENV{LC_ALL} "C")
+  execute_process (COMMAND intltool-merge -quiet --xml-style --utf8 --no-translations "${DESKTOP_FILE_IN}" "${DESKTOP_FILE}")
+  install (FILES ${DESKTOP_FILE}
+           DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
+
+endif ()
+
+#if BUILD_CCPANEL
+# @INTLTOOL_DESKTOP_RULE@
+# desktopdir = $(datadir)/applications
+# desktop_DATA = gnome-indicator-datetime-panel.desktop
+# EXTRA_DIST += $(desktop_DATA)
+# CLEANFILES += $(desktop_DATA)
+#endif
+#EXTRA_DIST += datetime-dialog.ui $(desktop_DATA:.desktop=.desktop.in)
-- 
cgit v1.2.3


From ad4f98ea56af0ce143b369abf55e35c22f29e3b5 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Fri, 18 Oct 2013 14:46:46 -0500
Subject: fix .desktop file generation in CMake

---
 data/CMakeLists.txt | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'data/CMakeLists.txt')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index f0738b3..76a348e 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -58,17 +58,8 @@ if (BUILD_PANEL)
   set (DESKTOP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_NAME}")
   set (DESKTOP_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${DESKTOP_NAME}.in")
   set (ENV{LC_ALL} "C")
-  execute_process (COMMAND intltool-merge -quiet --xml-style --utf8 --no-translations "${DESKTOP_FILE_IN}" "${DESKTOP_FILE}")
+  execute_process (COMMAND intltool-merge -quiet --desktop-style --utf8 "${CMAKE_SOURCE_DIR}/po" "${DESKTOP_FILE_IN}" "${DESKTOP_FILE}")
   install (FILES ${DESKTOP_FILE}
            DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
 
 endif ()
-
-#if BUILD_CCPANEL
-# @INTLTOOL_DESKTOP_RULE@
-# desktopdir = $(datadir)/applications
-# desktop_DATA = gnome-indicator-datetime-panel.desktop
-# EXTRA_DIST += $(desktop_DATA)
-# CLEANFILES += $(desktop_DATA)
-#endif
-#EXTRA_DIST += datetime-dialog.ui $(desktop_DATA:.desktop=.desktop.in)
-- 
cgit v1.2.3


From 02e2a8f982de341fbfa3f17fa0feee485339e6c5 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 29 Oct 2013 09:50:36 -0700
Subject: remove the panel FIXME comments in data/CMakeLists.txt b/c the .ui
 and .desktop files are being installed now

---
 data/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'data/CMakeLists.txt')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 76a348e..197c5c6 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -45,15 +45,16 @@ install (FILES "${UNITY_INDICATOR_FILE}"
 
 
 ##
-##  FIXME: gnome-control-center panel
+##  gnome-control-center panel: .ui and .desktop files
 ##
 
 if (BUILD_PANEL)
 
+  # the .ui file
   install (FILES "datetime-dialog.ui"
            DESTINATION "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}")
 
-  # generate the desktop file using intltool
+  # the .desktop file
   set (DESKTOP_NAME "gnome-indicator-datetime-panel.desktop")
   set (DESKTOP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_NAME}")
   set (DESKTOP_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${DESKTOP_NAME}.in")
-- 
cgit v1.2.3