[gnome-desktop] Add back gnome-version.xml
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-desktop] Add back gnome-version.xml
- Date: Mon, 10 Jan 2011 21:56:51 +0000 (UTC)
commit 3d5bacf61fd935ec1aa0c7a515d1778b3ca31f4d
Author: William Jon McCann <jmccann redhat com>
Date: Mon Jan 10 16:14:40 2011 -0500
Add back gnome-version.xml
Makefile.am | 7 +++++++
configure.ac | 34 ++++++++++++++++++++++++++++++++++
gnome-version.xml.in.in | 8 ++++++++
3 files changed, 49 insertions(+), 0 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c804999..f0a51b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,9 @@ ACLOCAL_AMFLAGS = -I m4
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
+versiondir = $(datadir)/gnome
+version_DATA = gnome-version.xml
+
@INTLTOOL_XML_RULE@
EXTRA_DIST = \
@@ -15,8 +18,12 @@ EXTRA_DIST = \
HACKING \
MAINTAINERS \
ChangeLog.pre-git \
+ gnome-version.xml.in.in \
gnome-doc-utils.make
+CLEANFILES = \
+ $(version_DATA)
+
DISTCLEANFILES = \
gnome-doc-utils.make
diff --git a/configure.ac b/configure.ac
index 327cb40..db80cc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,38 @@ AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
+GNOME_PLATFORM=gnome_platform
+GNOME_MINOR=gnome_minor
+GNOME_MICRO=gnome_micro
+GNOME_DISTRIBUTOR="GNOME.Org"
+GNOME_DATE=`date +"%Y-%m-%d"`
+
+AC_ARG_WITH(gnome_distributor, [ --with-gnome-distributor=DISTRIBUTOR Specify name of GNOME distributor])
+
+if test "x$with_gnome_distributor" != x ; then
+ GNOME_DISTRIBUTOR=$with_gnome_distributor
+fi
+
+AC_ARG_ENABLE([date-in-gnome-version],
+ [AS_HELP_STRING([--disable-date-in-gnome-version],[do not put the build date in gnome-version.xml])],
+ [],[enable_date_in_gnome_version=yes])
+if test "$enable_date_in_gnome_version" = "no"; then
+ GNOME_DATE=
+ GNOME_DATE_COMMENT_START="<!--"
+ GNOME_DATE_COMMENT_END="-->"
+else
+ GNOME_DATE_COMMENT_START=
+ GNOME_DATE_COMMENT_END=
+fi
+
+AC_SUBST(GNOME_PLATFORM)
+AC_SUBST(GNOME_MINOR)
+AC_SUBST(GNOME_MICRO)
+AC_SUBST(GNOME_DISTRIBUTOR)
+AC_SUBST(GNOME_DATE)
+AC_SUBST(GNOME_DATE_COMMENT_START)
+AC_SUBST(GNOME_DATE_COMMENT_END)
+
GNOME_COMMON_INIT
GNOME_DEBUG_CHECK
GNOME_COMPILE_WARNINGS([maximum])
@@ -193,6 +225,7 @@ libgnome-desktop/gnome-desktop-3.0-uninstalled.pc
docs/Makefile
docs/reference/Makefile
docs/reference/gnome-desktop3/Makefile
+gnome-version.xml.in
po/Makefile.in
desktop-docs/Makefile
desktop-docs/fdl/Makefile
@@ -225,6 +258,7 @@ echo "
Use *_DISABLE_DEPRECATED: ${enable_deprecation_flags}
Build desktop-wide docs: ${enable_desktop_docs}
+ Date in gnome-version.xml: ${enable_date_in_gnome_version}
Use external pnp.ids: ${EXTERNAL_PNP_IDS}
Startup notification support: ${have_startup_notification}
XRandr support: ${have_randr}
diff --git a/gnome-version.xml.in.in b/gnome-version.xml.in.in
new file mode 100644
index 0000000..83264c6
--- /dev/null
+++ b/gnome-version.xml.in.in
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<gnome-version>
+ <platform>@GNOME_PLATFORM@</platform>
+ <minor>@GNOME_MINOR@</minor>
+ <micro>@GNOME_MICRO@</micro>
+ <distributor>@GNOME_DISTRIBUTOR@</distributor>
+ @GNOME_DATE_COMMENT_START@<date>@GNOME_DATE@</date>@GNOME_DATE_COMMENT_END@
+</gnome-version>
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]