From 9b9fd8aaa1336ab71ff63b9cfcbbcca920c74071 Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Wed, 8 Jan 2014 19:00:12 +0100 Subject: Read the configuration version from a file --- main/configure.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'main/configure.in') diff --git a/main/configure.in b/main/configure.in index 8179d4a454..7ca916394c 100644 --- a/main/configure.in +++ b/main/configure.in @@ -1,4 +1,4 @@ -AC_INIT([monodevelop], 4.2.3, [monodevelop-list@lists.ximian.com]) +AC_INIT([monodevelop], m4_esyscmd_s([grep ^Version version.txt|cut -d '=' -f 2|tr -d '\n']), [monodevelop-list@lists.ximian.com]) AC_PREREQ(2.53) AM_INIT_AUTOMAKE([1.10 tar-ustar]) AM_MAINTAINER_MODE @@ -12,9 +12,9 @@ ASSEMBLY_VERSION=4.0.0.0 # the C# side of things. It should be one of the following two formats: # 1) "VERSION_NUMBER" "2.0" # 2) "VERSION_NUMBER BUILD_TYPE BUILD_NUMBER" "2.0 Alpha 1" -PACKAGE_VERSION_LABEL="4.2.3" +PACKAGE_VERSION_LABEL="m4_esyscmd_s([grep ^Label version.txt|cut -d "=" -f 2|tr -d '\n'])" -COMPAT_ADDIN_VERSION=4.0 +COMPAT_ADDIN_VERSION=m4_esyscmd_s([grep ^CompatVersion version.txt|cut -d "=" -f 2|tr -d '\n']) AC_PATH_PROG(MONO, mono) AC_PATH_PROG(MCS, gmcs) @@ -356,6 +356,9 @@ echo "" echo "Configuration summary" echo "" echo " * Installation prefix = $prefix" +echo " * Version = $VERSION" +echo " * Version Label = $PACKAGE_VERSION_LABEL" +echo " * Compat Version = $COMPAT_ADDIN_VERSION" echo " * C# compiler = $CSC" echo " * Mono class library development extensions: $enable_monoextensions" echo " * Version control providers:" -- cgit v1.2.3 From a8e39aae770e008e0f240b0e3eda899afd38f8de Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Thu, 9 Jan 2014 12:26:28 +0100 Subject: version.txt has been moved to the root dir --- main/configure.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'main/configure.in') diff --git a/main/configure.in b/main/configure.in index 7ca916394c..2f76068b73 100644 --- a/main/configure.in +++ b/main/configure.in @@ -1,4 +1,4 @@ -AC_INIT([monodevelop], m4_esyscmd_s([grep ^Version version.txt|cut -d '=' -f 2|tr -d '\n']), [monodevelop-list@lists.ximian.com]) +AC_INIT([monodevelop], m4_esyscmd_s([grep ^Version ../version.txt|cut -d '=' -f 2|tr -d '\n']), [monodevelop-list@lists.ximian.com]) AC_PREREQ(2.53) AM_INIT_AUTOMAKE([1.10 tar-ustar]) AM_MAINTAINER_MODE @@ -12,9 +12,9 @@ ASSEMBLY_VERSION=4.0.0.0 # the C# side of things. It should be one of the following two formats: # 1) "VERSION_NUMBER" "2.0" # 2) "VERSION_NUMBER BUILD_TYPE BUILD_NUMBER" "2.0 Alpha 1" -PACKAGE_VERSION_LABEL="m4_esyscmd_s([grep ^Label version.txt|cut -d "=" -f 2|tr -d '\n'])" +PACKAGE_VERSION_LABEL="m4_esyscmd_s([grep ^Label ../version.txt|cut -d "=" -f 2|tr -d '\n'])" -COMPAT_ADDIN_VERSION=m4_esyscmd_s([grep ^CompatVersion version.txt|cut -d "=" -f 2|tr -d '\n']) +COMPAT_ADDIN_VERSION=m4_esyscmd_s([grep ^CompatVersion ../version.txt|cut -d "=" -f 2|tr -d '\n']) AC_PATH_PROG(MONO, mono) AC_PATH_PROG(MCS, gmcs) -- cgit v1.2.3 From 86c4eaf5ecba29127563474d1e2a803dae7ec835 Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Sun, 26 Jan 2014 11:20:15 +0100 Subject: [Core] Generate the BuildVariables.cs files in the msbuild project --- main/configure.in | 1 - 1 file changed, 1 deletion(-) (limited to 'main/configure.in') diff --git a/main/configure.in b/main/configure.in index 2f76068b73..bcfe2bd2e9 100644 --- a/main/configure.in +++ b/main/configure.in @@ -276,7 +276,6 @@ src/Makefile src/core/Makefile src/core/Mono.Texteditor/Makefile src/core/MonoDevelop.Core/Makefile -src/core/MonoDevelop.Core/BuildVariables.cs src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile src/core/MonoDevelop.Ide/Makefile src/core/MonoDevelop.Startup/Makefile -- cgit v1.2.3 From 03558eed3eb65ecc8022bf69206a1166c16f6579 Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Thu, 6 Feb 2014 22:37:32 +0100 Subject: Changed version config file to version.config --- main/configure.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'main/configure.in') diff --git a/main/configure.in b/main/configure.in index bcfe2bd2e9..ebf27b8d7a 100644 --- a/main/configure.in +++ b/main/configure.in @@ -1,4 +1,4 @@ -AC_INIT([monodevelop], m4_esyscmd_s([grep ^Version ../version.txt|cut -d '=' -f 2|tr -d '\n']), [monodevelop-list@lists.ximian.com]) +AC_INIT([monodevelop], m4_esyscmd_s([grep ^Version ../version.config|cut -d '=' -f 2|tr -d '\n']), [monodevelop-list@lists.ximian.com]) AC_PREREQ(2.53) AM_INIT_AUTOMAKE([1.10 tar-ustar]) AM_MAINTAINER_MODE @@ -12,9 +12,9 @@ ASSEMBLY_VERSION=4.0.0.0 # the C# side of things. It should be one of the following two formats: # 1) "VERSION_NUMBER" "2.0" # 2) "VERSION_NUMBER BUILD_TYPE BUILD_NUMBER" "2.0 Alpha 1" -PACKAGE_VERSION_LABEL="m4_esyscmd_s([grep ^Label ../version.txt|cut -d "=" -f 2|tr -d '\n'])" +PACKAGE_VERSION_LABEL="m4_esyscmd_s([grep ^Label ../version.config|cut -d "=" -f 2|tr -d '\n'])" -COMPAT_ADDIN_VERSION=m4_esyscmd_s([grep ^CompatVersion ../version.txt|cut -d "=" -f 2|tr -d '\n']) +COMPAT_ADDIN_VERSION=m4_esyscmd_s([grep ^CompatVersion ../version.config|cut -d "=" -f 2|tr -d '\n']) AC_PATH_PROG(MONO, mono) AC_PATH_PROG(MCS, gmcs) -- cgit v1.2.3