Merge remote-tracking branch 'origin/master' into fsharp

Conflicts:
	version-checks

.gitignore

@@ -24,6 +24,8 @@ obj/
 /main/tests/Ide.Tests/bin
 /main/src/addins/MonoDevelop.Debugger.Win32/CorApi/bin
 /main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/bin
+/main/src/core/MonoDevelop.Core/BuildVariables.cs
+/scripts/configure.exe
 
 #VS writes these sometimes even when it doesn't change anything
 /main/_UpgradeReport_Files

README.md

@@ -55,10 +55,10 @@ Bear in mind that if you are installing under a custom prefix, you may need to m
 *(It's possible that you need to install for your locale to be
 correctly set.)*
 
-Packaging for OSX
+Packaging for OS X
 -----------------
 
-To package MonoDevelop for OSX in a convenient MonoDevelop.app
+To package MonoDevelop for OS X in a convenient MonoDevelop.app
 file, just do this after MonoDevelop has finished building (with
 `make`):
 `cd main/build/MacOSX ; make MonoDevelop.app`

configure

@@ -191,11 +191,9 @@ configure_packages ()
 
 create_local_config ()
 {
-	# Get the version from configure.in, if it exists
-	if test -a $path/configure.in; then
-		ver=`grep AC_INIT $path/configure.in | cut -d "," -f 2 | sed "s/ //"`
-	elif test -a $path/configure; then
-		ver=`grep ^VERSION= $path/configure | cut -d "=" -f 2 | sed "s/ //"`
+	# 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

extras/MonoDevelop.Database/configure.in

@@ -1,4 +1,4 @@
-AC_INIT([monodevelop-database], 4.2.3, [monodevelop-list@lists.ximian.com])
+AC_INIT([monodevelop-database], 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.9 tar-ustar])
 AM_MAINTAINER_MODE

main/Main.sln

@@ -310,10 +310,13 @@ Global
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Release|x86.ActiveCfg = Release|Any CPU
 		{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Release|x86.Build.0 = Release|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.Debug|x86.Build.0 = Debug|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+		{07F55155-51A8-4072-9F80-FA473666F086}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.Release|x86.ActiveCfg = Release|Any CPU
 		{07F55155-51A8-4072-9F80-FA473666F086}.Release|x86.Build.0 = Release|Any CPU

main/Makefile.am

@@ -2,6 +2,8 @@ include $(top_srcdir)/xbuild.include
 
 SUBDIRS = external . contrib src po man theme-icons build tests
 
+MD_CONFIGURE=$(top_srcdir)/../scripts/configure.sh
+
 #capture aclocal flags for autoreconf
 ACLOCAL_AMFLAGS=$(ACLOCAL_FLAGS)
 
@@ -11,29 +13,18 @@ buildinfo = $(top_builddir)/build/bin/buildinfo
 
 all: vcrevision
 
-all-local: sln_build
+all-local: vcrevision sln_build
 
 clean: clean-local
 
 clean-local: sln_clean
 
 vcrevision:
-	@if test -d ../.git; then \
-		version=$$(cd ..; \
-			LANG=C; export LANG; \
-			git rev-parse HEAD; \
-		); \
-		echo "$$version" > "vcrevision"; \
-	else \
-		if test ! -f ./vcrevision; then \
-			echo "unknown" > "vcrevision"; \
-		fi; \
-	fi
-
-$(buildinfo): vcrevision
+	touch vcrevision
+
+$(buildinfo):
 	@mkdir -p "$(top_builddir)/build/bin"
-	@echo "Git revision: $$(cat $(top_srcdir)/vcrevision)" > "$@"
-	@echo "Build date: $$(date -u +'%Y-%m-%d %H:%M:%S%z')" >> "$@"
+	@$(MD_CONFIGURE) gen-buildinfo "$(top_builddir)/build/bin"
 	@echo "Updated build information"
 	@cat $(buildinfo)
 
@@ -169,7 +160,7 @@ app-dir: all
 
 # we can't use the variables that are conditionally defined
 EXTRA_DIST = $(bin_SCRIPTS) $(desktop_DATA) $(pixmap_DATA) \
-	monodevelop.xml $(pkgconfig_in_files) vcrevision external/Makefile.in \
+	monodevelop.xml $(pkgconfig_in_files) external/Makefile.in \
 	Main.sln \
 	md.targets
 

main/build/MacOSX/Makefile.am

@@ -5,20 +5,10 @@ MAC_APP_LIB_DIR=$(MACOS)/lib/monodevelop
 ADDINS=$(MACOS)/lib/monodevelop/AddIns
 EXTRAS=$(top_srcdir)/../extras
 ARTIFACTS=$(top_srcdir)/../../artifacts
+MD_CONFIGURE=$(top_srcdir)/../scripts/configure.sh
 
-# In which commit did the MonoDevelop version change? 00000000 if uncommitted
-commit_of_last_version_change    := $(shell LANG=C git blame $(top_srcdir)/configure.in | grep AC_INIT | sed 's/ .*//')
-
-# How many commits have passed since $(-commit-of-last-version-change)?
-# "0" when commit hash is invalid (e.g. 00000000)
-num_commits_since_version_change := $(shell LANG=C git rev-list --count $(commit_of_last_version_change)..HEAD)
-
-PACKAGE_VERSION_MAJOR=0$(word 1, $(subst ., ,$(VERSION)))
-PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(VERSION)))
-PACKAGE_VERSION_REV=0$(word 3, $(subst ., ,$(VERSION)))
-PACKAGE_VERSION_BUILD=$(num_commits_since_version_change)
-PACKAGE_UPDATE_ID=$(shell echo $(PACKAGE_VERSION_MAJOR) $(PACKAGE_VERSION_MINOR) $(PACKAGE_VERSION_REV) $(PACKAGE_VERSION_BUILD) | awk '{printf "%d%02d%02d%04d",$$1,$$2,$$3,$$4}')
-BUNDLE_VERSION=$(shell echo $(PACKAGE_VERSION_MAJOR) $(PACKAGE_VERSION_MINOR) $(PACKAGE_VERSION_REV) $(PACKAGE_VERSION_BUILD) | awk '{printf "%d.%d.%d.%d",$$1,$$2,$$3,$$4}')
+PACKAGE_UPDATE_ID=$(shell $(MD_CONFIGURE) get-releaseid)
+BUNDLE_VERSION=$(shell $(MD_CONFIGURE) get-version)
 
 CLEANFILES = render.exe
 #DISTCLEANFILES =
