From 5e70ba51a0cb57dd878f08f59d0f0718867d5218 Mon Sep 17 00:00:00 2001
From: Michael Hutchinson <m.j.hutchinson@gmail.com>
Date: Fri, 20 Dec 2013 03:55:57 -0500
Subject: [PATCH] [xbuild] Make xbuild script point to xbuild 12

---
 scripts/Makefile.am | 10 +++++++++-
 scripts/xbuild.in   |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 scripts/xbuild.in

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index e0273c1d060..7a697cd2cc1 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -45,6 +45,10 @@ bin_SCRIPTS += $(scripts_4_0)
 bin_SCRIPTS += dmcs
 endif
 
+if INSTALL_4_5
+bin_SCRIPTS += xbuild
+endif
+
 scripts_4_0_umask = \
 	makecert$(SCRIPT_SUFFIX)		\
 	sn$(SCRIPT_SUFFIX)
@@ -96,7 +100,6 @@ scripts_4_0 = \
 	sqlmetal$(SCRIPT_SUFFIX)		\
 	sqlsharp$(SCRIPT_SUFFIX)		\
 	svcutil$(SCRIPT_SUFFIX)			\
-	xbuild$(SCRIPT_SUFFIX)			\
 	ccrewrite$(SCRIPT_SUFFIX)		\
 	cccheck$(SCRIPT_SUFFIX)			\
 	mdbrebase$(SCRIPT_SUFFIX)
@@ -149,6 +152,7 @@ EXTRA_DIST =			\
 	mono-find-provides.in	\
 	mono-find-requires.in	\
 	peverify.in			\
+	xbuild.in			\
 	update_submodules		\
 	mcs.in				\
 	gmcs.in				\
@@ -240,6 +244,10 @@ nunit-console4$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
 	$(REWRITE4_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
 	mv -f $@.tmp $@
 
+xbuild: xbuild.in Makefile
+	$(REWRITE_COMMON) $(srcdir)/xbuild.in > $@.tmp
+	mv -f $@.tmp $@
+
 #FIXME: this is not the correct rule for mod.bat.
 mod$(SCRIPT_SUFFIX): mod.in Makefile
 	$(REWRITE2) -e "s,@""exe_name@,mod,g" $(srcdir)/mod.in > $@.tmp
diff --git a/scripts/xbuild.in b/scripts/xbuild.in
new file mode 100644
index 00000000000..bbaac3d85d8
--- /dev/null
+++ b/scripts/xbuild.in
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec @bindir@/mono $MONO_OPTIONS @mono_instdir@/xbuild/12.0/bin/xbuild.exe "$@"
-- 
2.25.1