From 3e74ff0f7aa665cc78ec9f39cf11c72743325e33 Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Tue, 3 Aug 2010 10:40:10 +0200 Subject: [PATCH] [build] Add a variable for the assembly version number Assembly version numbers can only have numbers and dots, so we need to differentiate those from the package version, which can be something like "0.2-alpha1". We just need to make sure both values are updated when appropriate. --- SparkleLib/AssemblyInfo.cs.in | 2 +- configure.ac | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/SparkleLib/AssemblyInfo.cs.in b/SparkleLib/AssemblyInfo.cs.in index bd5ac1af..11ce20de 100644 --- a/SparkleLib/AssemblyInfo.cs.in +++ b/SparkleLib/AssemblyInfo.cs.in @@ -7,5 +7,5 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly: AssemblyVersion("@VERSION@")] +[assembly: AssemblyVersion("@ASM_VERSION@")] [assembly: AssemblyTitle ("SparkleShare")] diff --git a/configure.ac b/configure.ac index 5601fa7f..26d593d9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,18 @@ -dnl Warning: This is an automatically generated file, do not edit! dnl Process this file with autoconf to produce a configure script. +m4_define([sparkleshare_version], + [0.2-alpha1]) + +m4_define([sparkleshare_asm_version], + [0.2]) + AC_PREREQ([2.54]) -AC_INIT([SparkleShare], [0.1]) +AC_INIT([SparkleShare], sparkleshare_version) AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-zip foreign]) AM_MAINTAINER_MODE +dnl Export Version Info +AC_SUBST([ASM_VERSION], [sparkleshare_asm_version]) + dnl pkg-config AC_PATH_PROG(PKG_CONFIG, pkg-config, no) if test "x$PKG_CONFIG" = "xno"; then