aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.in43
2 files changed, 40 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index b1109cfa4f..f22ee02239 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-16 JP Rosevear <jpr@novell.com>
+
+ * configure.in: bump version to 2.1.0 and set base version to 2.2;
+ define DEVELOPMENT here so we don't have to alter code to change
+ in future
+
2004-09-13 Tomasz Kłoczko <kloczek@pld.org.pl>
* data/evolution.desktop.in: added missing Encoding=UTF-8 field
diff --git a/configure.in b/configure.in
index 007e57c3bf..890b641688 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT(evolution, 1.5.94, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.1.0, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
AC_CONFIG_SRCDIR(README)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -16,6 +16,39 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
dnl Initialize maintainer mode
AM_MAINTAINER_MODE
+dnl *************************************************************************************************
+dnl Base Version
+dnl
+dnl This is for api/versioning tracking for things like bonobo .server files
+dnl
+dnl This should always be the major/minor of the stable version or stable version to be
+dnl *************************************************************************************************
+BASE_VERSION=2.2
+AC_SUBST(BASE_VERSION)
+AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)])
+
+dnl *************************************************************************************************
+dnl Updgrade Revision
+dnl
+dnl This is for triggering migration calls between varying versions.
+dnl
+dnl This should be reset to 0 whenever BASE_VERSION changes
+dnl *************************************************************************************************
+UPGRADE_REVISION=0
+AC_SUBST(UPGRADE_REVISION)
+AC_DEFINE_UNQUOTED(UPGRADE_REVISION, "$UPGRADE_REVISION", [The number of times we've upgraded since the BASE_VERSION release])
+
+dnl *************************************************************************************************
+dnl Development mode
+dnl
+dnl The controls whether things like the development warning in shell/main.c are displayed.
+dnl
+dnl This should be set to 0 for stable releases and 1 for unstable releases
+dnl *************************************************************************************************
+DEVELOPMENT=1
+AC_SUBST(UPGRADE_REVISION)
+AC_DEFINE(DEVELOPMENT, [If we are in development mode or not])
+
AC_ISC_POSIX
AC_PROG_CC
AC_PROG_CPP
@@ -1187,14 +1220,6 @@ EVO_SET_COMPILE_FLAGS(EVOLUTION_TEST, libgnome-2.0 libgnomeui-2.0 libbonobo-2.0
AC_SUBST(EVOLUTION_TEST_CFLAGS)
AC_SUBST(EVOLUTION_TEST_LIBS)
-BASE_VERSION=`echo $VERSION | awk -F. '{print $1 "." $2;}'`
-AC_SUBST(BASE_VERSION)
-AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)])
-
-UPGRADE_REVISION=12
-AC_SUBST(UPGRADE_REVISION)
-AC_DEFINE_UNQUOTED(UPGRADE_REVISION, "$UPGRADE_REVISION", [The number of times we've upgraded since the BASE_VERSION release])
-
dnl *******************
dnl Special directories
dnl *******************