Permalink
Browse files

[xbuild] Make xbuild script point to xbuild 12

  • Loading branch information...
1 parent 3313d9e commit 5e70ba51a0cb57dd878f08f59d0f0718867d5218 @mhutch mhutch committed Dec 20, 2013
Showing with 11 additions and 1 deletion.
  1. +9 −1 scripts/Makefile.am
  2. +2 −0 scripts/xbuild.in
View
@@ -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
View
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec @bindir@/mono $MONO_OPTIONS @mono_instdir@/xbuild/12.0/bin/xbuild.exe "$@"

0 comments on commit 5e70ba5

Please sign in to comment.