diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-02-07 01:37:32 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-02-07 01:37:32 +0400 |
| commit | 03558eed3eb65ecc8022bf69206a1166c16f6579 (patch) | |
| tree | e773fe2e1aafbf3e9874e852bd3e80edcc1ddf62 | |
| parent | b578ae22e763403a8754ac084a3ef3c49a341265 (diff) | |
Changed version config file to version.config
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | main/configure.in | 6 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Core/BuildVariables.gen.cs | 4 | ||||
| -rwxr-xr-x | version-checks | 4 | ||||
| -rw-r--r-- | version.config (renamed from version.txt) | 0 |
5 files changed, 10 insertions, 10 deletions
@@ -180,9 +180,9 @@ configure_packages () create_local_config () { - # Get the version from the version.txt file, if it exists - if test -a version.txt; then - ver=`grep ^Version version.txt|cut -d '=' -f 2|tr -d '\n'` + # Get the version from the version.config file, if it exists + if test -a version.config; then + ver=`grep ^Version version.config|cut -d '=' -f 2|tr -d '\n'` else ver=VERSION fi 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) diff --git a/main/src/core/MonoDevelop.Core/BuildVariables.gen.cs b/main/src/core/MonoDevelop.Core/BuildVariables.gen.cs index 3becef3c88..17825183bb 100644 --- a/main/src/core/MonoDevelop.Core/BuildVariables.gen.cs +++ b/main/src/core/MonoDevelop.Core/BuildVariables.gen.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Linq; @@ -9,7 +9,7 @@ namespace Application public static void Main (string[] args) { var dir = args [0]; - var lines = File.ReadAllLines (Path.Combine (dir, "..", "..", "..", "..", "version.txt")); + var lines = File.ReadAllLines (Path.Combine (dir, "..", "..", "..", "..", "version.config”)); var txt = File.ReadAllText (Path.Combine (dir, "BuildVariables.cs.in")); txt = txt.Replace ("@PACKAGE_VERSION@", GetValue (lines, "Version")); txt = txt.Replace ("@PACKAGE_VERSION_LABEL@", GetValue (lines, "Label")); diff --git a/version-checks b/version-checks index 03e9a538f5..6d2b73a3f2 100755 --- a/version-checks +++ b/version-checks @@ -17,8 +17,8 @@ DEP[0]=md-addins DEP_NAME[0]=MDADDINS DEP_PATH[0]=${top_srcdir}/../md-addins DEP_MODULE[0]=git@github.com:xamarin/md-addins.git -DEP_NEEDED_VERSION[0]=91174019a01e67280f820d909a9c4f8fdd7fd41e -DEP_BRANCH_AND_REMOTE[0]="master origin/master" +DEP_NEEDED_VERSION[0]=d805c8c6fb69a4b3c7fde3741c558cf7bd0fb56c +DEP_BRANCH_AND_REMOTE[0]="deps-in-attributes origin/deps-in-attributes" # heap-shot DEP[1]=heap-shot diff --git a/version.txt b/version.config index e4dc07ab59..e4dc07ab59 100644 --- a/version.txt +++ b/version.config |