billreminder r618 - in trunk: . data data/images src src/lib

[ogmaciel svn gnome org]

Author: ogmaciel
Date: Fri Aug 15 00:06:27 2008
New Revision: 618
URL: http://svn.gnome.org/viewvc/billreminder?rev=618&view=rev

Log:
Application version is now controled via autotools; added uninstall methods, thanks to Luix Armesto

Added:
   trunk/src/lib/defs.py.in
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/data/images/Makefile.am
   trunk/src/Makefile.am
   trunk/src/lib/Makefile.am
   trunk/src/lib/common.py

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Aug 15 00:06:27 2008
@@ -29,6 +29,8 @@
 fi
 AC_SUBST(DBUS_SERVICES_DIR)
 
+AC_SUBST(VERSION)
+
 AM_CHECK_PYMOD([gobject], , , AC_MSG_ERROR([Python module gobject required to run BillReminder]))
 AM_CHECK_PYMOD_VERSION([pysqlite2.dbapi2], [version], [2.3.0], , AC_MSG_ERROR([Python module pysqlite2 >= 2.3.0 required to run BillReminder]))
 AM_CHECK_PYMOD([dbus], , , AC_MSG_ERROR([Python module dbus required to run BillReminder]))

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Fri Aug 15 00:06:27 2008
@@ -21,7 +21,7 @@
 EXTRA_DIST += $(service_in_files)
 CLEANFILES = $(service_DATA)
 
-%.service: %.service.in
+billreminder.service: billreminder.service.in
 	sed -e s!\ bindir\@!$(bindir)! \
 	< $< > $@
 
@@ -55,3 +55,6 @@
 	@echo "***************************************************************"
 	@true
 endif
+
+uninstall-hook:
+	rm -fr $(configdir)

Modified: trunk/data/images/Makefile.am
==============================================================================
--- trunk/data/images/Makefile.am	(original)
+++ trunk/data/images/Makefile.am	Fri Aug 15 00:06:27 2008
@@ -71,7 +71,8 @@
 EXTRA_DIST += \
 	$(noinst_DATA) \
 	$(pixmap_DATA) \
-	$(tango_icons)
+	$(tango_icons) \
+	$(images_DATA)
 
 CLEANFILES =
 

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Aug 15 00:06:27 2008
@@ -8,4 +8,5 @@
 	billreminder.py \
 	billreminderd.py
 
-
+uninstall-hook:
+	rm -fr $(billreminderdir)

Modified: trunk/src/lib/Makefile.am
==============================================================================
--- trunk/src/lib/Makefile.am	(original)
+++ trunk/src/lib/Makefile.am	Fri Aug 15 00:06:27 2008
@@ -10,8 +10,22 @@
 	config.py \
 	dal.py \
 	dbus_actions.py \
+	defs.py \
 	dialogs.py \
 	i18n.py \
 	migrate_to_gconf.py \
 	scheduler.py \
 	utils.py
+
+defs.py: defs.py.in
+	sed -e s!\ VERSION\@!$(VERSION)! \
+	< $< > $@
+
+CLEANFILES = \
+	defs.py
+	
+DISTCLEANFILES = \
+	$(CLEANFILES)
+	
+EXTRA_DIST = \
+	defs.py.in

Modified: trunk/src/lib/common.py
==============================================================================
--- trunk/src/lib/common.py	(original)
+++ trunk/src/lib/common.py	Fri Aug 15 00:06:27 2008
@@ -3,11 +3,15 @@
 import os
 import i18n
 
+try:
+    from defs import *
+except:
+    APPVERSION = "0.3.2"
+
 datadir = "/usr/share"
 
 # Application info
 APPNAME = "BillReminder"
-APPVERSION = "0.3.2"
 COPYRIGHTS = "%s - Copyright (c) 2006-2008\n" \
              "Og Maciel <ogmaciel gnome org>" % APPNAME
 WEBSITE = "http://billreminder.gnulinuxbrasil.org/";

Added: trunk/src/lib/defs.py.in
==============================================================================
--- (empty file)
+++ trunk/src/lib/defs.py.in	Fri Aug 15 00:06:27 2008
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+APPVERSION = "@VERSION@"
\ No newline at end of file