@@ -138,19 +128,13 @@ app: monostub
 	@echo "Updating build information"
 	@echo ""
 
-	pushd ../..; make buildinfo; popd
-
-	echo "a3140c14-ef90-4019-ae6c-9d93804d6611 $(PACKAGE_UPDATE_ID)" > "$(MACOS)/updateinfo"
-
-	echo "Release ID: $(PACKAGE_UPDATE_ID)" > "$(MACOS)/lib/monodevelop/bin/buildinfo"
-	@cat ../bin/buildinfo >> "$(MACOS)/lib/monodevelop/bin/buildinfo"
+	$(MD_CONFIGURE) gen-buildinfo "$(MACOS)/lib/monodevelop/bin"
 
 # touch the directory so that update dependencies work
 	touch MonoDevelop.app
 
 	@echo ""
-	@echo "MONODEVELOP RELEASE: $(PACKAGE_UPDATE_ID)"
-	@echo "$$(cat ../../vcrevision)"
+	@cat "$(MACOS)/lib/monodevelop/bin/buildinfo"
 	@if test -f missing-stuff; then echo ""; echo "Missing stuff:"; cat missing-stuff; fi
 	@echo ""
 	@rm -f missing-stuff

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.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="4.2.3"
+PACKAGE_VERSION_LABEL="m4_esyscmd_s([grep ^Label ../version.config|cut -d "=" -f 2|tr -d '\n'])"
 
-COMPAT_ADDIN_VERSION=4.0
+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)
@@ -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
@@ -356,6 +355,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:"

main/contrib/ICSharpCode.Decompiler/Ast/TextTokenWriter.cs

@@ -269,7 +269,7 @@ public override void WritePreProcessorDirective(PreProcessorDirectiveType type,
 
 		public override void WritePrimitiveValue(object value, string literalValue = null)
 		{
-
+			output.WritePrimitiveValue(value, literalValue);
 		}
 
 		public override void WritePrimitiveType(string type)

main/contrib/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@@ -16,7 +16,7 @@
     <AssemblyOriginatorKeyFile>..\..\external\nrefactory\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>
     <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
-    <ProductVersion>10.0.0</ProductVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">

main/contrib/ICSharpCode.Decompiler/ITextOutput.cs

@@ -34,6 +34,7 @@ public interface ITextOutput
 		void WriteLine();
 		void WriteDefinition(string text, object definition, bool isLocal = true);
 		void WriteReference(string text, object reference, bool isLocal = false);
+		void WritePrimitiveValue (object value, string literalValue = null);
 
 		void AddDebugSymbols(MethodDebugSymbols methodDebugSymbols);
 

main/contrib/ICSharpCode.Decompiler/PlainTextOutput.cs

@@ -106,7 +106,12 @@ public void WriteReference(string text, object reference, bool isLocal)
 		{
 			Write(text);
 		}
-
+
+		public void WritePrimitiveValue (object value, string literalValue)
+		{
+			Write (value.ToString ());
+		}
+
 		void ITextOutput.MarkFoldStart(string collapsedText, bool defaultCollapsed)
 		{
 		}

main/po/README.md

@@ -0,0 +1,39 @@
+## Localizing MonoDevelop
+
+Localizations for MonoDevelop are based on the Gettext system.
+
+The localizations are stored in `*.po` files called _catalogs_, one per
+language, and a reference catalog called `messages.po` that contains
+all the localizable strings.
+
+### Editing a Localization
+
+To edit a localization, find the find the ISO standard country code for
+your translation, e.g. `da` for Danish (Denmark), then open the catalog
+matching that code, e.g. `da.po`.
+
+You can then open this catalog in a text file, or a Gettext GUI editor
+such as MonoDevelop itself. Unfortunately, testing a localization is
+difficult without building MonoDevelop
+[from source](http://monodevelop.com/Developers/Building_MonoDevelop).
+
+If the catalog for your language does not exist, make a copy of the
+reference catalog and rename it to match the expected name for your
+language. To add it to the MonoDevelop build, add it to the following lists:
+
+ * the `ALL_LINGUAS` variable in the `../configure.in` script
+ * the `<GettextTranslation>` and `<Translation>` items in the `mo.mdproj` file
+
+Finally, commit your updated localization and make a pull request to
+the MonoDevelop respository. Alternatively you may attach it to a
+[bug report](http://bugzilla.xamarin.com).
+
+### Updating The Catalogs
+
+On Mac/Linux machines, with MonoDevelop set up to build from source,
+executing the `make update-po` command in this directory will regenerate
+the reference catalog by scanning the MonoDevelop source, and then use
+it to update the all of the language-specific catalogs.
+
+**NOTE**: In general this is not necessary, as the .po files in
+the source repository are regularly updated this way.