Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorLluis Sanchez <lluis@xamarin.com>2014-02-07 01:37:32 +0400
committerLluis Sanchez <lluis@xamarin.com>2014-02-07 01:37:32 +0400
commit03558eed3eb65ecc8022bf69206a1166c16f6579 (patch)
treee773fe2e1aafbf3e9874e852bd3e80edcc1ddf62 /main
parentb578ae22e763403a8754ac084a3ef3c49a341265 (diff)
Changed version config file to version.config
Diffstat (limited to 'main')
-rw-r--r--main/configure.in6
-rw-r--r--main/src/core/MonoDevelop.Core/BuildVariables.gen.cs4
2 files changed, 5 insertions, 5 deletions
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"));