[xbuild] Make xbuild script point to xbuild 12

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index e0273c1d06034870d066e58def44dc4f660f27c2..7a697cd2cc1f43c89cdbdf3a23b3db5552388fbc 100644 (file)
--- 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 (file)
index 0000000..bbaac3d
--- /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 "$@"