소스 검색

(mcs-do-run-test): Depend on '$(tmpinst)/bin/mbas'.
($(tmpinst)/bin/mbas): Create temporary wrapper file, so that the
testcases pick the built 'mbas.exe'.

svn path=/trunk/mono/; revision=32873

Raja R Harinath 21 년 전
부모
커밋
1fc13eeeea
2개의 변경된 파일13개의 추가작업 그리고 1개의 파일을 삭제
  1. 6 0
      ChangeLog
  2. 7 1
      Makefile.am

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+2004-08-26  Raja R Harinath  <[email protected]>
+
+	* Makefile.am (mcs-do-run-test): Depend on '$(tmpinst)/bin/mbas'.
+	($(tmpinst)/bin/mbas): Create temporary wrapper file, so that the
+	testcases pick the built 'mbas.exe'.
+
 2004-08-17  Zoltan Varga  <[email protected]>
 
 	* mono/os/gc_wrapper.h: Only use thread local alloc if using the included libgc, since the

+ 7 - 1
Makefile.am

@@ -136,7 +136,7 @@ mcs-do-full-build:
 mcs-do-clean-profiles:
 	cd $(mcs_topdir) && $(MAKE) clean-profiles
 
-mcs-do-run-test: tmpinst-dir
+mcs-do-run-test: tmpinst-dir $(tmpinst)/bin/mbas
 	tmpinst=`cd $(tmpinst) && pwd` ; \
 	PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
 	cd $(mcs_topdir) && $(MAKE) PROFILE=default run-test
@@ -190,6 +190,12 @@ $(tmpinst)/bin/mcs: $(srcdir)/Makefile.am
 	(t=`cd $(tmpinst) && pwd`; echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$t/lib/mcs.exe"'" "$$@"') > $@
 	chmod +x $@
 
+# Used only by 'bootstrap-check' -- so, can safely use runtime/mbas.exe.
+$(tmpinst)/bin/mbas: $(srcdir)/Makefile.am
+	t=`cd $(tmpinst) && pwd`; r=`cd $(srcdir)/runtime && pwd`; \
+	( echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$r/mbas.exe"'" "$$@"' ) > $@
+	chmod +x $@
+
 $(tmpinst)/etc/mono/1.0/machine.config: $(srcdir)/data/net_1_1/machine.config
 	rm -f $@
 	srcdir=`cd $(srcdir) && pwd`; cd $(tmpinst)/etc/mono/1.0 && $(LN_S) $$srcdir/data/net_1_1/machine.config machine.config